diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
| commit | e241c3625c2e0f005ee2cb01577ceeb054bbbd98 (patch) | |
| tree | b874caae329a536ca15b331be386cf481307d28f /gui/dialogs/SettingsDialog.ui | |
| parent | 421a46e3d3036ea0dea4889125ee58309d0ed21e (diff) | |
| parent | d2b2d55aa9a4031d1e179534796cbe07bc57080f (diff) | |
| download | MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.gz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.lz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.xz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.zip | |
Merge branch 'feature_theme_support' into develop
Conflicts:
main.cpp
Diffstat (limited to 'gui/dialogs/SettingsDialog.ui')
| -rw-r--r-- | gui/dialogs/SettingsDialog.ui | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index 74ed68d2..d4e90302 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -20,7 +20,7 @@ <string>Settings</string> </property> <property name="windowIcon"> - <iconset resource="../../graphics.qrc"> + <iconset> <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset> </property> <property name="modal"> @@ -327,6 +327,43 @@ </widget> </item> <item> + <widget class="QGroupBox" name="themeBox"> + <property name="title"> + <string>Icon Theme</string> + </property> + <layout class="QHBoxLayout" name="themeBoxLayout"> + <item> + <widget class="QComboBox" name="themeComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string>Default</string> + </property> + </item> + <item> + <property name="text"> + <string>Simple</string> + </property> + </item> + <item> + <property name="text"> + <string>Simple (Light Icons)</string> + </property> + </item> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="editorsBox"> <property name="title"> <string>External Editors (leave empty for system default)</string> |