From 51dee3745f044e413797eb5ea3f8260d1ff6935b Mon Sep 17 00:00:00 2001 From: Sky Date: Wed, 6 Nov 2013 01:01:09 +0000 Subject: Fix "Auto Login" instance specific setting, tweak UI --- gui/MainWindow.cpp | 4 ++-- gui/dialogs/InstanceSettings.cpp | 8 ++++---- gui/dialogs/InstanceSettings.ui | 13 +++---------- gui/dialogs/SettingsDialog.ui | 18 +++++++++++++----- 4 files changed, 22 insertions(+), 21 deletions(-) (limited to 'gui') diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 39e6dff2..cf4a7124 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -537,7 +537,7 @@ void MainWindow::instanceActivated(QModelIndex index) NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this); - bool autoLogin = MMC->settings()->get("AutoLogin").toBool(); + bool autoLogin = inst->settings().get("AutoLogin").toBool(); if (autoLogin) doAutoLogin(); else @@ -826,7 +826,7 @@ void MainWindow::on_actionInstanceSettings_triggered() return; InstanceSettings settings(&m_selectedInstance->settings(), this); - settings.setWindowTitle(QString("Instance settings")); + settings.setWindowTitle(tr("Instance settings")); settings.exec(); } diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp index 57dd6a81..a3269878 100644 --- a/gui/dialogs/InstanceSettings.cpp +++ b/gui/dialogs/InstanceSettings.cpp @@ -89,11 +89,11 @@ void InstanceSettings::applySettings() } // Auto Login - bool login = ui->accountSettingsGroupBox->isChecked(); + bool login = ui->accountSettingsBox->isChecked(); m_obj->set("OverrideLogin", login); if (login) { - m_obj->set("AutoLogin", ui->autoLoginChecBox->isChecked()); + m_obj->set("AutoLogin", ui->autoLoginCheckBox->isChecked()); } else { @@ -159,8 +159,8 @@ void InstanceSettings::loadSettings() ui->windowHeightSpinBox->setValue(m_obj->get("MinecraftWinHeight").toInt()); // Auto Login - ui->accountSettingsGroupBox->setChecked(m_obj->get("OverrideLogin").toBool()); - ui->autoLoginChecBox->setChecked(m_obj->get("AutoLogin").toBool()); + ui->accountSettingsBox->setChecked(m_obj->get("OverrideLogin").toBool()); + ui->autoLoginCheckBox->setChecked(m_obj->get("AutoLogin").toBool()); // Memory ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool()); diff --git a/gui/dialogs/InstanceSettings.ui b/gui/dialogs/InstanceSettings.ui index b536e9ff..27004ed8 100644 --- a/gui/dialogs/InstanceSettings.ui +++ b/gui/dialogs/InstanceSettings.ui @@ -132,7 +132,7 @@ - + true @@ -147,16 +147,10 @@ - - - false - + Login automatically when an instance icon is double clicked? - - false - @@ -403,8 +397,7 @@ consoleSettingsBox showConsoleCheck autoCloseConsoleCheck - accountSettingsGroupBox - autoLoginChecBox + accountSettingsBox memoryGroupBox minMemSpinBox maxMemSpinBox diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index 6da9420e..a036cd09 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -33,7 +33,7 @@ QTabWidget::Rounded - 0 + 1 @@ -262,10 +262,19 @@ - - - Login automatically when an instance icon is double clicked? + + + Account Settings + + + + + Login automatically when an instance icon is double clicked? + + + + @@ -515,7 +524,6 @@ windowHeightSpinBox showConsoleCheck autoCloseConsoleCheck - autoLoginCheckBox minMemSpinBox maxMemSpinBox permGenSpinBox -- cgit From dd6af4efab11b0c1c4344bcb780abf1701b51511 Mon Sep 17 00:00:00 2001 From: Sky Date: Wed, 6 Nov 2013 01:18:47 +0000 Subject: Nag for instance specific JVM args too --- gui/MainWindow.cpp | 4 ++-- gui/dialogs/InstanceSettings.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'gui') diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index cf4a7124..62ae195b 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -535,7 +535,7 @@ void MainWindow::instanceActivated(QModelIndex index) BaseInstance *inst = (BaseInstance *)index.data(InstanceList::InstancePointerRole).value(); - NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this); + NagUtils::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this); bool autoLogin = inst->settings().get("AutoLogin").toBool(); if (autoLogin) @@ -548,7 +548,7 @@ void MainWindow::on_actionLaunchInstance_triggered() { if (m_selectedInstance) { - NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this); + NagUtils::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this); doLogin(); } } diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp index a3269878..add135b4 100644 --- a/gui/dialogs/InstanceSettings.cpp +++ b/gui/dialogs/InstanceSettings.cpp @@ -20,6 +20,7 @@ #include "InstanceSettings.h" #include "ui_InstanceSettings.h" #include "gui/Platform.h" +#include "logic/NagUtils.h" InstanceSettings::InstanceSettings(SettingsObject *obj, QWidget *parent) : m_obj(obj), QDialog(parent), ui(new Ui::InstanceSettings) @@ -123,6 +124,8 @@ void InstanceSettings::applySettings() { m_obj->set("JavaPath", ui->javaPathTextBox->text()); m_obj->set("JvmArgs", ui->jvmArgsTextBox->text()); + + NagUtils::checkJVMArgs(m_obj->get("JvmArgs").toString(), this->parentWidget()); } else { -- cgit From bba4ed5ab2c98c3d60a141d6a089a49716753615 Mon Sep 17 00:00:00 2001 From: Sky Date: Wed, 6 Nov 2013 17:00:02 +0000 Subject: Open on the correct settings tab --- gui/dialogs/SettingsDialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui') diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index a036cd09..53a41d6e 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -33,7 +33,7 @@ QTabWidget::Rounded - 1 + 0 -- cgit From ad7c41114ff2fd2220111fd0f71f052375aed68e Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Thu, 7 Nov 2013 22:31:15 +0100 Subject: Fix layout margins in console window --- gui/ConsoleWindow.ui | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'gui') diff --git a/gui/ConsoleWindow.ui b/gui/ConsoleWindow.ui index 8dc80015..472c7c8d 100644 --- a/gui/ConsoleWindow.ui +++ b/gui/ConsoleWindow.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 400 + 610 + 391 @@ -23,6 +23,9 @@ 0 + + 6 + @@ -49,6 +52,12 @@ + + 6 + + + 6 + @@ -65,14 +74,14 @@ - Kill Minecraft + &Kill Minecraft - Close + &Close @@ -80,6 +89,11 @@ + + text + closeButton + btnKillMinecraft + -- cgit