CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NagUtils and hack GroupView to work

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-01 18:54:58 +01:00
parent aa70ed2244
commit 382ae78a0b
10 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/pages/InstanceSettingsPage.cpp
View File

@ -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());

6
gui/pages/global/JavaPage.cpp
View File

@ -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();
}

2
gui/pages/global/MinecraftPage.cpp
View File

@ -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"

2
gui/pages/global/MultiMCPage.cpp
View File

@ -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"