diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-15 22:26:44 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-15 22:26:44 +0100 |
| commit | 8219dbf612f4e6f603d304348fc388e364602f98 (patch) | |
| tree | 2d0bafeb9ff7019f5b9b19bbf034665285d836ae /gui/dialogs | |
| parent | 3b236483dfe00f87c5f3b03220d78620f0f99f4d (diff) | |
| download | MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar.gz MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar.lz MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar.xz MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.zip | |
Underp. Don't depend on OneSix. Nicer "menu" style choosing.
Diffstat (limited to 'gui/dialogs')
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 25 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.ui | 38 |
2 files changed, 3 insertions, 60 deletions
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index 3039acc1..ba2052c6 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -374,18 +374,6 @@ void SettingsDialog::applySettings(SettingsObject *s) // Profilers s->set("JProfilerPath", ui->jprofilerPathEdit->text()); s->set("JVisualVMPath", ui->jvisualvmPathEdit->text()); - if (ui->profilerNoneBtn->isChecked()) - { - s->set("CurrentProfiler", QString()); - } - else if (ui->jprofilerBtn->isChecked()) - { - s->set("CurrentProfiler", "jprofiler"); - } - else if (ui->jvisualvmBtn->isChecked()) - { - s->set("CurrentProfiler", "jvisualvm"); - } } void SettingsDialog::loadSettings(SettingsObject *s) @@ -469,19 +457,6 @@ void SettingsDialog::loadSettings(SettingsObject *s) // Profilers ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString()); ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString()); - const QString currentProfiler = s->get("CurrentProfiler").toString(); - if (currentProfiler.isEmpty()) - { - ui->profilerNoneBtn->setChecked(true); - } - else if (currentProfiler == "jprofiler") - { - ui->jprofilerBtn->setChecked(true); - } - else if (currentProfiler == "jvisualvm") - { - ui->jvisualvmBtn->setChecked(true); - } } void SettingsDialog::on_javaDetectBtn_clicked() diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index 29cbbcba..8d9a7f87 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"> @@ -33,7 +33,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>5</number> </property> <widget class="QWidget" name="featuresTab"> <attribute name="title"> @@ -869,36 +869,6 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_13"> <item> - <widget class="QGroupBox" name="groupBox_4"> - <property name="title"> - <string>Active profiler</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_12"> - <item> - <widget class="QRadioButton" name="profilerNoneBtn"> - <property name="text"> - <string>None</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="jprofilerBtn"> - <property name="text"> - <string>JProfiler</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="jvisualvmBtn"> - <property name="text"> - <string>JVisualVM</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="groupBox_2"> <property name="title"> <string>JProfiler</string> @@ -1010,9 +980,7 @@ <tabstop>postExitCmdTextBox</tabstop> <tabstop>settingsTabs</tabstop> </tabstops> - <resources> - <include location="../../graphics.qrc"/> - </resources> + <resources/> <connections> <connection> <sender>buttonBox</sender> |