summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gui/MainWindow.cpp4
-rw-r--r--gui/dialogs/InstanceSettings.cpp8
-rw-r--r--gui/dialogs/InstanceSettings.ui13
-rw-r--r--gui/dialogs/SettingsDialog.ui18
4 files changed, 22 insertions, 21 deletions
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 @@
</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..a036cd09 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -33,7 +33,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="generalTab">
<attribute name="title">
@@ -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>