From 6ecb833dbf4c4930c8354dcce7967ad44c16c217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 28 Oct 2013 20:55:12 +0100 Subject: [PATCH 1/8] Fix problem with instance list not using the instance folder path --- MultiMC.cpp | 9 ++-- depends/util/include/pathutils.h | 10 +++++ depends/util/src/pathutils.cpp | 24 ++++++++++ gui/settingsdialog.cpp | 77 ++++++++++++++++++-------------- logic/lists/InstanceList.cpp | 16 ++++--- logic/lists/InstanceList.h | 69 ++++++++++++++++------------ 6 files changed, 134 insertions(+), 71 deletions(-) diff --git a/MultiMC.cpp b/MultiMC.cpp index 3d62f76e..56109ba6 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -32,8 +32,8 @@ using namespace Util::Commandline; MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) { - setOrganizationName("MultiMC"); - setApplicationName("MultiMC5"); + setOrganizationName("MultiMC"); + setApplicationName("MultiMC5"); initTranslations(); @@ -139,9 +139,12 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) initGlobalSettings(); // and instances - m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this)); + auto InstDirSetting = m_settings->getSetting("InstanceDir"); + m_instances.reset(new InstanceList(InstDirSetting->get().toString(), this)); QLOG_INFO() << "Loading Instances..."; m_instances->loadList(); + connect(InstDirSetting, SIGNAL(settingChanged(const Setting &, QVariant)), + m_instances.get(), SLOT(on_InstFolderChanged(const Setting &, QVariant))); // init the http meta cache initHttpMetaCache(); diff --git a/depends/util/include/pathutils.h b/depends/util/include/pathutils.h index cea3a39a..c892c115 100644 --- a/depends/util/include/pathutils.h +++ b/depends/util/include/pathutils.h @@ -25,6 +25,16 @@ LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3); LIBUTIL_EXPORT QString AbsolutePath(QString path); +/** + * Normalize path + * + * Any paths inside the current directory will be normalized to relative paths (to current) + * Other paths will be made absolute + * + * Returns false if the path logic somehow filed (and normalizedPath in invalid) + */ +QString NormalizePath(QString path); + LIBUTIL_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-'); LIBUTIL_EXPORT QString DirNameFromString(QString string, QString inDir = "."); diff --git a/depends/util/src/pathutils.cpp b/depends/util/src/pathutils.cpp index 4c24fa5d..590ac89d 100644 --- a/depends/util/src/pathutils.cpp +++ b/depends/util/src/pathutils.cpp @@ -39,6 +39,30 @@ QString AbsolutePath(QString path) return QFileInfo(path).absolutePath(); } +/** + * Normalize path + * + * Any paths inside the current directory will be normalized to relative paths (to current) + * Other paths will be made absolute + */ +QString NormalizePath(QString path) +{ + QDir a = QDir::currentPath(); + QString currentAbsolute = a.absolutePath(); + + QDir b(path); + QString newAbsolute = b.absolutePath(); + + if (newAbsolute.startsWith(currentAbsolute)) + { + return a.relativeFilePath(newAbsolute); + } + else + { + return newAbsolute; + } +} + QString badFilenameChars = "\"\\/?<>:*|!"; QString RemoveInvalidFilenameChars(QString string, QChar replaceWith) diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 14eba492..b2fbd898 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -22,16 +22,16 @@ #include "logic/lists/JavaVersionList.h" #include +#include #include #include +#include -SettingsDialog::SettingsDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::SettingsDialog) +SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::SettingsDialog) { - MultiMCPlatform::fixWM_CLASS(this); + MultiMCPlatform::fixWM_CLASS(this); ui->setupUi(this); - + loadSettings(MMC->settings().get()); updateCheckboxStuff(); } @@ -40,7 +40,7 @@ SettingsDialog::~SettingsDialog() { delete ui; } -void SettingsDialog::showEvent ( QShowEvent* ev ) +void SettingsDialog::showEvent(QShowEvent *ev) { QDialog::showEvent(ev); adjustSize(); @@ -49,31 +49,40 @@ void SettingsDialog::showEvent ( QShowEvent* ev ) void SettingsDialog::updateCheckboxStuff() { ui->windowWidthSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked()); - ui->windowHeightSpinBox->setEnabled(! ui->maximizedCheckBox->isChecked()); + ui->windowHeightSpinBox->setEnabled(!ui->maximizedCheckBox->isChecked()); } void SettingsDialog::on_instDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("Instance Directory"), + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Directory"), ui->instDirTextBox->text()); - if (!dir.isEmpty()) - ui->instDirTextBox->setText(dir); + QString cooked_dir = NormalizePath(raw_dir); + + // do not allow current dir - it's dirty. Do not allow dirs that don't exist + if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) + { + ui->instDirTextBox->setText(cooked_dir); + } } void SettingsDialog::on_modsDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"), + QString dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"), ui->modsDirTextBox->text()); if (!dir.isEmpty()) + { ui->modsDirTextBox->setText(dir); + } } void SettingsDialog::on_lwjglDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"), + QString dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"), ui->lwjglDirTextBox->text()); if (!dir.isEmpty()) + { ui->lwjglDirTextBox->setText(dir); + } } void SettingsDialog::on_compatModeCheckBox_clicked(bool checked) @@ -96,7 +105,7 @@ void SettingsDialog::on_buttonBox_accepted() void SettingsDialog::applySettings(SettingsObject *s) { // Special cases - + // Warn about dev builds. if (!ui->devBuildsCheckBox->isChecked()) { @@ -104,46 +113,46 @@ void SettingsDialog::applySettings(SettingsObject *s) } else if (!s->get("UseDevBuilds").toBool()) { - int response = QMessageBox::question(this, tr("Development builds"), - tr("Development builds contain experimental features " - "and may be unstable. Are you sure you want to enable them?")); + int response = QMessageBox::question( + this, tr("Development builds"), + tr("Development builds contain experimental features " + "and may be unstable. Are you sure you want to enable them?")); if (response == QMessageBox::Yes) { s->set("UseDevBuilds", true); } } - - + // Updates s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked()); - + // Folders // TODO: Offer to move instances to new instance folder. s->set("InstanceDir", ui->instDirTextBox->text()); s->set("CentralModsDir", ui->modsDirTextBox->text()); s->set("LWJGLDir", ui->lwjglDirTextBox->text()); - + // Console s->set("ShowConsole", ui->showConsoleCheck->isChecked()); s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked()); - + // Window Size s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked()); s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value()); s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value()); - + // Auto Login s->set("AutoLogin", ui->autoLoginCheckBox->isChecked()); - + // Memory s->set("MinMemAlloc", ui->minMemSpinBox->value()); s->set("MaxMemAlloc", ui->maxMemSpinBox->value()); s->set("PermGen", ui->permGenSpinBox->value()); - + // Java Settings s->set("JavaPath", ui->javaPathTextBox->text()); s->set("JvmArgs", ui->jvmArgsTextBox->text()); - + // Custom Commands s->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text()); s->set("PostExitCommand", ui->postExitCmdTextBox->text()); @@ -154,33 +163,33 @@ void SettingsDialog::loadSettings(SettingsObject *s) // Updates ui->autoUpdateCheckBox->setChecked(s->get("AutoUpdate").toBool()); ui->devBuildsCheckBox->setChecked(s->get("UseDevBuilds").toBool()); - + // Folders ui->instDirTextBox->setText(s->get("InstanceDir").toString()); ui->modsDirTextBox->setText(s->get("CentralModsDir").toString()); ui->lwjglDirTextBox->setText(s->get("LWJGLDir").toString()); - + // Console ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool()); ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool()); - + // Window Size ui->maximizedCheckBox->setChecked(s->get("LaunchMaximized").toBool()); ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt()); ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt()); - + // Auto Login ui->autoLoginCheckBox->setChecked(s->get("AutoLogin").toBool()); - + // Memory ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt()); ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt()); ui->permGenSpinBox->setValue(s->get("PermGen").toInt()); - + // Java Settings ui->javaPathTextBox->setText(s->get("JavaPath").toString()); ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString()); - + // Custom Commands ui->preLaunchCmdTextBox->setText(s->get("PreLaunchCommand").toString()); ui->postExitCmdTextBox->setText(s->get("PostExitCommand").toString()); @@ -204,7 +213,7 @@ void SettingsDialog::on_pushButton_clicked() void SettingsDialog::on_btnBrowse_clicked() { QString dir = QFileDialog::getOpenFileName(this, tr("Find Java executable")); - if(!dir.isNull()) + if (!dir.isNull()) { ui->javaPathTextBox->setText(dir); } diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp index 9740d5a5..08985a19 100644 --- a/logic/lists/InstanceList.cpp +++ b/logic/lists/InstanceList.cpp @@ -34,7 +34,7 @@ const static int GROUP_FILE_FORMAT_VERSION = 1; InstanceList::InstanceList(const QString &instDir, QObject *parent) - : QAbstractListModel(parent), m_instDir("instances") + : QAbstractListModel(parent), m_instDir(instDir) { } @@ -196,8 +196,8 @@ void InstanceList::loadGroupList(QMap &groupMap) if (error.error != QJsonParseError::NoError) { QLOG_ERROR() << QString("Failed to parse instance group file: %1 at offset %2") - .arg(error.errorString(), QString::number(error.offset)) - .toUtf8(); + .arg(error.errorString(), QString::number(error.offset)) + .toUtf8(); return; } @@ -269,7 +269,8 @@ InstanceList::InstListError InstanceList::loadList() m_instances.clear(); QDir dir(m_instDir); - QDirIterator iter(dir); + QDirIterator iter(m_instDir, QDir::Dirs | QDir::NoDot | QDir::NoDotDot | QDir::Readable, + QDirIterator::FollowSymlinks); while (iter.hasNext()) { QString subDir = iter.next(); @@ -340,7 +341,12 @@ void InstanceList::clear() endResetModel(); emit dataIsInvalid(); } -; + +void InstanceList::on_InstFolderChanged(const Setting &setting, QVariant value) +{ + m_instDir = value.toString(); + loadList(); +} /// Add an instance. Triggers notifications, returns the new index int InstanceList::add(InstancePtr t) diff --git a/logic/lists/InstanceList.h b/logic/lists/InstanceList.h index 501edeb1..3cde6bf5 100644 --- a/logic/lists/InstanceList.h +++ b/logic/lists/InstanceList.h @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -29,19 +29,19 @@ class InstanceList : public QAbstractListModel { Q_OBJECT private: - void loadGroupList(QMap & groupList); + void loadGroupList(QMap &groupList); void saveGroupList(); - + public: explicit InstanceList(const QString &instDir, QObject *parent = 0); virtual ~InstanceList(); - + public: - QModelIndex index ( int row, int column = 0, const QModelIndex& parent = QModelIndex() ) const; - int rowCount ( const QModelIndex& parent = QModelIndex() ) const; - QVariant data ( const QModelIndex& index, int role ) const; - Qt::ItemFlags flags ( const QModelIndex& index ) const; - + QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role) const; + Qt::ItemFlags flags(const QModelIndex &index) const; + enum AdditionalRoles { InstancePointerRole = 0x34B1CB48 ///< Return pointer to real instance @@ -56,58 +56,69 @@ public: NoError = 0, UnknownError }; - - QString instDir() const { return m_instDir; } - + + QString instDir() const + { + return m_instDir; + } + /*! * \brief Loads the instance list. Triggers notifications. */ InstListError loadList(); - + /*! * \brief Get the instance at index */ InstancePtr at(int i) const { return m_instances.at(i); - }; - + } + ; + /*! * \brief Get the count of loaded instances */ int count() const { return m_instances.count(); - }; - + } + ; + /// Clear all instances. Triggers notifications. void clear(); - + /// Add an instance. Triggers notifications, returns the new index int add(InstancePtr t); - + /// Get an instance by ID - InstancePtr getInstanceById (QString id); + InstancePtr getInstanceById(QString id); signals: void dataIsInvalid(); - -private slots: - void propertiesChanged(BaseInstance * inst); - void instanceNuked(BaseInstance * inst); + +public +slots: + void on_InstFolderChanged(const Setting & setting, QVariant value); + +private +slots: + void propertiesChanged(BaseInstance *inst); + void instanceNuked(BaseInstance *inst); void groupChanged(); + private: - int getInstIndex(BaseInstance * inst); + int getInstIndex(BaseInstance *inst); + protected: QString m_instDir; - QList< InstancePtr > m_instances; + QList m_instances; }; class InstanceProxyModel : public KCategorizedSortFilterProxyModel { public: - explicit InstanceProxyModel ( QObject *parent = 0 ); + explicit InstanceProxyModel(QObject *parent = 0); protected: - virtual bool subSortLessThan ( const QModelIndex& left, const QModelIndex& right ) const; + virtual bool subSortLessThan(const QModelIndex &left, const QModelIndex &right) const; }; - From 7df667f823fc4a679148dfea215b25642babb48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 28 Oct 2013 21:50:58 +0100 Subject: [PATCH 2/8] Valgrind-checked early application start --- MultiMC.cpp | 16 ++++++++++------ depends/util/include/cmdutils.h | 8 +------- depends/util/src/cmdutils.cpp | 15 +-------------- gui/settingsdialog.cpp | 2 +- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/MultiMC.cpp b/MultiMC.cpp index 56109ba6..4e2a5b0b 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -351,20 +351,24 @@ std::shared_ptr MultiMC::javalist() return m_javalist; } +int main_gui(MultiMC & app) +{ + // show main window + MainWindow mainWin; + mainWin.show(); + mainWin.checkSetDefaultJava(); + return app.exec(); +} + int main(int argc, char *argv[]) { // initialize Qt MultiMC app(argc, argv); - // show main window - MainWindow mainWin; - mainWin.show(); - mainWin.checkSetDefaultJava(); - switch (app.status()) { case MultiMC::Initialized: - return app.exec(); + return main_gui(app); case MultiMC::Failed: return 1; case MultiMC::Succeeded: diff --git a/depends/util/include/cmdutils.h b/depends/util/include/cmdutils.h index 93fef9ff..b8582195 100644 --- a/depends/util/include/cmdutils.h +++ b/depends/util/include/cmdutils.h @@ -83,16 +83,10 @@ enum Enum /** * @brief The ParsingError class */ -class LIBUTIL_EXPORT ParsingError : public std::exception +class LIBUTIL_EXPORT ParsingError : public std::runtime_error { public: ParsingError(const QString &what); - ParsingError(const ParsingError &e); - ~ParsingError() throw() {} - const char *what() const throw(); - QString qwhat() const; -private: - QString m_what; }; /** diff --git a/depends/util/src/cmdutils.cpp b/depends/util/src/cmdutils.cpp index 80ba719d..b9cab717 100644 --- a/depends/util/src/cmdutils.cpp +++ b/depends/util/src/cmdutils.cpp @@ -463,21 +463,8 @@ void Parser::getPrefix(QString &opt, QString &flag) // ParsingError ParsingError::ParsingError(const QString &what) +:std::runtime_error(what.toStdString()) { - m_what = what; -} -ParsingError::ParsingError(const ParsingError &e) -{ - m_what = e.m_what; -} - -const char *ParsingError::what() const throw() -{ - return m_what.toLocal8Bit().constData(); -} -QString ParsingError::qwhat() const -{ - return m_what; } } diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index b2fbd898..fb204d10 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -55,7 +55,7 @@ void SettingsDialog::updateCheckboxStuff() void SettingsDialog::on_instDirBrowseBtn_clicked() { QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Directory"), - ui->instDirTextBox->text()); + ui->instDirTextBox->text()); QString cooked_dir = NormalizePath(raw_dir); // do not allow current dir - it's dirty. Do not allow dirs that don't exist From e7e03c2b542b1cceda63628dd7ca6fa9c875cfd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 28 Oct 2013 22:01:37 +0100 Subject: [PATCH 3/8] BLIND CODE, BLIND CODE HERE! WHERE IS THE COMPILER!?!?! It choked on missing headers, maybe? --- depends/util/include/cmdutils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/depends/util/include/cmdutils.h b/depends/util/include/cmdutils.h index b8582195..bab5a9fa 100644 --- a/depends/util/include/cmdutils.h +++ b/depends/util/include/cmdutils.h @@ -19,6 +19,7 @@ #define CMDUTILS_H #include +#include #include #include From b0ef429786bef64799d43f1ac502c139bbde8dc5 Mon Sep 17 00:00:00 2001 From: Sky Date: Tue, 29 Oct 2013 12:40:09 +0000 Subject: [PATCH 4/8] Add selectable message box helper, use it, make login GUI error label selectable --- CMakeLists.txt | 2 ++ gui/CustomMessageBox.cpp | 19 +++++++++++++++ gui/CustomMessageBox.h | 11 +++++++++ gui/LabeledToolButton.cpp | 4 ++-- gui/MCModInfoFrame.cpp | 5 ++-- gui/ModEditDialogCommon.cpp | 7 +++--- gui/OneSixModEditDialog.cpp | 11 +++++---- gui/consolewindow.cpp | 13 ++++------ gui/logindialog.ui | 3 +++ gui/mainwindow.cpp | 48 ++++++++++++++++++++++--------------- gui/settingsdialog.cpp | 9 +++---- 11 files changed, 88 insertions(+), 44 deletions(-) create mode 100644 gui/CustomMessageBox.cpp create mode 100644 gui/CustomMessageBox.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 16825be3..5da43a0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,6 +217,8 @@ gui/EditNotesDialog.h gui/EditNotesDialog.cpp gui/MCModInfoFrame.h gui/MCModInfoFrame.cpp +gui/CustomMessageBox.h +gui/CustomMessageBox.cpp # Base classes and infrastructure logic/BaseVersion.h diff --git a/gui/CustomMessageBox.cpp b/gui/CustomMessageBox.cpp new file mode 100644 index 00000000..e55ebbbb --- /dev/null +++ b/gui/CustomMessageBox.cpp @@ -0,0 +1,19 @@ +#include "CustomMessageBox.h" + +namespace CustomMessageBox +{ + QMessageBox *selectable(QWidget *parent, const QString &title, const QString &text, + QMessageBox::Icon icon, QMessageBox::StandardButtons buttons, + QMessageBox::StandardButton defaultButton) + { + QMessageBox *messageBox = new QMessageBox(parent); + messageBox->setWindowTitle(title); + messageBox->setText(text); + messageBox->setStandardButtons(buttons); + messageBox->setDefaultButton(defaultButton); + messageBox->setTextInteractionFlags(Qt::TextSelectableByMouse); + messageBox->setIcon(icon); + + return messageBox; + } +} diff --git a/gui/CustomMessageBox.h b/gui/CustomMessageBox.h new file mode 100644 index 00000000..145651ec --- /dev/null +++ b/gui/CustomMessageBox.h @@ -0,0 +1,11 @@ +#pragma once + +#include + +namespace CustomMessageBox +{ + QMessageBox *selectable(QWidget *parent, const QString &title, const QString &text, + QMessageBox::Icon icon = QMessageBox::NoIcon, + QMessageBox::StandardButtons buttons = QMessageBox::Ok, + QMessageBox::StandardButton defaultButton = QMessageBox::NoButton); +} diff --git a/gui/LabeledToolButton.cpp b/gui/LabeledToolButton.cpp index f1e54696..677476b9 100644 --- a/gui/LabeledToolButton.cpp +++ b/gui/LabeledToolButton.cpp @@ -20,7 +20,7 @@ LabeledToolButton::LabeledToolButton(QWidget * parent) m_label->setWordWrap(true); m_label->setMouseTracking(false); m_label->setAlignment(Qt::AlignCenter); - m_label->setTextInteractionFlags(Qt::NoTextInteraction); + m_label->setTextInteractionFlags(Qt::TextSelectableByMouse); // somehow, this makes word wrap work in the QLabel. yay. m_label->setMinimumWidth(100); } @@ -69,4 +69,4 @@ void LabeledToolButton::resizeEvent(QResizeEvent * event) { m_label->setGeometry(QRect(4, 4, width()-8, height()-8)); QWidget::resizeEvent(event); -} \ No newline at end of file +} diff --git a/gui/MCModInfoFrame.cpp b/gui/MCModInfoFrame.cpp index b3f4ca5b..55ef13f1 100644 --- a/gui/MCModInfoFrame.cpp +++ b/gui/MCModInfoFrame.cpp @@ -15,6 +15,7 @@ #include "MCModInfoFrame.h" #include "ui_MCModInfoFrame.h" +#include "CustomMessageBox.h" #include #include void MCModInfoFrame::updateWithMod(Mod &m) @@ -104,7 +105,5 @@ void MCModInfoFrame::setModDescription(QString text) } void MCModInfoFrame::modDescEllipsisHandler(const QString &link) { - QMessageBox msgbox; - msgbox.setText(desc); - msgbox.exec(); + CustomMessageBox::selectable(this, tr(""), desc)->show(); } diff --git a/gui/ModEditDialogCommon.cpp b/gui/ModEditDialogCommon.cpp index 692ac0c4..873cd8ea 100644 --- a/gui/ModEditDialogCommon.cpp +++ b/gui/ModEditDialogCommon.cpp @@ -1,4 +1,5 @@ #include "ModEditDialogCommon.h" +#include "CustomMessageBox.h" #include #include #include @@ -33,8 +34,8 @@ void showWebsiteForMod(QWidget *parentDlg, Mod &m) } else { - QMessageBox::warning( - parentDlg, parentDlg->tr("How sad!"), - parentDlg->tr("The mod author didn't provide a website link for this mod.")); + CustomMessageBox::selectable(parentDlg, parentDlg->tr("How sad!"), + parentDlg->tr("The mod author didn't provide a website link for this mod."), + QMessageBox::Warning); } } diff --git a/gui/OneSixModEditDialog.cpp b/gui/OneSixModEditDialog.cpp index 54f7289d..42bcfeb0 100644 --- a/gui/OneSixModEditDialog.cpp +++ b/gui/OneSixModEditDialog.cpp @@ -23,6 +23,7 @@ #include "logic/ForgeInstaller.h" #include "gui/versionselectdialog.h" #include "gui/platform.h" +#include "gui/CustomMessageBox.h" #include "ProgressDialog.h" #include @@ -110,11 +111,11 @@ void OneSixModEditDialog::on_customizeBtn_clicked() void OneSixModEditDialog::on_revertBtn_clicked() { - auto reply = QMessageBox::question( - this, tr("Revert?"), tr("Do you want to revert the " - "version of this instance to its original configuration?"), - QMessageBox::Yes | QMessageBox::No); - if (reply == QMessageBox::Yes) + auto response = CustomMessageBox::selectable(this, tr("Revert?"), + tr("Do you want to revert the " + "version of this instance to its original configuration?"), + QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec(); + if (response == QMessageBox::Yes) { if (m_inst->revertCustomVersion()) { diff --git a/gui/consolewindow.cpp b/gui/consolewindow.cpp index 6ed4a0ec..78ef958e 100644 --- a/gui/consolewindow.cpp +++ b/gui/consolewindow.cpp @@ -5,6 +5,7 @@ #include #include +#include ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) : QDialog(parent), @@ -96,17 +97,13 @@ void ConsoleWindow::closeEvent(QCloseEvent * event) void ConsoleWindow::on_btnKillMinecraft_clicked() { ui->btnKillMinecraft->setEnabled(false); - QMessageBox r_u_sure; - //: Main question of the kill confirmation dialog - r_u_sure.setText(tr("Kill Minecraft?")); - r_u_sure.setInformativeText(tr("This can cause the instance to get corrupted and should only be used if Minecraft is frozen for some reason")); - r_u_sure.setStandardButtons(QMessageBox::Yes | QMessageBox::No); - r_u_sure.setDefaultButton(QMessageBox::Yes); - if (r_u_sure.exec() == QMessageBox::Yes) + auto response = CustomMessageBox::selectable(this, tr("Kill Minecraft?"), + tr("This can cause the instance to get corrupted and should only be used if Minecraft is frozen for some reason"), + QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)->exec(); + if (response == QMessageBox::Yes) proc->killMinecraft(); else ui->btnKillMinecraft->setEnabled(true); - r_u_sure.close(); } void ConsoleWindow::onEnded(BaseInstance *instance) diff --git a/gui/logindialog.ui b/gui/logindialog.ui index 46965425..52f35b0c 100644 --- a/gui/logindialog.ui +++ b/gui/logindialog.ui @@ -19,6 +19,9 @@ <span style=" color:#ff0000;">Error</span> + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 5d3c52b5..b2fdbe16 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -50,6 +50,7 @@ #include "gui/consolewindow.h" #include "gui/instancesettings.h" #include "gui/platform.h" +#include "gui/CustomMessageBox.h" #include "logic/lists/InstanceList.h" #include "logic/lists/MinecraftVersionList.h" @@ -281,20 +282,26 @@ void MainWindow::on_actionAddInstance_triggered() return; case InstanceFactory::InstExists: + { errorMsg += "An instance with the given directory name already exists."; - QMessageBox::warning(this, "Error", errorMsg); + CustomMessageBox::selectable(this, tr("Error"), errorMsg, QMessageBox::Warning)->show(); break; + } case InstanceFactory::CantCreateDir: + { errorMsg += "Failed to create the instance directory."; - QMessageBox::warning(this, "Error", errorMsg); + CustomMessageBox::selectable(this, tr("Error"), errorMsg, QMessageBox::Warning)->show(); break; + } default: + { errorMsg += QString("Unknown instance loader error %1").arg(error); - QMessageBox::warning(this, "Error", errorMsg); + CustomMessageBox::selectable(this, tr("Error"), errorMsg, QMessageBox::Warning)->show(); break; } + } } void MainWindow::on_actionChangeInstIcon_triggered() @@ -387,9 +394,10 @@ void MainWindow::on_actionDeleteInstance_triggered() { if (m_selectedInstance) { - int response = QMessageBox::question( - this, "CAREFUL", QString("This is permanent! Are you sure?\nAbout to delete: ") + - m_selectedInstance->name()); + auto response = CustomMessageBox::selectable(this, tr("CAREFUL"), + tr("This is permanent! Are you sure?\nAbout to delete: ") + + m_selectedInstance->name(), + QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec(); if (response == QMessageBox::Yes) { m_selectedInstance->nuke(); @@ -626,7 +634,7 @@ void MainWindow::onGameUpdateComplete() void MainWindow::onGameUpdateError(QString error) { - QMessageBox::warning(this, "Error updating instance", error); + CustomMessageBox::selectable(this, tr("Error updating instance"), error, QMessageBox::Warning)->show(); } void MainWindow::launchInstance(BaseInstance *instance, LoginResponse response) @@ -695,9 +703,9 @@ void MainWindow::on_actionMakeDesktopShortcut_triggered() QStringList() << "-dl" << QDir::currentPath() << "test", name, "application-x-octet-stream"); - QMessageBox::warning( - this, tr("Not useful"), - tr("A Dummy Shortcut was created. it will not do anything productive")); + CustomMessageBox::selectable(this, tr("Not useful"), + tr("A Dummy Shortcut was created. it will not do anything productive"), + QMessageBox::Warning)->show(); } // BrowserDialog @@ -718,11 +726,11 @@ void MainWindow::on_actionChangeInstMCVersion_triggered() { if (m_selectedInstance->versionIsCustom()) { - auto result = QMessageBox::warning( - this, tr("Are you sure?"), - tr("This will remove any library/version customization you did previously. " - "This includes things like Forge install and similar."), - QMessageBox::Ok, QMessageBox::Abort); + auto result = CustomMessageBox::selectable(this, tr("Are you sure?"), + tr("This will remove any library/version customization you did previously. " + "This includes things like Forge install and similar."), + QMessageBox::Warning, QMessageBox::Ok, QMessageBox::Abort)->exec(); + if (result != QMessageBox::Ok) return; } @@ -853,10 +861,12 @@ void MainWindow::checkSetDefaultJava() java = std::dynamic_pointer_cast(vselect.selectedVersion()); else { - QMessageBox::warning(this, tr("Invalid version selected"), - tr("You didn't select a valid Java version, so MultiMC will " - "select the default. " - "You can change this in the settings dialog.")); + CustomMessageBox::selectable(this, tr("Invalid version selected"), + tr("You didn't select a valid Java version, so MultiMC will " + "select the default. " + "You can change this in the settings dialog."), + QMessageBox::Warning)->show(); + JavaUtils ju; java = ju.GetDefaultJava(); } diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index fb204d10..2619a47f 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -19,6 +19,7 @@ #include "logic/JavaUtils.h" #include "gui/versionselectdialog.h" #include "gui/platform.h" +#include "gui/CustomMessageBox.h" #include "logic/lists/JavaVersionList.h" #include @@ -113,10 +114,10 @@ void SettingsDialog::applySettings(SettingsObject *s) } else if (!s->get("UseDevBuilds").toBool()) { - int response = QMessageBox::question( - this, tr("Development builds"), - tr("Development builds contain experimental features " - "and may be unstable. Are you sure you want to enable them?")); + auto response = CustomMessageBox::selectable(this, tr("Development builds"), + tr("Development builds contain experimental features " + "and may be unstable. Are you sure you want to enable them?"), + QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec(); if (response == QMessageBox::Yes) { s->set("UseDevBuilds", true); From ac4af46aed54dd7c7bd47dfe9fed869d1a61f62f Mon Sep 17 00:00:00 2001 From: Sky Date: Tue, 29 Oct 2013 12:47:14 +0000 Subject: [PATCH 5/8] Don't make LabeledToolButton selectable --- gui/LabeledToolButton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/LabeledToolButton.cpp b/gui/LabeledToolButton.cpp index 677476b9..be84d1b7 100644 --- a/gui/LabeledToolButton.cpp +++ b/gui/LabeledToolButton.cpp @@ -20,7 +20,7 @@ LabeledToolButton::LabeledToolButton(QWidget * parent) m_label->setWordWrap(true); m_label->setMouseTracking(false); m_label->setAlignment(Qt::AlignCenter); - m_label->setTextInteractionFlags(Qt::TextSelectableByMouse); + m_label->setTextInteractionFlags(Qt::NoTextInteraction); // somehow, this makes word wrap work in the QLabel. yay. m_label->setMinimumWidth(100); } From aab5478ae7367dd30695353f626379cb698495f3 Mon Sep 17 00:00:00 2001 From: Sky Date: Tue, 29 Oct 2013 16:49:41 +0000 Subject: [PATCH 6/8] Move "Forget" button to a sane place --- gui/logindialog.ui | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gui/logindialog.ui b/gui/logindialog.ui index 52f35b0c..94900d72 100644 --- a/gui/logindialog.ui +++ b/gui/logindialog.ui @@ -88,19 +88,6 @@ - - - - - 0 - 0 - - - - Forget - - - @@ -131,6 +118,19 @@ + + + + + 0 + 0 + + + + Forget + + + From 511417c4f7a9429619492092201253124ee9fed9 Mon Sep 17 00:00:00 2001 From: Sky Date: Tue, 29 Oct 2013 18:38:11 +0000 Subject: [PATCH 7/8] Make ConsoleWindow have Qt::Window flag (adds minimise/maximise buttons to titlebar) --- gui/consolewindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/consolewindow.cpp b/gui/consolewindow.cpp index 78ef958e..49e12339 100644 --- a/gui/consolewindow.cpp +++ b/gui/consolewindow.cpp @@ -13,8 +13,9 @@ ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) : m_mayclose(true), proc(mcproc) { - MultiMCPlatform::fixWM_CLASS(this); + MultiMCPlatform::fixWM_CLASS(this); ui->setupUi(this); + this->setWindowFlags(Qt::Window); connect(mcproc, SIGNAL(ended(BaseInstance*)), this, SLOT(onEnded(BaseInstance*))); } From 946d397ccedfe1c116566fce1f86ae4f794e44a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 29 Oct 2013 22:13:42 +0100 Subject: [PATCH 8/8] Customizable folder browsing is same as for the instance folder. Syste Proxy usage. --- MultiMC.cpp | 3 +++ gui/settingsdialog.cpp | 22 ++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/MultiMC.cpp b/MultiMC.cpp index 4e2a5b0b..e425aa44 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -149,6 +149,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) // init the http meta cache initHttpMetaCache(); + // set up a basic autodetected proxy (system default) + QNetworkProxyFactory::setUseSystemConfiguration(true); + // create the global network manager m_qnam.reset(new QNetworkAccessManager(this)); diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index fb204d10..f961a7de 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -67,21 +67,27 @@ void SettingsDialog::on_instDirBrowseBtn_clicked() void SettingsDialog::on_modsDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"), - ui->modsDirTextBox->text()); - if (!dir.isEmpty()) + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"), + ui->modsDirTextBox->text()); + QString cooked_dir = NormalizePath(raw_dir); + + // do not allow current dir - it's dirty. Do not allow dirs that don't exist + if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) { - ui->modsDirTextBox->setText(dir); + ui->modsDirTextBox->setText(cooked_dir); } } void SettingsDialog::on_lwjglDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"), - ui->lwjglDirTextBox->text()); - if (!dir.isEmpty()) + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"), + ui->lwjglDirTextBox->text()); + QString cooked_dir = NormalizePath(raw_dir); + + // do not allow current dir - it's dirty. Do not allow dirs that don't exist + if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) { - ui->lwjglDirTextBox->setText(dir); + ui->lwjglDirTextBox->setText(cooked_dir); } }