0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move instance settings back to the main window.

Browse Source
This commit is contained in:
Petr Mrázek
2014-05-11 20:06:06 +02:00
parent 6d34411f54
commit 8c71a5d61f
6 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/dialogs/InstanceEditDialog.cpp
View File

@@ -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();

1
gui/dialogs/InstanceEditDialog.h
View File

@@ -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();

14
gui/dialogs/InstanceEditDialog.ui
View File

@@ -151,20 +151,6 @@
</property>
</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">