From 3ac471eb2f737d2aca93a456b638631af4e68c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczyk?= <mikus12@gmail.com>
Date: Wed, 13 Feb 2013 23:08:55 +0100
Subject: [PATCH] Rearrangement of Qt menu

---
 Qt/mainwindow.cpp |  16 ++++++
 Qt/mainwindow.h   |   4 ++
 Qt/mainwindow.ui  | 127 +++++++++++++++++++++++++++++-----------------
 3 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 057463968a..c951d70f53 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -250,6 +250,8 @@ void MainWindow::UpdateMenus()
 	ui->action_AF16x->setChecked(g_Config.iAnisotropyLevel == 16);
 	ui->action_Simple_2xAA->setChecked(g_Config.SSAntiAliasing);
 	ui->action_Show_FPS_counter->setChecked(g_Config.bShowFPSCounter);
+	ui->action_Stretch_to_display->setChecked(g_Config.bStretchToDisplay);
+	ui->action_Sound->setChecked(g_Config.bEnableSound);
 
 	bool enable = !Core_IsStepping() ? false : true;
 	ui->action_EmulationRun->setEnabled(g_State.bEmuThreadStarted ? enable : false);
@@ -1011,3 +1013,17 @@ void MainWindow::on_action_Show_FPS_counter_triggered()
 	g_Config.bShowFPSCounter = !g_Config.bShowFPSCounter;
 	UpdateMenus();
 }
+
+void MainWindow::on_action_Stretch_to_display_triggered()
+{
+	g_Config.bStretchToDisplay = !g_Config.bStretchToDisplay;
+	UpdateMenus();
+	if (gpu)
+		gpu->Resized();
+}
+
+void MainWindow::on_action_Sound_triggered()
+{
+	g_Config.bEnableSound = !g_Config.bEnableSound;
+	UpdateMenus();
+}
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index 81603a641f..9b83c867ae 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -167,6 +167,10 @@ private slots:
 
 	void on_action_Show_FPS_counter_triggered();
 
+	void on_action_Stretch_to_display_triggered();
+
+	void on_action_Sound_triggered();
+
 private:
 	void loadLanguage(const QString &language);
 	void createLanguageMenu();
diff --git a/Qt/mainwindow.ui b/Qt/mainwindow.ui
index 78eeedfad9..a167aad884 100644
--- a/Qt/mainwindow.ui
+++ b/Qt/mainwindow.ui
@@ -71,10 +71,6 @@
     <addaction name="action_EmulationReset"/>
     <addaction name="separator"/>
     <addaction name="action_EmulationRunLoad"/>
-    <addaction name="separator"/>
-    <addaction name="action_CPUInterpreter"/>
-    <addaction name="action_CPUFastInterpreter"/>
-    <addaction name="action_CPUDynarec"/>
    </widget>
    <widget class="QMenu" name="menuDebu_g">
     <property name="title">
@@ -96,7 +92,7 @@
     </property>
     <widget class="QMenu" name="menu_Log_Levels">
      <property name="title">
-      <string>&amp;Log Levels</string>
+      <string>Lo&amp;g Levels</string>
      </property>
      <widget class="QMenu" name="menuG3D">
       <property name="title">
@@ -130,54 +126,77 @@
      <addaction name="menuG3D"/>
      <addaction name="menuHLE"/>
     </widget>
-    <widget class="QMenu" name="menuZoom">
-     <property name="title">
-      <string>Zoom</string>
-     </property>
-     <addaction name="action_OptionsScreen1x"/>
-     <addaction name="action_OptionsScreen2x"/>
-     <addaction name="action_OptionsScreen3x"/>
-     <addaction name="action_OptionsScreen4x"/>
-    </widget>
     <widget class="QMenu" name="menuLanguage">
      <property name="title">
-      <string>Language</string>
+      <string>&amp;Language</string>
      </property>
     </widget>
-    <widget class="QMenu" name="menuAnisotropic_filtering">
+    <widget class="QMenu" name="menuVideo">
      <property name="title">
-      <string>Anisotropic filtering</string>
+      <string>&amp;Video</string>
      </property>
-     <addaction name="action_AFOff"/>
-     <addaction name="action_AF2x"/>
-     <addaction name="action_AF4x"/>
-     <addaction name="action_AF8x"/>
-     <addaction name="action_AF16x"/>
+     <widget class="QMenu" name="menuAnisotropic_filtering">
+      <property name="title">
+       <string>&amp;Anisotropic filtering</string>
+      </property>
+      <addaction name="action_AFOff"/>
+      <addaction name="action_AF2x"/>
+      <addaction name="action_AF4x"/>
+      <addaction name="action_AF8x"/>
+      <addaction name="action_AF16x"/>
+     </widget>
+     <widget class="QMenu" name="menuZoom">
+      <property name="title">
+       <string>&amp;Zoom</string>
+      </property>
+      <addaction name="action_OptionsScreen1x"/>
+      <addaction name="action_OptionsScreen2x"/>
+      <addaction name="action_OptionsScreen3x"/>
+      <addaction name="action_OptionsScreen4x"/>
+     </widget>
+     <addaction name="menuAnisotropic_filtering"/>
+     <addaction name="action_OptionsBufferedRendering"/>
+     <addaction name="action_OptionsLinearFiltering"/>
+     <addaction name="action_Simple_2xAA"/>
+     <addaction name="separator"/>
+     <addaction name="menuZoom"/>
+     <addaction name="action_Stretch_to_display"/>
+     <addaction name="separator"/>
+     <addaction name="action_OptionsHardwareTransform"/>
+     <addaction name="action_OptionsUseVBO"/>
+     <addaction name="action_OptionsVertexCache"/>
+     <addaction name="action_OptionsWireframe"/>
+     <addaction name="action_OptionsDisplayRawFramebuffer"/>
     </widget>
-    <addaction name="action_OptionsControls"/>
-    <addaction name="action_OptionsGamePadControls"/>
+    <widget class="QMenu" name="menuControls">
+     <property name="title">
+      <string>Co&amp;ntrols</string>
+     </property>
+     <addaction name="action_OptionsControls"/>
+     <addaction name="action_OptionsGamePadControls"/>
+    </widget>
+    <widget class="QMenu" name="menuCore">
+     <property name="title">
+      <string>&amp;Core</string>
+     </property>
+     <addaction name="action_CPUInterpreter"/>
+     <addaction name="action_CPUFastInterpreter"/>
+     <addaction name="action_CPUDynarec"/>
+     <addaction name="separator"/>
+     <addaction name="action_OptionsFastMemory"/>
+     <addaction name="action_OptionsIgnoreIllegalReadsWrites"/>
+    </widget>
+    <addaction name="menuCore"/>
+    <addaction name="menuControls"/>
+    <addaction name="menuVideo"/>
+    <addaction name="action_Sound"/>
     <addaction name="separator"/>
     <addaction name="action_OptionsFullScreen"/>
-    <addaction name="action_OptionsBufferedRendering"/>
-    <addaction name="action_OptionsHardwareTransform"/>
-    <addaction name="action_OptionsLinearFiltering"/>
-    <addaction name="action_Simple_2xAA"/>
-    <addaction name="menuAnisotropic_filtering"/>
-    <addaction name="action_OptionsUseVBO"/>
-    <addaction name="action_OptionsVertexCache"/>
-    <addaction name="separator"/>
-    <addaction name="action_OptionsWireframe"/>
-    <addaction name="action_OptionsDisplayRawFramebuffer"/>
     <addaction name="action_OptionsShowDebugStatistics"/>
     <addaction name="action_Show_FPS_counter"/>
     <addaction name="separator"/>
     <addaction name="menu_Log_Levels"/>
     <addaction name="separator"/>
-    <addaction name="menuZoom"/>
-    <addaction name="separator"/>
-    <addaction name="action_OptionsFastMemory"/>
-    <addaction name="action_OptionsIgnoreIllegalReadsWrites"/>
-    <addaction name="separator"/>
     <addaction name="menuLanguage"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
@@ -339,12 +358,12 @@
   </action>
   <action name="action_OptionsControls">
    <property name="text">
-    <string>Keyboard &amp;Controls</string>
+    <string>&amp;Keyboard</string>
    </property>
   </action>
   <action name="action_OptionsFullScreen">
    <property name="text">
-    <string>&amp;Toggle Full Screen</string>
+    <string>&amp;Toggle fullscreen</string>
    </property>
    <property name="shortcut">
     <string>F12</string>
@@ -401,7 +420,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Show Debug Statistics</string>
+    <string>Show &amp;debug statistics</string>
    </property>
   </action>
   <action name="action_OptionsScreen1x">
@@ -461,7 +480,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Ignore illegal reads/writes</string>
+    <string>I&amp;gnore illegal reads/writes</string>
    </property>
   </action>
   <action name="action_HelpOpenWebsite">
@@ -580,12 +599,12 @@
   </action>
   <action name="action_OptionsGamePadControls">
    <property name="text">
-    <string>GamePad Controls</string>
+    <string>&amp;Gamepad</string>
    </property>
   </action>
   <action name="action_EmulationRunLoad">
    <property name="text">
-    <string>&amp;Run on load</string>
+    <string>Run on loa&amp;d</string>
    </property>
   </action>
   <action name="action_DebugDumpFrame">
@@ -659,7 +678,23 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Show FPS counter</string>
+    <string>Show &amp;FPS counter</string>
+   </property>
+  </action>
+  <action name="action_Stretch_to_display">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>S&amp;tretch to display</string>
+   </property>
+  </action>
+  <action name="action_Sound">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Sound emulation</string>
    </property>
   </action>
  </widget>