summaryrefslogtreecommitdiffstats
path: root/gui/dialogs
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-16 08:54:52 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-16 08:54:52 +0100
commit82b35b5445d88d67c89c6547b24053d31dc35b9c (patch)
tree333b6a40d558ab3022f7e68297f9b14863c854bc /gui/dialogs
parent7ceb2cacb129d5924087f616cfc0b949689ed4fe (diff)
downloadMultiMC-82b35b5445d88d67c89c6547b24053d31dc35b9c.tar
MultiMC-82b35b5445d88d67c89c6547b24053d31dc35b9c.tar.gz
MultiMC-82b35b5445d88d67c89c6547b24053d31dc35b9c.tar.lz
MultiMC-82b35b5445d88d67c89c6547b24053d31dc35b9c.tar.xz
MultiMC-82b35b5445d88d67c89c6547b24053d31dc35b9c.zip
Fix stuff. Make sure different ways of aborting profiling work.
Diffstat (limited to 'gui/dialogs')
-rw-r--r--gui/dialogs/SettingsDialog.ui8
1 files changed, 5 insertions, 3 deletions
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 8d9a7f87..acf360a3 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -20,7 +20,7 @@
<string>Settings</string>
</property>
<property name="windowIcon">
- <iconset>
+ <iconset resource="../../graphics.qrc">
<normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
</property>
<property name="modal">
@@ -33,7 +33,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
- <number>5</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="featuresTab">
<attribute name="title">
@@ -980,7 +980,9 @@
<tabstop>postExitCmdTextBox</tabstop>
<tabstop>settingsTabs</tabstop>
</tabstops>
- <resources/>
+ <resources>
+ <include location="../../graphics.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>