diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-02-01 18:54:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:17 +0200 |
| commit | 382ae78a0bf75892827321b052c6afbd195476bc (patch) | |
| tree | 9e06d49f018dc8cd689372b6a9c51c2a2c9f219e /gui/pages | |
| parent | aa70ed2244700dbcc93c1fadb22edc1c1caede37 (diff) | |
| download | PrismLauncher-382ae78a0bf75892827321b052c6afbd195476bc.tar.gz PrismLauncher-382ae78a0bf75892827321b052c6afbd195476bc.tar.bz2 PrismLauncher-382ae78a0bf75892827321b052c6afbd195476bc.zip | |
Fix NagUtils and hack GroupView to work
Diffstat (limited to 'gui/pages')
| -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 |
4 files changed, 7 insertions, 7 deletions
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" |