diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gui/MainWindow.cpp | 2 | ||||
| -rw-r--r-- | gui/NagUtils.cpp (renamed from logic/NagUtils.cpp) | 2 | ||||
| -rw-r--r-- | gui/NagUtils.h (renamed from logic/NagUtils.h) | 0 | ||||
| -rw-r--r-- | gui/pages/InstanceSettingsPage.cpp | 4 | ||||
| -rw-r--r-- | gui/pages/global/JavaPage.cpp | 6 | ||||
| -rw-r--r-- | gui/pages/global/MinecraftPage.cpp | 2 | ||||
| -rw-r--r-- | gui/pages/global/MultiMCPage.cpp | 2 | ||||
| -rw-r--r-- | logic/InstanceList.cpp | 5 | ||||
| -rw-r--r-- | logic/InstanceList.h | 2 |
10 files changed, 14 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fc3240b..1229bcfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -408,8 +408,8 @@ SET(MULTIMC_SOURCES logic/minecraft/VersionFilterData.cpp # Annoying nag screen logic - logic/NagUtils.h - logic/NagUtils.cpp + gui/NagUtils.h + gui/NagUtils.cpp # Player skin utilities logic/SkinUtils.h diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index fb3bfd6f..f0d882ba 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -382,7 +382,7 @@ namespace Ui { #include "logic/BaseProcess.h" #include "logic/OneSixUpdate.h" #include "logic/java/JavaUtils.h" -#include "logic/NagUtils.h" +#include "gui/NagUtils.h" #include "logic/SkinUtils.h" #include "logic/LegacyInstance.h" diff --git a/logic/NagUtils.cpp b/gui/NagUtils.cpp index c55e7817..429bdfcf 100644 --- a/logic/NagUtils.cpp +++ b/gui/NagUtils.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/NagUtils.h" +#include "gui/NagUtils.h" #include "gui/dialogs/CustomMessageBox.h" namespace NagUtils diff --git a/logic/NagUtils.h b/gui/NagUtils.h index d757703a..d757703a 100644 --- a/logic/NagUtils.h +++ b/gui/NagUtils.h diff --git a/gui/pages/InstanceSettingsPage.cpp b/gui/pages/InstanceSettingsPage.cpp index 34b1b401..e1a9c666 100644 --- a/gui/pages/InstanceSettingsPage.cpp +++ b/gui/pages/InstanceSettingsPage.cpp @@ -6,7 +6,7 @@ #include <QMessageBox> #include "gui/dialogs/VersionSelectDialog.h" -#include "logic/NagUtils.h" +#include "gui/NagUtils.h" #include "logic/java/JavaVersionList.h" #include "MultiMC.h" @@ -148,7 +148,7 @@ void InstanceSettingsPage::loadSettings() bool overrideJava = m_settings->get("OverrideJava").toBool(); bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool() || overrideJava; bool overrideArgs = m_settings->get("OverrideJavaArgs").toBool() || overrideJava; - + ui->javaSettingsGroupBox->setChecked(overrideLocation); ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString()); diff --git a/gui/pages/global/JavaPage.cpp b/gui/pages/global/JavaPage.cpp index 31a5e1d7..b0ed23ea 100644 --- a/gui/pages/global/JavaPage.cpp +++ b/gui/pages/global/JavaPage.cpp @@ -22,7 +22,7 @@ #include <pathutils.h> -#include "logic/NagUtils.h" +#include "gui/NagUtils.h" #include "gui/Platform.h" #include "gui/dialogs/VersionSelectDialog.h" @@ -39,11 +39,11 @@ JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage) { ui->setupUi(this); ui->tabWidget->tabBar()->hide(); - + auto resizer = new ColumnResizer(this); resizer->addWidgetsFromLayout(ui->javaSettingsGroupBox->layout(), 0); resizer->addWidgetsFromLayout(ui->customCommandsGroupBox->layout(), 0); - + loadSettings(); } diff --git a/gui/pages/global/MinecraftPage.cpp b/gui/pages/global/MinecraftPage.cpp index 5566542c..5f752206 100644 --- a/gui/pages/global/MinecraftPage.cpp +++ b/gui/pages/global/MinecraftPage.cpp @@ -26,7 +26,7 @@ #include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/CustomMessageBox.h" -#include "logic/NagUtils.h" +#include "gui/NagUtils.h" #include "logic/java/JavaUtils.h" #include "logic/java/JavaVersionList.h" diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp index cc923b2f..3226de83 100644 --- a/gui/pages/global/MultiMCPage.cpp +++ b/gui/pages/global/MultiMCPage.cpp @@ -28,7 +28,7 @@ #include "gui/dialogs/CustomMessageBox.h" #include <gui/ColumnResizer.h> -#include "logic/NagUtils.h" +#include "gui/NagUtils.h" #include "logic/java/JavaUtils.h" #include "logic/java/JavaVersionList.h" diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp index b6ac38a8..4e275254 100644 --- a/logic/InstanceList.cpp +++ b/logic/InstanceList.cpp @@ -36,7 +36,6 @@ #include "OneSixInstance.h" #include "LegacyInstance.h" #include "logger/QsLog.h" -#include "gui/groupview/GroupView.h" const static int GROUP_FILE_FORMAT_VERSION = 1; @@ -99,8 +98,8 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const QString key = pdata->iconKey(); return ENV.icons()->getIcon(key); } - // for now. - case GroupViewRoles::GroupRole: + // HACK: see GroupView.h in gui! + case GroupRole: { return pdata->group(); } diff --git a/logic/InstanceList.h b/logic/InstanceList.h index ac3dc848..9600ffe9 100644 --- a/logic/InstanceList.h +++ b/logic/InstanceList.h @@ -18,7 +18,6 @@ #include <QObject> #include <QAbstractListModel> #include <QSet> -#include <gui/groupview/GroupedProxyModel.h> #include "logic/BaseInstance.h" @@ -47,6 +46,7 @@ public: enum AdditionalRoles { + GroupRole = Qt::UserRole, InstancePointerRole = 0x34B1CB48, ///< Return pointer to real instance InstanceIDRole = 0x34B1CB49 ///< Return id if the instance }; |