diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-05-11 20:06:06 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-09 01:38:30 +0200 |
| commit | 8c71a5d61f20642711bff081be9be3807418e618 (patch) | |
| tree | e457cf3dae73a129ef403c448ac49db020760f2e /gui/dialogs | |
| parent | 6d34411f54f8db9fdec2d4a3acc82eedb65f6b36 (diff) | |
| download | MultiMC-8c71a5d61f20642711bff081be9be3807418e618.tar MultiMC-8c71a5d61f20642711bff081be9be3807418e618.tar.gz MultiMC-8c71a5d61f20642711bff081be9be3807418e618.tar.lz MultiMC-8c71a5d61f20642711bff081be9be3807418e618.tar.xz MultiMC-8c71a5d61f20642711bff081be9be3807418e618.zip | |
Move instance settings back to the main window.
Diffstat (limited to 'gui/dialogs')
| -rw-r--r-- | gui/dialogs/InstanceEditDialog.cpp | 7 | ||||
| -rw-r--r-- | gui/dialogs/InstanceEditDialog.h | 1 | ||||
| -rw-r--r-- | gui/dialogs/InstanceEditDialog.ui | 14 |
3 files changed, 0 insertions, 22 deletions
diff --git a/gui/dialogs/InstanceEditDialog.cpp b/gui/dialogs/InstanceEditDialog.cpp index 1fca3b7c..010410fd 100644 --- a/gui/dialogs/InstanceEditDialog.cpp +++ b/gui/dialogs/InstanceEditDialog.cpp @@ -190,13 +190,6 @@ bool InstanceEditDialog::reloadInstanceVersion() } } -void InstanceEditDialog::on_settingsBtn_clicked() -{ - InstanceSettings settings(&m_inst->settings(), this); - settings.setWindowTitle(tr("Instance settings")); - settings.exec(); -} - void InstanceEditDialog::on_reloadLibrariesBtn_clicked() { reloadInstanceVersion(); diff --git a/gui/dialogs/InstanceEditDialog.h b/gui/dialogs/InstanceEditDialog.h index ea2c6496..d601074a 100644 --- a/gui/dialogs/InstanceEditDialog.h +++ b/gui/dialogs/InstanceEditDialog.h @@ -42,7 +42,6 @@ slots: void on_reloadLibrariesBtn_clicked(); void on_removeLibraryBtn_clicked(); void on_resetLibraryOrderBtn_clicked(); - void on_settingsBtn_clicked(); void on_moveLibraryUpBtn_clicked(); void on_moveLibraryDownBtn_clicked(); diff --git a/gui/dialogs/InstanceEditDialog.ui b/gui/dialogs/InstanceEditDialog.ui index 0ad79833..85e93686 100644 --- a/gui/dialogs/InstanceEditDialog.ui +++ b/gui/dialogs/InstanceEditDialog.ui @@ -152,20 +152,6 @@ </widget> </item> <item> - <widget class="Line" name="line_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="settingsBtn"> - <property name="text"> - <string>Settings</string> - </property> - </widget> - </item> - <item> <spacer name="verticalSpacer_7"> <property name="orientation"> <enum>Qt::Vertical</enum> |