summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/ConsoleWindow.ui22
-rw-r--r--gui/MainWindow.cpp8
-rw-r--r--gui/dialogs/InstanceSettings.cpp11
-rw-r--r--gui/dialogs/InstanceSettings.ui13
-rw-r--r--gui/dialogs/SettingsDialog.ui16
5 files changed, 44 insertions, 26 deletions
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 @@
<rect>
<x>0</x>
<y>0</y>
- <width>600</width>
- <height>400</height>
+ <width>610</width>
+ <height>391</height>
</rect>
</property>
<property name="windowTitle">
@@ -23,6 +23,9 @@
<property name="rightMargin">
<number>0</number>
</property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
<item>
<widget class="QPlainTextEdit" name="text">
<property name="font">
@@ -49,6 +52,12 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@@ -65,14 +74,14 @@
<item>
<widget class="QPushButton" name="btnKillMinecraft">
<property name="text">
- <string>Kill Minecraft</string>
+ <string>&amp;Kill Minecraft</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closeButton">
<property name="text">
- <string>Close</string>
+ <string>&amp;Close</string>
</property>
</widget>
</item>
@@ -80,6 +89,11 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>text</tabstop>
+ <tabstop>closeButton</tabstop>
+ <tabstop>btnKillMinecraft</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 39e6dff2..62ae195b 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -535,9 +535,9 @@ void MainWindow::instanceActivated(QModelIndex index)
BaseInstance *inst =
(BaseInstance *)index.data(InstanceList::InstancePointerRole).value<void *>();
- NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this);
+ NagUtils::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this);
- bool autoLogin = MMC->settings()->get("AutoLogin").toBool();
+ bool autoLogin = inst->settings().get("AutoLogin").toBool();
if (autoLogin)
doAutoLogin();
else
@@ -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();
}
}
@@ -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..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)
@@ -89,11 +90,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
{
@@ -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
{
@@ -159,8 +162,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 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="accountSettingsGroupBox">
+ <widget class="QGroupBox" name="accountSettingsBox">
<property name="enabled">
<bool>true</bool>
</property>
@@ -147,16 +147,10 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
- <widget class="QCheckBox" name="autoLoginChecBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
+ <widget class="QCheckBox" name="autoLoginCheckBox">
<property name="text">
<string>Login automatically when an instance icon is double clicked?</string>
</property>
- <property name="checked">
- <bool>false</bool>
- </property>
</widget>
</item>
</layout>
@@ -403,8 +397,7 @@
<tabstop>consoleSettingsBox</tabstop>
<tabstop>showConsoleCheck</tabstop>
<tabstop>autoCloseConsoleCheck</tabstop>
- <tabstop>accountSettingsGroupBox</tabstop>
- <tabstop>autoLoginChecBox</tabstop>
+ <tabstop>accountSettingsBox</tabstop>
<tabstop>memoryGroupBox</tabstop>
<tabstop>minMemSpinBox</tabstop>
<tabstop>maxMemSpinBox</tabstop>
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 6da9420e..53a41d6e 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -262,10 +262,19 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="autoLoginCheckBox">
- <property name="text">
- <string>Login automatically when an instance icon is double clicked?</string>
+ <widget class="QGroupBox" name="accountSettingsBox">
+ <property name="title">
+ <string>Account Settings</string>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="autoLoginCheckBox">
+ <property name="text">
+ <string>Login automatically when an instance icon is double clicked?</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
@@ -515,7 +524,6 @@
<tabstop>windowHeightSpinBox</tabstop>
<tabstop>showConsoleCheck</tabstop>
<tabstop>autoCloseConsoleCheck</tabstop>
- <tabstop>autoLoginCheckBox</tabstop>
<tabstop>minMemSpinBox</tabstop>
<tabstop>maxMemSpinBox</tabstop>
<tabstop>permGenSpinBox</tabstop>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 03:54:43 +0000