summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/SettingsDialog.ui
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-04 19:46:47 -0600
committerForkk <forkk@forkk.net>2014-01-04 19:46:47 -0600
commitd30962bf00b491f3cc23c505b6597c7618ddcd8c (patch)
treeaf3f06ea65447fb6a51deba68263690a9271ddb1 /gui/dialogs/SettingsDialog.ui
parent116a6458b5ba35c87f6a22783d509a1fe8672f24 (diff)
downloadMultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar.gz
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar.lz
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar.xz
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.zip
Implement changing update channels
Allow the user to select which update channel they would like to download updates from.
Diffstat (limited to 'gui/dialogs/SettingsDialog.ui')
-rw-r--r--gui/dialogs/SettingsDialog.ui38
1 files changed, 27 insertions, 11 deletions
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index dbc8ca88..12db55a4 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>526</width>
- <height>628</height>
+ <height>639</height>
</rect>
</property>
<property name="sizePolicy">
@@ -77,14 +77,7 @@
<property name="title">
<string>Update Settings</string>
</property>
- <layout class="QVBoxLayout" name="updateSettingsBoxLayout">
- <item>
- <widget class="QCheckBox" name="devBuildsCheckBox">
- <property name="text">
- <string>Use development builds?</string>
- </property>
- </widget>
- </item>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QCheckBox" name="autoUpdateCheckBox">
<property name="text">
@@ -92,6 +85,31 @@
</property>
</widget>
</item>
+ <item>
+ <layout class="QVBoxLayout" name="channelVerticalLayout">
+ <item>
+ <widget class="QLabel" name="updateChannelLabel">
+ <property name="text">
+ <string>Update Channel:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="updateChannelComboBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="updateChannelDescLabel">
+ <property name="text">
+ <string>No channel selected.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
@@ -644,11 +662,9 @@
</layout>
</widget>
<tabstops>
- <tabstop>settingsTab</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>sortLastLaunchedBtn</tabstop>
<tabstop>sortByNameBtn</tabstop>
- <tabstop>devBuildsCheckBox</tabstop>
<tabstop>autoUpdateCheckBox</tabstop>
<tabstop>instDirTextBox</tabstop>
<tabstop>modsDirTextBox</tabstop>