summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/CustomMessageBox.cpp19
-rw-r--r--gui/CustomMessageBox.h11
-rw-r--r--gui/LabeledToolButton.cpp2
-rw-r--r--gui/MCModInfoFrame.cpp5
-rw-r--r--gui/ModEditDialogCommon.cpp7
-rw-r--r--gui/OneSixModEditDialog.cpp11
-rw-r--r--gui/consolewindow.cpp16
-rw-r--r--gui/logindialog.ui29
-rw-r--r--gui/mainwindow.cpp48
-rw-r--r--gui/settingsdialog.cpp98
10 files changed, 152 insertions, 94 deletions
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 <QMessageBox>
+
+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..be84d1b7 100644
--- a/gui/LabeledToolButton.cpp
+++ b/gui/LabeledToolButton.cpp
@@ -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 <QMessageBox>
#include <QtGui>
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 <QDesktopServices>
#include <QMessageBox>
#include <QString>
@@ -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 <pathutils.h>
@@ -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..49e12339 100644
--- a/gui/consolewindow.cpp
+++ b/gui/consolewindow.cpp
@@ -5,6 +5,7 @@
#include <QMessageBox>
#include <gui/platform.h>
+#include <gui/CustomMessageBox.h>
ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) :
QDialog(parent),
@@ -12,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*)));
}
@@ -96,17 +98,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..94900d72 100644
--- a/gui/logindialog.ui
+++ b/gui/logindialog.ui
@@ -19,6 +19,9 @@
<property name="text">
<string>&lt;span style=&quot; color:#ff0000;&quot;&gt;Error&lt;/span&gt;</string>
</property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+ </property>
</widget>
</item>
<item>
@@ -85,19 +88,6 @@
</property>
</widget>
</item>
- <item row="0" column="5" rowspan="2">
- <widget class="QPushButton" name="forgetButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Forget</string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
@@ -128,6 +118,19 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="forgetButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Forget</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
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<JavaVersion>(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 14eba492..346f7414 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
@@ -19,19 +19,20 @@
#include "logic/JavaUtils.h"
#include "gui/versionselectdialog.h"
#include "gui/platform.h"
+#include "gui/CustomMessageBox.h"
#include "logic/lists/JavaVersionList.h"
#include <settingsobject.h>
+#include <pathutils.h>
#include <QFileDialog>
#include <QMessageBox>
+#include <QDir>
-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 +41,7 @@ SettingsDialog::~SettingsDialog()
{
delete ui;
}
-void SettingsDialog::showEvent ( QShowEvent* ev )
+void SettingsDialog::showEvent(QShowEvent *ev)
{
QDialog::showEvent(ev);
adjustSize();
@@ -49,31 +50,46 @@ 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"),
- ui->instDirTextBox->text());
- if (!dir.isEmpty())
- ui->instDirTextBox->setText(dir);
+ QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Directory"),
+ 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
+ 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"),
- ui->modsDirTextBox->text());
- if (!dir.isEmpty())
- ui->modsDirTextBox->setText(dir);
+ 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(cooked_dir);
+ }
}
void SettingsDialog::on_lwjglDirBrowseBtn_clicked()
{
- QString dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"),
- ui->lwjglDirTextBox->text());
- if (!dir.isEmpty())
- ui->lwjglDirTextBox->setText(dir);
+ 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(cooked_dir);
+ }
}
void SettingsDialog::on_compatModeCheckBox_clicked(bool checked)
@@ -96,7 +112,7 @@ void SettingsDialog::on_buttonBox_accepted()
void SettingsDialog::applySettings(SettingsObject *s)
{
// Special cases
-
+
// Warn about dev builds.
if (!ui->devBuildsCheckBox->isChecked())
{
@@ -104,46 +120,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?"));
+ 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);
}
}
-
-
+
// 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 +170,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 +220,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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 08:56:56 +0000