diff options
author | Andrew <forkk@forkk.net> | 2013-11-11 11:37:15 -0600 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-11-11 11:37:15 -0600 |
commit | 950088bee5d66b3656ba9506d7e4f9b61def5f49 (patch) | |
tree | 895e74767b71f5907d006ce01f47ea7d1e0f97ff /gui/dialogs/InstanceSettings.ui | |
parent | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (diff) | |
parent | e611aef0e77f727d0c77f6dea0d373e7a12b241c (diff) | |
download | PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.tar.gz PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.tar.bz2 PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.zip |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui/dialogs/InstanceSettings.ui')
-rw-r--r-- | gui/dialogs/InstanceSettings.ui | 13 |
1 files changed, 3 insertions, 10 deletions
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> |