Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
This commit is contained in:
commit
44823324f9
@ -217,6 +217,8 @@ gui/EditNotesDialog.h
|
|||||||
gui/EditNotesDialog.cpp
|
gui/EditNotesDialog.cpp
|
||||||
gui/MCModInfoFrame.h
|
gui/MCModInfoFrame.h
|
||||||
gui/MCModInfoFrame.cpp
|
gui/MCModInfoFrame.cpp
|
||||||
|
gui/CustomMessageBox.h
|
||||||
|
gui/CustomMessageBox.cpp
|
||||||
|
|
||||||
# Base classes and infrastructure
|
# Base classes and infrastructure
|
||||||
logic/BaseVersion.h
|
logic/BaseVersion.h
|
||||||
|
19
gui/CustomMessageBox.cpp
Normal file
19
gui/CustomMessageBox.cpp
Normal file
@ -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;
|
||||||
|
}
|
||||||
|
}
|
11
gui/CustomMessageBox.h
Normal file
11
gui/CustomMessageBox.h
Normal file
@ -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);
|
||||||
|
}
|
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
#include "MCModInfoFrame.h"
|
#include "MCModInfoFrame.h"
|
||||||
#include "ui_MCModInfoFrame.h"
|
#include "ui_MCModInfoFrame.h"
|
||||||
|
#include "CustomMessageBox.h"
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QtGui>
|
#include <QtGui>
|
||||||
void MCModInfoFrame::updateWithMod(Mod &m)
|
void MCModInfoFrame::updateWithMod(Mod &m)
|
||||||
@ -104,7 +105,5 @@ void MCModInfoFrame::setModDescription(QString text)
|
|||||||
}
|
}
|
||||||
void MCModInfoFrame::modDescEllipsisHandler(const QString &link)
|
void MCModInfoFrame::modDescEllipsisHandler(const QString &link)
|
||||||
{
|
{
|
||||||
QMessageBox msgbox;
|
CustomMessageBox::selectable(this, tr(""), desc)->show();
|
||||||
msgbox.setText(desc);
|
|
||||||
msgbox.exec();
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#include "ModEditDialogCommon.h"
|
#include "ModEditDialogCommon.h"
|
||||||
|
#include "CustomMessageBox.h"
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
@ -33,8 +34,8 @@ void showWebsiteForMod(QWidget *parentDlg, Mod &m)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QMessageBox::warning(
|
CustomMessageBox::selectable(parentDlg, parentDlg->tr("How sad!"),
|
||||||
parentDlg, parentDlg->tr("How sad!"),
|
parentDlg->tr("The mod author didn't provide a website link for this mod."),
|
||||||
parentDlg->tr("The mod author didn't provide a website link for this mod."));
|
QMessageBox::Warning);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "logic/ForgeInstaller.h"
|
#include "logic/ForgeInstaller.h"
|
||||||
#include "gui/versionselectdialog.h"
|
#include "gui/versionselectdialog.h"
|
||||||
#include "gui/platform.h"
|
#include "gui/platform.h"
|
||||||
|
#include "gui/CustomMessageBox.h"
|
||||||
#include "ProgressDialog.h"
|
#include "ProgressDialog.h"
|
||||||
|
|
||||||
#include <pathutils.h>
|
#include <pathutils.h>
|
||||||
@ -110,11 +111,11 @@ void OneSixModEditDialog::on_customizeBtn_clicked()
|
|||||||
|
|
||||||
void OneSixModEditDialog::on_revertBtn_clicked()
|
void OneSixModEditDialog::on_revertBtn_clicked()
|
||||||
{
|
{
|
||||||
auto reply = QMessageBox::question(
|
auto response = CustomMessageBox::selectable(this, tr("Revert?"),
|
||||||
this, tr("Revert?"), tr("Do you want to revert the "
|
tr("Do you want to revert the "
|
||||||
"version of this instance to its original configuration?"),
|
"version of this instance to its original configuration?"),
|
||||||
QMessageBox::Yes | QMessageBox::No);
|
QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec();
|
||||||
if (reply == QMessageBox::Yes)
|
if (response == QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
if (m_inst->revertCustomVersion())
|
if (m_inst->revertCustomVersion())
|
||||||
{
|
{
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
#include <gui/platform.h>
|
#include <gui/platform.h>
|
||||||
|
#include <gui/CustomMessageBox.h>
|
||||||
|
|
||||||
ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) :
|
ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
@ -14,6 +15,7 @@ ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) :
|
|||||||
{
|
{
|
||||||
MultiMCPlatform::fixWM_CLASS(this);
|
MultiMCPlatform::fixWM_CLASS(this);
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
this->setWindowFlags(Qt::Window);
|
||||||
connect(mcproc, SIGNAL(ended(BaseInstance*)), this, SLOT(onEnded(BaseInstance*)));
|
connect(mcproc, SIGNAL(ended(BaseInstance*)), this, SLOT(onEnded(BaseInstance*)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,17 +98,13 @@ void ConsoleWindow::closeEvent(QCloseEvent * event)
|
|||||||
void ConsoleWindow::on_btnKillMinecraft_clicked()
|
void ConsoleWindow::on_btnKillMinecraft_clicked()
|
||||||
{
|
{
|
||||||
ui->btnKillMinecraft->setEnabled(false);
|
ui->btnKillMinecraft->setEnabled(false);
|
||||||
QMessageBox r_u_sure;
|
auto response = CustomMessageBox::selectable(this, tr("Kill Minecraft?"),
|
||||||
//: Main question of the kill confirmation dialog
|
tr("This can cause the instance to get corrupted and should only be used if Minecraft is frozen for some reason"),
|
||||||
r_u_sure.setText(tr("Kill Minecraft?"));
|
QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)->exec();
|
||||||
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"));
|
if (response == QMessageBox::Yes)
|
||||||
r_u_sure.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
|
||||||
r_u_sure.setDefaultButton(QMessageBox::Yes);
|
|
||||||
if (r_u_sure.exec() == QMessageBox::Yes)
|
|
||||||
proc->killMinecraft();
|
proc->killMinecraft();
|
||||||
else
|
else
|
||||||
ui->btnKillMinecraft->setEnabled(true);
|
ui->btnKillMinecraft->setEnabled(true);
|
||||||
r_u_sure.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConsoleWindow::onEnded(BaseInstance *instance)
|
void ConsoleWindow::onEnded(BaseInstance *instance)
|
||||||
|
@ -19,6 +19,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><span style=" color:#ff0000;">Error</span></string>
|
<string><span style=" color:#ff0000;">Error</span></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="textInteractionFlags">
|
||||||
|
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -85,19 +88,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -128,6 +118,19 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
@ -50,6 +50,7 @@
|
|||||||
#include "gui/consolewindow.h"
|
#include "gui/consolewindow.h"
|
||||||
#include "gui/instancesettings.h"
|
#include "gui/instancesettings.h"
|
||||||
#include "gui/platform.h"
|
#include "gui/platform.h"
|
||||||
|
#include "gui/CustomMessageBox.h"
|
||||||
|
|
||||||
#include "logic/lists/InstanceList.h"
|
#include "logic/lists/InstanceList.h"
|
||||||
#include "logic/lists/MinecraftVersionList.h"
|
#include "logic/lists/MinecraftVersionList.h"
|
||||||
@ -281,20 +282,26 @@ void MainWindow::on_actionAddInstance_triggered()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
case InstanceFactory::InstExists:
|
case InstanceFactory::InstExists:
|
||||||
|
{
|
||||||
errorMsg += "An instance with the given directory name already exists.";
|
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;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case InstanceFactory::CantCreateDir:
|
case InstanceFactory::CantCreateDir:
|
||||||
|
{
|
||||||
errorMsg += "Failed to create the instance directory.";
|
errorMsg += "Failed to create the instance directory.";
|
||||||
QMessageBox::warning(this, "Error", errorMsg);
|
CustomMessageBox::selectable(this, tr("Error"), errorMsg, QMessageBox::Warning)->show();
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
{
|
||||||
errorMsg += QString("Unknown instance loader error %1").arg(error);
|
errorMsg += QString("Unknown instance loader error %1").arg(error);
|
||||||
QMessageBox::warning(this, "Error", errorMsg);
|
CustomMessageBox::selectable(this, tr("Error"), errorMsg, QMessageBox::Warning)->show();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_actionChangeInstIcon_triggered()
|
void MainWindow::on_actionChangeInstIcon_triggered()
|
||||||
@ -387,9 +394,10 @@ void MainWindow::on_actionDeleteInstance_triggered()
|
|||||||
{
|
{
|
||||||
if (m_selectedInstance)
|
if (m_selectedInstance)
|
||||||
{
|
{
|
||||||
int response = QMessageBox::question(
|
auto response = CustomMessageBox::selectable(this, tr("CAREFUL"),
|
||||||
this, "CAREFUL", QString("This is permanent! Are you sure?\nAbout to delete: ") +
|
tr("This is permanent! Are you sure?\nAbout to delete: ")
|
||||||
m_selectedInstance->name());
|
+ m_selectedInstance->name(),
|
||||||
|
QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec();
|
||||||
if (response == QMessageBox::Yes)
|
if (response == QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
m_selectedInstance->nuke();
|
m_selectedInstance->nuke();
|
||||||
@ -626,7 +634,7 @@ void MainWindow::onGameUpdateComplete()
|
|||||||
|
|
||||||
void MainWindow::onGameUpdateError(QString error)
|
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)
|
void MainWindow::launchInstance(BaseInstance *instance, LoginResponse response)
|
||||||
@ -695,9 +703,9 @@ void MainWindow::on_actionMakeDesktopShortcut_triggered()
|
|||||||
QStringList() << "-dl" << QDir::currentPath() << "test", name,
|
QStringList() << "-dl" << QDir::currentPath() << "test", name,
|
||||||
"application-x-octet-stream");
|
"application-x-octet-stream");
|
||||||
|
|
||||||
QMessageBox::warning(
|
CustomMessageBox::selectable(this, tr("Not useful"),
|
||||||
this, tr("Not useful"),
|
tr("A Dummy Shortcut was created. it will not do anything productive"),
|
||||||
tr("A Dummy Shortcut was created. it will not do anything productive"));
|
QMessageBox::Warning)->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
// BrowserDialog
|
// BrowserDialog
|
||||||
@ -718,11 +726,11 @@ void MainWindow::on_actionChangeInstMCVersion_triggered()
|
|||||||
{
|
{
|
||||||
if (m_selectedInstance->versionIsCustom())
|
if (m_selectedInstance->versionIsCustom())
|
||||||
{
|
{
|
||||||
auto result = QMessageBox::warning(
|
auto result = CustomMessageBox::selectable(this, tr("Are you sure?"),
|
||||||
this, tr("Are you sure?"),
|
|
||||||
tr("This will remove any library/version customization you did previously. "
|
tr("This will remove any library/version customization you did previously. "
|
||||||
"This includes things like Forge install and similar."),
|
"This includes things like Forge install and similar."),
|
||||||
QMessageBox::Ok, QMessageBox::Abort);
|
QMessageBox::Warning, QMessageBox::Ok, QMessageBox::Abort)->exec();
|
||||||
|
|
||||||
if (result != QMessageBox::Ok)
|
if (result != QMessageBox::Ok)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -853,10 +861,12 @@ void MainWindow::checkSetDefaultJava()
|
|||||||
java = std::dynamic_pointer_cast<JavaVersion>(vselect.selectedVersion());
|
java = std::dynamic_pointer_cast<JavaVersion>(vselect.selectedVersion());
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QMessageBox::warning(this, tr("Invalid version selected"),
|
CustomMessageBox::selectable(this, tr("Invalid version selected"),
|
||||||
tr("You didn't select a valid Java version, so MultiMC will "
|
tr("You didn't select a valid Java version, so MultiMC will "
|
||||||
"select the default. "
|
"select the default. "
|
||||||
"You can change this in the settings dialog."));
|
"You can change this in the settings dialog."),
|
||||||
|
QMessageBox::Warning)->show();
|
||||||
|
|
||||||
JavaUtils ju;
|
JavaUtils ju;
|
||||||
java = ju.GetDefaultJava();
|
java = ju.GetDefaultJava();
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#include "logic/JavaUtils.h"
|
#include "logic/JavaUtils.h"
|
||||||
#include "gui/versionselectdialog.h"
|
#include "gui/versionselectdialog.h"
|
||||||
#include "gui/platform.h"
|
#include "gui/platform.h"
|
||||||
|
#include "gui/CustomMessageBox.h"
|
||||||
#include "logic/lists/JavaVersionList.h"
|
#include "logic/lists/JavaVersionList.h"
|
||||||
|
|
||||||
#include <settingsobject.h>
|
#include <settingsobject.h>
|
||||||
@ -119,10 +120,10 @@ void SettingsDialog::applySettings(SettingsObject *s)
|
|||||||
}
|
}
|
||||||
else if (!s->get("UseDevBuilds").toBool())
|
else if (!s->get("UseDevBuilds").toBool())
|
||||||
{
|
{
|
||||||
int response = QMessageBox::question(
|
auto response = CustomMessageBox::selectable(this, tr("Development builds"),
|
||||||
this, tr("Development builds"),
|
|
||||||
tr("Development builds contain experimental features "
|
tr("Development builds contain experimental features "
|
||||||
"and may be unstable. Are you sure you want to enable them?"));
|
"and may be unstable. Are you sure you want to enable them?"),
|
||||||
|
QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec();
|
||||||
if (response == QMessageBox::Yes)
|
if (response == QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
s->set("UseDevBuilds", true);
|
s->set("UseDevBuilds", true);
|
||||||
|
Loading…
Reference in New Issue
Block a user