Move instance settings back to the main window.

6 files changed, 14 insertions, 24 deletions

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index be1b9fd8..568607a7 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -941,6 +941,16 @@ void MainWindow::on_actionSettings_triggered()
 	updateToolsMenu();
 }
 
+void MainWindow::on_actionInstanceSettings_triggered()
+{
+	if (m_selectedInstance)
+	{
+		InstanceSettings settings(&m_selectedInstance->settings(), this);
+		settings.setWindowTitle(tr("Instance settings"));
+		settings.exec();
+	}
+}
+
 void MainWindow::on_actionManageAccounts_triggered()
 {
 	AccountListDialog dialog(this);
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index cc8b7c99..182e9c0c 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -80,6 +80,8 @@ slots:
 
 	void on_actionSettings_triggered();
 
+	void on_actionInstanceSettings_triggered();
+
 	void on_actionManageAccounts_triggered();
 
 	void on_actionReportBug_triggered();
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 188433e9..c79dc948 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -116,7 +116,7 @@
    <addaction name="actionScreenshots"/>
    <addaction name="separator"/>
    <addaction name="actionEditInstance"/>
-   <addaction name="actionInstance_Settings"/>
+   <addaction name="actionInstanceSettings"/>
    <addaction name="actionViewSelectedInstFolder"/>
    <addaction name="actionConfig_Folder"/>
    <addaction name="separator"/>
@@ -489,7 +489,7 @@
     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;View and upload screenshots for this instance&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </action>
-  <action name="actionInstance_Settings">
+  <action name="actionInstanceSettings">
    <property name="text">
     <string>Instance Settings</string>
    </property>
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>