From cd108fd02975eac3a3fed2fde26c58de5cbdaf1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 4 Sep 2015 02:10:29 +0200
Subject: GH-1223 fix override settings

They now work more like passthrough settings, except not passing through set and reset
---
 application/pages/InstanceSettingsPage.cpp |  3 +++
 application/pages/InstanceSettingsPage.ui  | 29 ++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'application')

diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp
index 296de379..c651fcbd 100644
--- a/application/pages/InstanceSettingsPage.cpp
+++ b/application/pages/InstanceSettingsPage.cpp
@@ -119,11 +119,13 @@ void InstanceSettingsPage::applySettings()
 	if (custcmd)
 	{
 		m_settings->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text());
+		m_settings->set("WrapperCommand", ui->preLaunchCmdTextBox->text());
 		m_settings->set("PostExitCommand", ui->postExitCmdTextBox->text());
 	}
 	else
 	{
 		m_settings->reset("PreLaunchCommand");
+		m_settings->reset("WrapperCommand");
 		m_settings->reset("PostExitCommand");
 	}
 }
@@ -161,6 +163,7 @@ void InstanceSettingsPage::loadSettings()
 	// Custom Commands
 	ui->customCommandsGroupBox->setChecked(m_settings->get("OverrideCommands").toBool());
 	ui->preLaunchCmdTextBox->setText(m_settings->get("PreLaunchCommand").toString());
+	ui->wrapperCmdTextBox->setText(m_settings->get("WrapperCommand").toString());
 	ui->postExitCmdTextBox->setText(m_settings->get("PostExitCommand").toString());
 }
 
diff --git a/application/pages/InstanceSettingsPage.ui b/application/pages/InstanceSettingsPage.ui
index 64109378..c9c16a6c 100644
--- a/application/pages/InstanceSettingsPage.ui
+++ b/application/pages/InstanceSettingsPage.ui
@@ -45,7 +45,7 @@
           <bool>true</bool>
          </property>
          <property name="title">
-          <string>Java installation</string>
+          <string>Java ins&amp;tallation</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -87,7 +87,7 @@
           <bool>true</bool>
          </property>
          <property name="title">
-          <string>Memory</string>
+          <string>Memor&amp;y</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -305,7 +305,7 @@
           <bool>true</bool>
          </property>
          <property name="title">
-          <string>Console Settings</string>
+          <string>Conso&amp;le Settings</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -357,7 +357,7 @@
           <bool>true</bool>
          </property>
          <property name="title">
-          <string>Custom Commands</string>
+          <string>Cus&amp;tom Commands</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -366,16 +366,16 @@
           <bool>false</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
-          </item>
-          <item row="1" column="0">
+          <item row="2" column="0">
            <widget class="QLabel" name="labelPostExitCmd">
             <property name="text">
              <string>Post-exit command:</string>
             </property>
            </widget>
           </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
+          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="labelPreLaunchCmd">
             <property name="text">
@@ -383,9 +383,19 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="2" column="1">
            <widget class="QLineEdit" name="postExitCmdTextBox"/>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelWrapperCmd">
+            <property name="text">
+             <string>Wrapper command:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="wrapperCmdTextBox"/>
+          </item>
          </layout>
         </widget>
        </item>
@@ -446,6 +456,7 @@
   <tabstop>autoCloseConsoleCheck</tabstop>
   <tabstop>customCommandsGroupBox</tabstop>
   <tabstop>preLaunchCmdTextBox</tabstop>
+  <tabstop>wrapperCmdTextBox</tabstop>
   <tabstop>postExitCmdTextBox</tabstop>
  </tabstops>
  <resources/>
-- 
cgit v1.2.3