From 8c71a5d61f20642711bff081be9be3807418e618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 11 May 2014 20:06:06 +0200
Subject: Move instance settings back to the main window.

---
 gui/dialogs/InstanceEditDialog.cpp |  7 -------
 gui/dialogs/InstanceEditDialog.h   |  1 -
 gui/dialogs/InstanceEditDialog.ui  | 14 --------------
 3 files changed, 22 deletions(-)

(limited to 'gui/dialogs')

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
@@ -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">
-- 
cgit v1.2.3