From d892f7077d8ea6773e43cad89846034c41e25a24 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 22 Nov 2013 14:05:36 +1000
Subject: [PATCH] Qt: Cleanup the menu creation even more. Use classes instead
 of defines. Now automatically translates and sets state. Update translations.

---
 Qt/languages/ppsspp_de.ts    |  94 +++++------
 Qt/languages/ppsspp_en.ts    |  94 +++++------
 Qt/languages/ppsspp_fr.ts    |  94 +++++------
 Qt/languages/ppsspp_gr.ts    |  94 +++++------
 Qt/languages/ppsspp_hu.ts    |  94 +++++------
 Qt/languages/ppsspp_id.ts    |  94 +++++------
 Qt/languages/ppsspp_pl.ts    |  94 +++++------
 Qt/languages/ppsspp_pt-br.ts |  94 +++++------
 Qt/languages/ppsspp_ru.ts    |  94 +++++------
 Qt/languages/ppsspp_zh-cn.ts |  94 +++++------
 Qt/languages/ppsspp_zh-tw.ts |  94 +++++------
 Qt/mainwindow.cpp            | 316 +++++++++++++++--------------------
 Qt/mainwindow.h              | 199 ++++++++++++++--------
 13 files changed, 781 insertions(+), 768 deletions(-)

diff --git a/Qt/languages/ppsspp_de.ts b/Qt/languages/ppsspp_de.ts
index 331a13149d..d9d66d8685 100644
--- a/Qt/languages/ppsspp_de.ts
+++ b/Qt/languages/ppsspp_de.ts
@@ -663,97 +663,97 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation>Schnellladen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation>Schnellspeichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>&amp;Emulation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation>Z&amp;urücksetzen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation>Lade Map Dateien...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation>&amp;Speichere Map Dateien...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation>&amp;Setze Symboltabelle zurück</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation>Dump nächsten Frame</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation>Demontage</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation>Anzeige Liste...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation>&amp;Log Konsole</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation>Speicher Anzeigen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation>Speicher Anzeigen Texture</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>&amp;Optionen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation>Schnellen Speicher (instabil)</translation>
     </message>
@@ -762,37 +762,37 @@
         <translation type="obsolete">&amp;Ignorier Illegal lese/schreibt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation>S&amp;trecke auf Bildschirm</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation>&amp;Vertex Cache</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation>V&amp;ollbildübersprung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation>Zeige &amp;debug statistiken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation>Zeige &amp;FPS</translation>
     </message>
@@ -805,7 +805,7 @@
         <translation type="obsolete">HLE</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation>&amp;Sehen Sie die offizielle Website</translation>
     </message>
@@ -814,12 +814,12 @@
         <translation type="obsolete">Standard</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>&amp;Sprache</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>&amp;Video</translation>
     </message>
@@ -836,22 +836,22 @@
         <translation type="obsolete">Ta&amp;stenbelegung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>&amp;Kern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation>&amp;Öffnen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
@@ -872,22 +872,22 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation>&amp;Lade Spielstand...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation>&amp;Speichere Spielstand...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation>B&amp;ende</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation>&amp;Starte</translation>
     </message>
@@ -896,7 +896,7 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
@@ -985,7 +985,7 @@
         <translation type="obsolete">F11</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation>&amp;Gepuffert Rendering</translation>
     </message>
@@ -994,7 +994,7 @@
         <translation type="obsolete">F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation>&amp;Hardware Transformation</translation>
     </message>
@@ -1003,7 +1003,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation>&amp;Lineare Filterung</translation>
     </message>
@@ -1048,7 +1048,7 @@
         <translation type="obsolete">&amp;Besuche http://www.ppsspp.org</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation>&amp;Über PPSSPP...</translation>
     </message>
@@ -1057,27 +1057,27 @@
         <translation type="obsolete">&amp;Nutze VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation>De&amp;bug</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation>&amp;Anisotrope Filterung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation>&amp;Bildschirmgröße</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation>Anmelden &amp;Ebenen</translation>
     </message>
diff --git a/Qt/languages/ppsspp_en.ts b/Qt/languages/ppsspp_en.ts
index 38db4aa451..67c70e576d 100644
--- a/Qt/languages/ppsspp_en.ts
+++ b/Qt/languages/ppsspp_en.ts
@@ -651,237 +651,237 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_fr.ts b/Qt/languages/ppsspp_fr.ts
index 8b9f889f88..e258fb8074 100644
--- a/Qt/languages/ppsspp_fr.ts
+++ b/Qt/languages/ppsspp_fr.ts
@@ -663,22 +663,22 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>&amp;Emulation</translation>
     </message>
@@ -687,7 +687,7 @@
         <translation type="obsolete">Debu&amp;g</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>&amp;Options</translation>
     </message>
@@ -708,12 +708,12 @@
         <translation type="obsolete">Op&amp;tions du journal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>&amp;Langue</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>&amp;Video</translation>
     </message>
@@ -730,27 +730,27 @@
         <translation type="obsolete">Co&amp;ntrôles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>&amp;Emulation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished">&amp;Fermer</translation>
     </message>
@@ -775,22 +775,22 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished">&amp;Charger...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished">&amp;Sauvegarder...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished">&amp;Démarrer</translation>
     </message>
@@ -799,7 +799,7 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished">&amp;Pause</translation>
     </message>
@@ -881,7 +881,7 @@
         <translation type="obsolete">F11</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished">&amp;Rendu Tampon</translation>
     </message>
@@ -890,7 +890,7 @@
         <translation type="obsolete">F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished">&amp;Hardware Transform</translation>
     </message>
@@ -899,7 +899,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished">&amp;Filtrage Linéaire</translation>
     </message>
@@ -948,7 +948,7 @@
         <translation type="obsolete">&amp;Aller à http://www.ppsspp.org/</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished">&amp;A propos de PPSSPP...</translation>
     </message>
@@ -957,127 +957,127 @@
         <translation type="obsolete">&amp;Utiliser les VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished">&amp;Cache du Vertex</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1098,7 +1098,7 @@
         <translation type="obsolete">Informations</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_gr.ts b/Qt/languages/ppsspp_gr.ts
index 1109a59c42..d9ba911d12 100644
--- a/Qt/languages/ppsspp_gr.ts
+++ b/Qt/languages/ppsspp_gr.ts
@@ -659,22 +659,22 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>&amp;Αρχείο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>&amp;Εξομοίωση</translation>
     </message>
@@ -683,7 +683,7 @@
         <translation type="obsolete">Αποσφαλμάτωσ&amp;η</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>&amp;Επιλογές</translation>
     </message>
@@ -700,12 +700,12 @@
         <translation type="obsolete">Επ&amp;ίπεδα Καταγραφικού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>&amp;Γλώσσα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>&amp;Βίντεο</translation>
     </message>
@@ -722,37 +722,37 @@
         <translation type="obsolete">Χε&amp;ιριστήρια</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>&amp;Πυρήνας</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>&amp;Βοήθεια</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;’νοιγμα...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished">&amp;Κλείσιμο</translation>
     </message>
@@ -765,27 +765,27 @@
         <translation type="obsolete">Γρήγορη Αποθήκευση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished">&amp;Φόρτωση Σημείου Αποθήκευσης...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished">&amp;Αποθήκευση Σημείου Αποθήκευσης...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">Έ&amp;ξοδος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished">&amp;Εκκίνηση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished">&amp;Παύση</translation>
     </message>
@@ -854,17 +854,17 @@
         <translation type="obsolete">&amp;Εξομοίωση ήχου</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished">&amp;Buffered Απεικόνιση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished">Hardware Μετασχηματισμός</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished">Γραμμικό φιλτράρισμα</translation>
     </message>
@@ -901,7 +901,7 @@
         <translation type="obsolete">&amp;Μετάβαση σε http://www.ppsspp.org/</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished">&amp;Περί του PPSSPP...</translation>
     </message>
@@ -910,117 +910,117 @@
         <translation type="obsolete">&amp;Χρήση VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished">&amp;Προσορηνή Μνήμη Κορυφών</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1041,7 +1041,7 @@
         <translation type="obsolete">Πληροφορίες</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_hu.ts b/Qt/languages/ppsspp_hu.ts
index 3e7166dd14..e6c8b0a260 100644
--- a/Qt/languages/ppsspp_hu.ts
+++ b/Qt/languages/ppsspp_hu.ts
@@ -663,137 +663,137 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>Fájl</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>Emuláció</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -806,12 +806,12 @@
         <translation type="obsolete">Log szint</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>Nyelv</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>Videó</translation>
     </message>
@@ -828,22 +828,22 @@
         <translation type="obsolete">Irányítás</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>Központi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>Segítség</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">Megnyitás...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished">Bezárás</translation>
     </message>
@@ -868,22 +868,22 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished">Állás betöltése...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished">Állás mentése...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">Kilépés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished">Futtatás</translation>
     </message>
@@ -892,7 +892,7 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished">Szüneteltetés</translation>
     </message>
@@ -969,12 +969,12 @@
         <translation type="obsolete">Hang emuláció</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished">Pufferelt Renderelés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished">Hardveres Átváltoztatás</translation>
     </message>
@@ -983,7 +983,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished">Lineáris Szűrés</translation>
     </message>
@@ -996,7 +996,7 @@
         <translation type="obsolete">Ugrás a honlapra http//www.ppsspp.org/ </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished">PPSSPP Névjegye</translation>
     </message>
@@ -1005,27 +1005,27 @@
         <translation type="obsolete">VBO Használata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_id.ts b/Qt/languages/ppsspp_id.ts
index aab53ffde9..b0ed6fe1ef 100644
--- a/Qt/languages/ppsspp_id.ts
+++ b/Qt/languages/ppsspp_id.ts
@@ -651,227 +651,227 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,12 +888,12 @@
         <translation type="obsolete">Informasi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_pl.ts b/Qt/languages/ppsspp_pl.ts
index 8537fa7378..dc10e59518 100644
--- a/Qt/languages/ppsspp_pl.ts
+++ b/Qt/languages/ppsspp_pl.ts
@@ -675,22 +675,22 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>&amp;Emulacja</translation>
     </message>
@@ -699,7 +699,7 @@
         <translation type="obsolete">&amp;Debugger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>&amp;Opcje</translation>
     </message>
@@ -720,12 +720,12 @@
         <translation type="obsolete">&amp;Poziomy logowania</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>&amp;Język</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>&amp;Wideo</translation>
     </message>
@@ -742,27 +742,27 @@
         <translation type="obsolete">S&amp;terowanie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>Jądr&amp;o</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>Pomo&amp;c</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Otwórz...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished">&amp;Zamknij</translation>
     </message>
@@ -783,22 +783,22 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished">&amp;Wczytaj plik stanu...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished">&amp;Zapisz plik stanu...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">Wyj&amp;dź</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished">&amp;Uruchom</translation>
     </message>
@@ -807,7 +807,7 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished">&amp;Pauza</translation>
     </message>
@@ -908,7 +908,7 @@
         <translation type="obsolete">F11</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished">&amp;Buforowane renderowanie</translation>
     </message>
@@ -917,7 +917,7 @@
         <translation type="obsolete">F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished">Sprzętowa &amp;transformacja</translation>
     </message>
@@ -926,7 +926,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished">Filtrowanie &amp;liniowe</translation>
     </message>
@@ -979,7 +979,7 @@
         <translation type="obsolete">&amp;Idź do http://www.ppsspp.org</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished">&amp;O PPSSPP...</translation>
     </message>
@@ -988,127 +988,127 @@
         <translation type="obsolete">Użyj &amp;VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished">&amp;Cache wierzchołków</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1129,7 +1129,7 @@
         <translation type="obsolete">Info</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_pt-br.ts b/Qt/languages/ppsspp_pt-br.ts
index 20843550e2..39dd5b7451 100644
--- a/Qt/languages/ppsspp_pt-br.ts
+++ b/Qt/languages/ppsspp_pt-br.ts
@@ -671,137 +671,137 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>&amp;Emulação</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>&amp;Opções</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished">Cache de &amp;Vértices</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -814,12 +814,12 @@
         <translation type="obsolete">Nível de Lo&amp;g</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>&amp;Linguagem</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>&amp;Vídeo</translation>
     </message>
@@ -832,22 +832,22 @@
         <translation type="obsolete">Co&amp;ntroles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>&amp;Núcleo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>Aj&amp;uda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Abrir...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished">&amp;Fechar</translation>
     </message>
@@ -860,27 +860,27 @@
         <translation type="obsolete">Salvar estado rápido</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished">&amp;Carregar estado do arquivo...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished">&amp;Salvar estado no arquivo...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">Sai&amp;r</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished">&amp;Rodar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished">&amp;Pausar</translation>
     </message>
@@ -961,17 +961,17 @@
         <translation type="obsolete">Emular &amp;som</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished">Renderização com &amp;buffer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished">Transformação em &amp;Hardware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished">Filtragem &amp;Linear</translation>
     </message>
@@ -1008,7 +1008,7 @@
         <translation type="obsolete">&amp;Ir para http://www.ppsspp.org/</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished">&amp;Sobre o PPSSPP...</translation>
     </message>
@@ -1017,27 +1017,27 @@
         <translation type="obsolete">&amp;Usar VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/languages/ppsspp_ru.ts b/Qt/languages/ppsspp_ru.ts
index 55fb32958f..66eda9c6e3 100644
--- a/Qt/languages/ppsspp_ru.ts
+++ b/Qt/languages/ppsspp_ru.ts
@@ -663,22 +663,22 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation>Быстро загрузить состояние</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation>Быстро сохранить состояние</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>&amp;Эмуляция</translation>
     </message>
@@ -687,7 +687,7 @@
         <translation type="obsolete">&amp;Отладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>&amp;Настройки</translation>
     </message>
@@ -708,12 +708,12 @@
         <translation type="obsolete">Уровень ло&amp;гирования</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>&amp;Язык</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>&amp;Видео</translation>
     </message>
@@ -730,27 +730,27 @@
         <translation type="obsolete">У&amp;правление</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>&amp;Ядро</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation>&amp;Игнорировать неправильные чтения/запись </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
@@ -771,27 +771,27 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation>&amp;Открыть файл состояния...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation>&amp;Сохранить файл состояния...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation>&amp;Запустить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation>&amp;Пауза</translation>
     </message>
@@ -864,7 +864,7 @@
         <translation type="obsolete">Эмуляция &amp;звука</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation>&amp;Буферированный рендеринг</translation>
     </message>
@@ -873,7 +873,7 @@
         <translation type="obsolete">F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation>&amp;Аппаратное преобразование</translation>
     </message>
@@ -882,7 +882,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation>&amp;Линейная фильтрация</translation>
     </message>
@@ -903,7 +903,7 @@
         <translation type="obsolete">&amp;Быстрая память (dynarec, нестабильно)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation>&amp;О PPSSPP...</translation>
     </message>
@@ -912,127 +912,127 @@
         <translation type="obsolete">&amp;Использовать VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation>Пере&amp;загрузить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation>Запускать при &amp;загрузке</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation>&amp;Отладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation>Загрузить файл &amp;карты...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation>&amp;Сохранить файл карты...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation>&amp;Сбросить таблицу символов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation>С&amp;бросить следующий кадр в лог</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation>&amp;Деасэмблинг</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation>Список экранов...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation>&amp;Консоль логов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation>&amp;Отображение памяти</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation>Память отображаемых текстур</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation>&amp;Dynarec</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation>&amp;Быстрая память (нестабильно)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation>&amp;Анизотропная фильтрация</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation>(&amp;S)Размер экрана</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation>За&amp;стягивать под экран</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation>&amp;Vertex кэш</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation>Пропуск кадров</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation>&amp;Aудио</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation>&amp;Полный экран</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation>Показывать &amp;отладочную информацию</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation>Показывать &amp;FPS</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation>Уровень ло&amp;гирования</translation>
     </message>
@@ -1053,7 +1053,7 @@
         <translation type="obsolete">Информация</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation>(&amp;G)Зайдите на официальный сайт</translation>
     </message>
diff --git a/Qt/languages/ppsspp_zh-cn.ts b/Qt/languages/ppsspp_zh-cn.ts
index 8e0a460cad..46e5101474 100644
--- a/Qt/languages/ppsspp_zh-cn.ts
+++ b/Qt/languages/ppsspp_zh-cn.ts
@@ -675,22 +675,22 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>(&amp;F)文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation>快速负载态</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation>快速保存态</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>(&amp;E)模拟</translation>
     </message>
@@ -699,7 +699,7 @@
         <translation type="obsolete">(&amp;G)调试</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>(&amp;O)选项</translation>
     </message>
@@ -712,12 +712,12 @@
         <translation type="obsolete">(&amp;G)日志级别</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>(&amp;L)语言选择</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>(&amp;V)视频</translation>
     </message>
@@ -734,27 +734,27 @@
         <translation type="obsolete">(&amp;N)控制</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>(&amp;C)核心</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation>忽略非法读取/写入</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>(&amp;H)帮助</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation>(&amp;O)打开...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation>(&amp;C)关闭</translation>
     </message>
@@ -779,22 +779,22 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation>(&amp;L)读取存档...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation>(&amp;S)保存存档...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation>(&amp;X)退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation>(&amp;R)运行</translation>
     </message>
@@ -803,7 +803,7 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation>(&amp;P)暂停</translation>
     </message>
@@ -904,7 +904,7 @@
         <translation type="obsolete">F11</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation>(&amp;B)渲染缓冲</translation>
     </message>
@@ -913,7 +913,7 @@
         <translation type="obsolete">F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation>(&amp;H)硬件加速</translation>
     </message>
@@ -922,7 +922,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation>(&amp;L)线性过滤</translation>
     </message>
@@ -975,7 +975,7 @@
         <translation type="obsolete">(&amp;G)转到 http://www.ppsspp.org/</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation>(&amp;A)关于 PPSSPP...</translation>
     </message>
@@ -984,127 +984,127 @@
         <translation type="obsolete">(&amp;U)使用 VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation>(&amp;R)复位</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation>加载时执行</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation>调试</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation>载入地图文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation>保存地图文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation>重置符号表</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation>将下一帧转储至日志</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation>汇编视图</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation>显示列表...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation>查看控制台日志</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation>内存视图</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation>内存纹理视图</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation>(&amp;D)动态重编译</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation>顶点解码器动态重编译</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation>(&amp;F)高速闪存 (动态重编译,不稳定)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation>(&amp;A)各向异性过滤</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation>屏幕尺寸</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation>(&amp;T)拉伸显示</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation>(&amp;V)顶点缓存</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation>(&amp;F)跳帧</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation>(&amp;S)声响</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation>(&amp;F)全屏</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation>(&amp;D)显示调试信息</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation>(&amp;F)显示帧率计数器</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation>(&amp;G)日志级别</translation>
     </message>
@@ -1125,7 +1125,7 @@
         <translation type="obsolete">信息</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation>(&amp;G)进入官方网站</translation>
     </message>
diff --git a/Qt/languages/ppsspp_zh-tw.ts b/Qt/languages/ppsspp_zh-tw.ts
index 21de41440f..3cbe6185dd 100644
--- a/Qt/languages/ppsspp_zh-tw.ts
+++ b/Qt/languages/ppsspp_zh-tw.ts
@@ -675,22 +675,22 @@
         <translation type="obsolete">PPSSPP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="504"/>
+        <location filename="../mainwindow.cpp" line="460"/>
         <source>&amp;File</source>
         <translation>(&amp;F)文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="549"/>
+        <location filename="../mainwindow.cpp" line="466"/>
         <source>Quickload State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="468"/>
         <source>Quicksave State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="505"/>
+        <location filename="../mainwindow.cpp" line="478"/>
         <source>&amp;Emulation</source>
         <translation>(&amp;E)模擬</translation>
     </message>
@@ -699,7 +699,7 @@
         <translation type="obsolete">(&amp;G)調試</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>&amp;Options</source>
         <translation>(&amp;O)選項</translation>
     </message>
@@ -712,12 +712,12 @@
         <translation type="obsolete">(&amp;G)日誌級別</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="513"/>
+        <location filename="../mainwindow.cpp" line="579"/>
         <source>&amp;Language</source>
         <translation>(&amp;L)語言選擇</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="509"/>
+        <location filename="../mainwindow.cpp" line="525"/>
         <source>&amp;Video</source>
         <translation>(&amp;V)視頻</translation>
     </message>
@@ -734,27 +734,27 @@
         <translation type="obsolete">(&amp;N)控制</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="508"/>
+        <location filename="../mainwindow.cpp" line="515"/>
         <source>&amp;Core</source>
         <translation>(&amp;C)核心</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="585"/>
+        <location filename="../mainwindow.cpp" line="522"/>
         <source>&amp;Ignore Illegal reads/writes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="514"/>
+        <location filename="../mainwindow.cpp" line="620"/>
         <source>&amp;Help</source>
         <translation>(&amp;H)幫助</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="461"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">(&amp;O)打開...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="463"/>
         <source>&amp;Close</source>
         <translation type="unfinished">(&amp;C)關閉</translation>
     </message>
@@ -779,22 +779,22 @@
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="551"/>
+        <location filename="../mainwindow.cpp" line="470"/>
         <source>&amp;Load State File...</source>
         <translation type="unfinished">(&amp;L)讀取存檔...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="472"/>
         <source>&amp;Save State File...</source>
         <translation type="unfinished">(&amp;S)保存存檔...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="475"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">(&amp;X)退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="479"/>
         <source>&amp;Run</source>
         <translation type="unfinished">(&amp;R)運行</translation>
     </message>
@@ -803,7 +803,7 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="559"/>
+        <location filename="../mainwindow.cpp" line="481"/>
         <source>&amp;Pause</source>
         <translation type="unfinished">(&amp;P)暫停</translation>
     </message>
@@ -904,7 +904,7 @@
         <translation type="obsolete">F11</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="592"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>&amp;Buffered Rendering</source>
         <translation type="unfinished">(&amp;B)渲染緩衝</translation>
     </message>
@@ -913,7 +913,7 @@
         <translation type="obsolete">F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="601"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>&amp;Hardware Transform</source>
         <translation type="unfinished">(&amp;H)硬件加速</translation>
     </message>
@@ -922,7 +922,7 @@
         <translation type="obsolete">F6</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="534"/>
         <source>&amp;Linear Filtering</source>
         <translation type="unfinished">(&amp;L)線性過濾</translation>
     </message>
@@ -975,7 +975,7 @@
         <translation type="obsolete">(&amp;G)轉到 http://www.ppsspp.org/</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="668"/>
+        <location filename="../mainwindow.cpp" line="622"/>
         <source>&amp;About PPSSPP...</source>
         <translation type="unfinished">(&amp;A)關於 PPSSPP...</translation>
     </message>
@@ -984,127 +984,127 @@
         <translation type="obsolete">(&amp;U)使用 VBO</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="560"/>
+        <location filename="../mainwindow.cpp" line="483"/>
         <source>Re&amp;set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="562"/>
+        <location filename="../mainwindow.cpp" line="486"/>
         <source>Run on &amp;load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="490"/>
         <source>De&amp;bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
+        <location filename="../mainwindow.cpp" line="491"/>
         <source>Load Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Save Map File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="568"/>
+        <location filename="../mainwindow.cpp" line="495"/>
         <source>Reset Symbol Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="570"/>
+        <location filename="../mainwindow.cpp" line="498"/>
         <source>Dump next frame to log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="501"/>
         <source>Disassembly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="503"/>
         <source>Display List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="505"/>
         <source>Log Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="507"/>
         <source>Memory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="509"/>
         <source>Memory View Texture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="582"/>
+        <location filename="../mainwindow.cpp" line="516"/>
         <source>&amp;CPU Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="583"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>&amp;Vertex Decoder Dynarec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="584"/>
+        <location filename="../mainwindow.cpp" line="520"/>
         <source>Fast &amp;Memory (unstable)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="510"/>
+        <location filename="../mainwindow.cpp" line="527"/>
         <source>&amp;Anisotropic Filtering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="511"/>
+        <location filename="../mainwindow.cpp" line="538"/>
         <source>&amp;Screen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="599"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>&amp;Stretch to Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="602"/>
+        <location filename="../mainwindow.cpp" line="549"/>
         <source>&amp;Vertex Cache</source>
         <translation type="unfinished">(&amp;V)頂點緩存</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>&amp;Frameskip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="553"/>
         <source>&amp;Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="556"/>
         <source>&amp;Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="607"/>
+        <location filename="../mainwindow.cpp" line="558"/>
         <source>&amp;Show debug statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="608"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>&amp;Show FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="512"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Lo&amp;g levels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1125,7 +1125,7 @@
         <translation type="obsolete">信息</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="621"/>
         <source>&amp;Go to official website</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index adf873948b..058a4a0706 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -47,13 +47,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
 	startTimer(16);
 
-//	if (!fileToStart.isNull())
-//	{
-//		if (stateToLoad != NULL)
-//			SaveState::Load(stateToLoad);
-//	}
-
-	QObject::connect(emugl, SIGNAL(doubleClick()), this, SLOT(fullscreenAct_triggered()) );
+	QObject::connect(emugl, SIGNAL(doubleClick()), this, SLOT(fullscrAct()) );
 }
 
 void MainWindow::ShowMemory(u32 addr)
@@ -85,37 +79,6 @@ void MainWindow::timerEvent(QTimerEvent *)
 
 void MainWindow::updateMenus()
 {
-	bool enable = globalUIState == UISTATE_MENU;
-	// File
-	openAct->setEnabled(enable);
-	closeAct->setEnabled(!enable);
-	qlstateAct->setEnabled(!enable);
-	qsstateAct->setEnabled(!enable);
-	lstateAct->setEnabled(!enable);
-	sstateAct->setEnabled(!enable);
-	// Emulation
-	runAct->setEnabled(Core_IsStepping() || globalUIState == UISTATE_PAUSEMENU);
-	pauseAct->setEnabled(globalUIState == UISTATE_INGAME);
-	resetAct->setEnabled(globalUIState == UISTATE_INGAME);
-	runonloadAct->setChecked(g_Config.bAutoRun);
-	// Debug
-	lmapAct->setEnabled(!enable);
-	smapAct->setEnabled(!enable);
-	resetTableAct->setEnabled(!enable);
-	dumpNextAct->setEnabled(!enable);
-	disasmAct->setEnabled(!enable);
-	dpyListAct->setEnabled(!enable);
-	consoleAct->setEnabled(!enable);
-	memviewAct->setEnabled(!enable);
-	memviewTexAct->setEnabled(!enable);
-	// Options
-	dynarecAct->setChecked(g_Config.bJit);
-	vertexDynarecAct->setChecked(g_Config.bVertexDecoderJit);
-	fastmemAct->setChecked(g_Config.bFastMemory);
-	ignoreIllegalAct->setChecked(g_Config.bIgnoreBadMemAccess);
-
-	audioAct->setChecked(g_Config.bEnableSound);
-
 	foreach(QAction * action, anisotropicGroup->actions()) {
 		if (g_Config.iAnisotropyLevel == action->data().toInt()) {
 			action->setChecked(true);
@@ -123,9 +86,6 @@ void MainWindow::updateMenus()
 		}
 	}
 
-	bufferRenderAct->setChecked(g_Config.iRenderingMode == 1);
-	linearAct->setChecked(g_Config.iTexFiltering > 0);
-
 	foreach(QAction * action, screenGroup->actions()) {
 		if (g_Config.iInternalResolution == action->data().toInt()) {
 			action->setChecked(true);
@@ -133,14 +93,6 @@ void MainWindow::updateMenus()
 		}
 	}
 
-	stretchAct->setChecked(g_Config.bStretchToDisplay);
-	transformAct->setChecked(g_Config.bHardwareTransform);
-	vertexCacheAct->setChecked(g_Config.bVertexCache);
-	frameskipAct->setChecked(g_Config.iFrameSkip > 0);
-
-	statsAct->setChecked(g_Config.bShowDebugStats);
-	showFPSAct->setChecked(g_Config.iShowFPSCounter);
-
 	int defaultLevel = LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON);
 	foreach(QAction * action, defaultLogGroup->actions()) {
 		if (defaultLevel == action->data().toInt()) {
@@ -164,11 +116,12 @@ void MainWindow::updateMenus()
 			break;
 		}
 	}
+	emit updateMenu();
 }
 
 void MainWindow::closeEvent(QCloseEvent *)
 {
-	exitAct_triggered();
+	exitAct();
 }
 
 void MainWindow::keyPressEvent(QKeyEvent *e)
@@ -189,7 +142,7 @@ void MainWindow::Boot()
 		dialogDisasm->show();
 
 	if(g_Config.bFullScreen != isFullScreen())
-		fullscreenAct_triggered();
+		fullscrAct();
 
 	memoryWindow = new Debugger_Memory(currentDebugMIPS, this, this);
 	memoryTexWindow = new Debugger_MemoryTex(this);
@@ -198,11 +151,11 @@ void MainWindow::Boot()
 	notifyMapsLoaded();
 
 	if (nextState == CORE_RUNNING)
-		runAct_triggered();
+		runAct();
 	updateMenus();
 }
 
-void MainWindow::openAct_triggered()
+void MainWindow::openAct()
 {
 	QString filename = QFileDialog::getOpenFileName(NULL, "Load File", g_Config.currentDirectory.c_str(), "PSP ROMs (*.pbp *.elf *.iso *.cso *.prx)");
 	if (QFile::exists(filename))
@@ -213,7 +166,7 @@ void MainWindow::openAct_triggered()
 	}
 }
 
-void MainWindow::closeAct_triggered()
+void MainWindow::closeAct()
 {
 	if(dialogDisasm)
 		dialogDisasm->Stop();
@@ -244,17 +197,17 @@ void SaveStateActionFinished(bool result, void *userdata)
 	}
 }
 
-void MainWindow::qlstateAct_triggered()
+void MainWindow::qlstateAct()
 {
 	SaveState::LoadSlot(0, SaveStateActionFinished, this);
 }
 
-void MainWindow::qsstateAct_triggered()
+void MainWindow::qsstateAct()
 {
 	SaveState::SaveSlot(0, SaveStateActionFinished, this);
 }
 
-void MainWindow::lstateAct_triggered()
+void MainWindow::lstateAct()
 {
 	QFileDialog dialog(0,"Load state");
 	dialog.setFileMode(QFileDialog::ExistingFile);
@@ -269,7 +222,7 @@ void MainWindow::lstateAct_triggered()
 	}
 }
 
-void MainWindow::sstateAct_triggered()
+void MainWindow::sstateAct()
 {
 	QFileDialog dialog(0,"Save state");
 	dialog.setFileMode(QFileDialog::AnyFile);
@@ -284,23 +237,23 @@ void MainWindow::sstateAct_triggered()
 	}
 }
 
-void MainWindow::exitAct_triggered()
+void MainWindow::exitAct()
 {
-	closeAct_triggered();
+	closeAct();
 	QApplication::exit(0);
 }
 
-void MainWindow::runAct_triggered()
+void MainWindow::runAct()
 {
 	NativeMessageReceived("run", "");
 }
 
-void MainWindow::pauseAct_triggered()
+void MainWindow::pauseAct()
 {
 	NativeMessageReceived("pause", "");
 }
 
-void MainWindow::resetAct_triggered()
+void MainWindow::resetAct()
 {
 	if(dialogDisasm)
 		dialogDisasm->Stop();
@@ -317,12 +270,12 @@ void MainWindow::resetAct_triggered()
 	NativeMessageReceived("reset", "");
 }
 
-void MainWindow::runonloadAct_triggered()
+void MainWindow::runonloadAct()
 {
-	runonloadAct->setChecked(g_Config.bAutoRun = !g_Config.bAutoRun);
+	g_Config.bAutoRun = !g_Config.bAutoRun;
 }
 
-void MainWindow::lmapAct_triggered()
+void MainWindow::lmapAct()
 {
 	QFileDialog dialog(0,"Load .MAP");
 	dialog.setFileMode(QFileDialog::ExistingFile);
@@ -339,7 +292,7 @@ void MainWindow::lmapAct_triggered()
 	}
 }
 
-void MainWindow::smapAct_triggered()
+void MainWindow::smapAct()
 {
 	QFileDialog dialog(0,"Save .MAP");
 	dialog.setFileMode(QFileDialog::AnyFile);
@@ -355,58 +308,59 @@ void MainWindow::smapAct_triggered()
 	}
 }
 
-void MainWindow::resetTableAct_triggered()
+void MainWindow::resetTableAct()
 {
 	symbolMap.Clear();
 	notifyMapsLoaded();
 }
 
-void MainWindow::dumpNextAct_triggered()
+void MainWindow::dumpNextAct()
 {
 	gpu->DumpNextFrame();
 }
 
-void MainWindow::disasmAct_triggered()
+void MainWindow::disasmAct()
 {
 	if(dialogDisasm)
 		dialogDisasm->show();
 }
 
-void MainWindow::dpyListAct_triggered()
+void MainWindow::dpyListAct()
 {
 	if(displaylistWindow)
 		displaylistWindow->show();
 }
 
-void MainWindow::consoleAct_triggered()
+void MainWindow::consoleAct()
 {
 	LogManager::GetInstance()->GetConsoleListener()->Show(LogManager::GetInstance()->GetConsoleListener()->Hidden());
 }
 
-void MainWindow::memviewAct_triggered()
+void MainWindow::memviewAct()
 {
 	if (memoryWindow)
 		memoryWindow->show();
 }
 
-void MainWindow::memviewTexAct_triggered()
+void MainWindow::memviewTexAct()
 {
 	if(memoryTexWindow)
 		memoryTexWindow->show();
 }
 
-void MainWindow::stretchAct_triggered()
+void MainWindow::stretchAct()
 {
 	g_Config.bStretchToDisplay = !g_Config.bStretchToDisplay;
 	if (gpu)
 		gpu->Resized();
 }
 
-void MainWindow::fullscreenAct_triggered()
+void MainWindow::fullscrAct()
 {
 	if(isFullScreen()) {
 		g_Config.bFullScreen = false;
 		menuBar()->show();
+		updateMenus();
 
 		showNormal();
 		SetZoom(g_Config.iInternalResolution);
@@ -441,15 +395,14 @@ void MainWindow::fullscreenAct_triggered()
 			QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
 
 	}
-	fullscreenAct->setChecked(g_Config.bFullScreen);
 }
 
-void MainWindow::websiteAct_triggered()
+void MainWindow::websiteAct()
 {
 	QDesktopServices::openUrl(QUrl("http://www.ppsspp.org/"));
 }
 
-void MainWindow::aboutAct_triggered()
+void MainWindow::aboutAct()
 {
 	QMessageBox::about(this, "PPSSPP Qt", QString::fromUtf8("Created by Henrik Rydg\xc3\xa5rd"));
 }
@@ -457,7 +410,7 @@ void MainWindow::aboutAct_triggered()
 /* Private functions */
 void MainWindow::SetZoom(int zoom) {
 	if (isFullScreen())
-		fullscreenAct_triggered();
+		fullscrAct();
 	g_Config.iInternalResolution = zoom;
 
 	pixel_xres = 480 * zoom;
@@ -486,7 +439,7 @@ void MainWindow::SetGameTitle(QString text)
 	setWindowTitle(title);
 }
 
-void MainWindow::loadLanguage(const QString& language, bool retranslate)
+void MainWindow::loadLanguage(const QString& language, bool translate)
 {
 	if (currentLanguage != language)
 	{
@@ -495,134 +448,136 @@ void MainWindow::loadLanguage(const QString& language, bool retranslate)
 		QApplication::removeTranslator(&translator);
 		if (translator.load(QString(":/languages/ppsspp_%1.qm").arg(language))) {
 			QApplication::installTranslator(&translator);
-			if (retranslate)
-				retranslateUi();
+			if (translate)
+				emit retranslate();
 		}
 	}
 }
 
-void MainWindow::retranslateUi() {
-	fileMenu->setTitle(tr("&File"));
-	emuMenu->setTitle(tr("&Emulation"));
-	debugMenu->setTitle(tr("De&bug"));
-	optionsMenu->setTitle(tr("&Options"));
-	coreMenu->setTitle(tr("&Core"));
-	videoMenu->setTitle(tr("&Video"));
-	anisotropicMenu->setTitle(tr("&Anisotropic Filtering"));
-	screenMenu->setTitle(tr("&Screen Size"));
-	levelsMenu->setTitle(tr("Lo&g levels"));
-	langMenu->setTitle(tr("&Language"));
-	helpMenu->setTitle(tr("&Help"));
-	emit retranslate();
-}
-
 void MainWindow::createMenus()
 {
-
-#define NEW_GROUP(menu, group, stringlist, valuelist) \
-{ \
-	group = new QActionGroup(this); \
-	QListIterator<int> i(valuelist); \
-	foreach(QString name, stringlist) { \
-		QAction *action = new MenuAction(this, group, i.next(), name); \
-	} \
-	connect(group, SIGNAL(triggered(QAction *)), this, SLOT(group ## _triggered(QAction *))); \
-	menu->addActions(group->actions()); \
-}
-
-#define NEW_GROUP_KEYS(menu, group, stringlist, valuelist, keylist) \
-{ \
-	group = new QActionGroup(this); \
-	QListIterator<int> i(valuelist); \
-	QListIterator<int> k(keylist); \
-	foreach(QString name, stringlist) { \
-		QAction *action = new MenuAction(this, group, i.next(), name, k.next()); \
-	} \
-	connect(group, SIGNAL(triggered(QAction *)), this, SLOT(group ## _triggered(QAction *))); \
-	menu->addActions(group->actions()); \
-}
-
 	// File
-	fileMenu = menuBar()->addMenu("");
-	openAct = new MenuAction(this, fileMenu, SLOT(openAct_triggered()), QT_TR_NOOP("&Open..."), false, QKeySequence::Open);
-	closeAct = new MenuAction(this, fileMenu, SLOT(closeAct_triggered()), QT_TR_NOOP("&Close"), false, QKeySequence::Close);
+	MenuTree* fileMenu = new MenuTree(this, menuBar(),    QT_TR_NOOP("&File"));
+	fileMenu->add(new MenuAction(this, SLOT(openAct()),       QT_TR_NOOP("&Open..."), QKeySequence::Open))
+		->addEnableState(UISTATE_MENU);
+	fileMenu->add(new MenuAction(this, SLOT(closeAct()),      QT_TR_NOOP("&Close"), QKeySequence::Close))
+		->addDisableState(UISTATE_MENU);
 	fileMenu->addSeparator();
-	qlstateAct = new MenuAction(this, fileMenu, SLOT(qlstateAct_triggered()), QT_TR_NOOP("Quickload State"), false, Qt::Key_F4);
-	qsstateAct = new MenuAction(this, fileMenu, SLOT(qsstateAct_triggered()), QT_TR_NOOP("Quicksave State"), false, Qt::Key_F2);
-	lstateAct = new MenuAction(this, fileMenu, SLOT(lstateAct_triggered()), QT_TR_NOOP("&Load State File..."), false);
-	sstateAct = new MenuAction(this, fileMenu, SLOT(sstateAct_triggered()), QT_TR_NOOP("&Save State File..."), false);
+	fileMenu->add(new MenuAction(this, SLOT(qlstateAct()),    QT_TR_NOOP("Quickload State"), Qt::Key_F4))
+		->addDisableState(UISTATE_MENU);
+	fileMenu->add(new MenuAction(this, SLOT(qsstateAct()),    QT_TR_NOOP("Quicksave State"), Qt::Key_F2))
+		->addDisableState(UISTATE_MENU);
+	fileMenu->add(new MenuAction(this, SLOT(lstateAct()),     QT_TR_NOOP("&Load State File...")))
+		->addDisableState(UISTATE_MENU);
+	fileMenu->add(new MenuAction(this, SLOT(sstateAct()),     QT_TR_NOOP("&Save State File...")))
+		->addDisableState(UISTATE_MENU);
 	fileMenu->addSeparator();
-	exitAct = new MenuAction(this, fileMenu, SLOT(exitAct_triggered()), QT_TR_NOOP("E&xit"), false);
+	fileMenu->add(new MenuAction(this, SLOT(exitAct()),       QT_TR_NOOP("E&xit"), QKeySequence::Quit));
 
 	// Emulation
-	emuMenu = menuBar()->addMenu("");
-	runAct = new MenuAction(this, emuMenu, SLOT(runAct_triggered()), QT_TR_NOOP("&Run"), false, Qt::Key_F7);
-	pauseAct = new MenuAction(this, emuMenu, SLOT(pauseAct_triggered()), QT_TR_NOOP("&Pause"), false, Qt::Key_F8);
-	resetAct = new MenuAction(this, emuMenu, SLOT(resetAct_triggered()), QT_TR_NOOP("Re&set"), false);
+	MenuTree* emuMenu = new MenuTree(this, menuBar(),     QT_TR_NOOP("&Emulation"));
+	emuMenu->add(new MenuAction(this, SLOT(runAct()),         QT_TR_NOOP("&Run"), Qt::Key_F7))
+		->addEnableStepping()->addEnableState(UISTATE_PAUSEMENU);
+	emuMenu->add(new MenuAction(this, SLOT(pauseAct()),       QT_TR_NOOP("&Pause"), Qt::Key_F8))
+		->addEnableState(UISTATE_INGAME);
+	emuMenu->add(new MenuAction(this, SLOT(resetAct()),       QT_TR_NOOP("Re&set")))
+		->addEnableState(UISTATE_INGAME);
 	emuMenu->addSeparator();
-	runonloadAct = new MenuAction(this, emuMenu, SLOT(runonloadAct_triggered()), QT_TR_NOOP("Run on &load"), true);
+	emuMenu->add(new MenuAction(this, SLOT(runonloadAct()),   QT_TR_NOOP("Run on &load")))
+		->addEventChecked(&g_Config.bAutoRun);
 
 	// Debug
-	debugMenu = menuBar()->addMenu("");
-	lmapAct = new MenuAction(this, debugMenu, SLOT(lmapAct_triggered()), QT_TR_NOOP("Load Map File..."), false);
-	smapAct = new MenuAction(this, debugMenu, SLOT(smapAct_triggered()), QT_TR_NOOP("Save Map File..."), false);
-	resetTableAct = new MenuAction(this, debugMenu, SLOT(resetTableAct_triggered()), QT_TR_NOOP("Reset Symbol Table"), false);
+	MenuTree* debugMenu = new MenuTree(this, menuBar(),   QT_TR_NOOP("De&bug"));
+	debugMenu->add(new MenuAction(this, SLOT(lmapAct()),      QT_TR_NOOP("Load Map File...")))
+		->addDisableState(UISTATE_MENU);
+	debugMenu->add(new MenuAction(this, SLOT(smapAct()),      QT_TR_NOOP("Save Map File...")))
+		->addDisableState(UISTATE_MENU);
+	debugMenu->add(new MenuAction(this, SLOT(resetTableAct()),QT_TR_NOOP("Reset Symbol Table")))
+		->addDisableState(UISTATE_MENU);
 	debugMenu->addSeparator();
-	dumpNextAct = new MenuAction(this, debugMenu, SLOT(dumpNextAct_triggered()), QT_TR_NOOP("Dump next frame to log"), false);
+	debugMenu->add(new MenuAction(this, SLOT(dumpNextAct()),  QT_TR_NOOP("Dump next frame to log")))
+		->addDisableState(UISTATE_MENU);
 	debugMenu->addSeparator();
-	disasmAct = new MenuAction(this, debugMenu, SLOT(disasmAct_triggered()), QT_TR_NOOP("Disassembly"), false, Qt::CTRL + Qt::Key_D);
-	dpyListAct = new MenuAction(this, debugMenu, SLOT(dpyListAct_triggered()), QT_TR_NOOP("Display List..."), false);
-	consoleAct = new MenuAction(this, debugMenu, SLOT(consoleAct_triggered()), QT_TR_NOOP("Log Console"), false);
-	memviewAct = new MenuAction(this, debugMenu, SLOT(memviewAct_triggered()), QT_TR_NOOP("Memory View"), false);
-	memviewTexAct = new MenuAction(this, debugMenu, SLOT(memviewTexAct_triggered()), QT_TR_NOOP("Memory View Texture"), false);
+	debugMenu->add(new MenuAction(this, SLOT(disasmAct()),    QT_TR_NOOP("Disassembly"), Qt::CTRL + Qt::Key_D))
+		->addDisableState(UISTATE_MENU);
+	debugMenu->add(new MenuAction(this, SLOT(dpyListAct()),   QT_TR_NOOP("Display List...")))
+		->addDisableState(UISTATE_MENU);
+	debugMenu->add(new MenuAction(this, SLOT(consoleAct()),   QT_TR_NOOP("Log Console")))
+		->addDisableState(UISTATE_MENU);
+	debugMenu->add(new MenuAction(this, SLOT(memviewAct()),   QT_TR_NOOP("Memory View")))
+		->addDisableState(UISTATE_MENU);
+	debugMenu->add(new MenuAction(this, SLOT(memviewTexAct()),QT_TR_NOOP("Memory View Texture")))
+		->addDisableState(UISTATE_MENU);
 
 	// Options
-	optionsMenu = menuBar()->addMenu("");
+	MenuTree* optionsMenu = new MenuTree(this, menuBar(), QT_TR_NOOP("&Options"));
 	// - Core
-	coreMenu = optionsMenu->addMenu("");
-	dynarecAct = new MenuAction(this, coreMenu, SLOT(dynarecAct_triggered()), QT_TR_NOOP("&CPU Dynarec"), true);
-	vertexDynarecAct = new MenuAction(this, coreMenu, SLOT(vertexDynarecAct_triggered()), QT_TR_NOOP("&Vertex Decoder Dynarec"), true);
-	fastmemAct = new MenuAction(this, coreMenu, SLOT(fastmemAct_triggered()), QT_TR_NOOP("Fast &Memory (unstable)"), true);
-	ignoreIllegalAct = new MenuAction(this, coreMenu, SLOT(ignoreIllegalAct_triggered()), QT_TR_NOOP("&Ignore Illegal reads/writes"), true);
+	MenuTree* coreMenu = new MenuTree(this, optionsMenu,      QT_TR_NOOP("&Core"));
+	coreMenu->add(new MenuAction(this, SLOT(dynarecAct()),        QT_TR_NOOP("&CPU Dynarec")))
+		->addEventChecked(&g_Config.bJit);
+	coreMenu->add(new MenuAction(this, SLOT(vertexDynarecAct()),  QT_TR_NOOP("&Vertex Decoder Dynarec")))
+		->addEventChecked(&g_Config.bVertexDecoderJit);
+	coreMenu->add(new MenuAction(this, SLOT(fastmemAct()),        QT_TR_NOOP("Fast &Memory (unstable)")))
+		->addEventChecked(&g_Config.bFastMemory);
+	coreMenu->add(new MenuAction(this, SLOT(ignoreIllegalAct()),  QT_TR_NOOP("&Ignore Illegal reads/writes")))
+		->addEventChecked(&g_Config.bIgnoreBadMemAccess);
 	// - Video
-	videoMenu = optionsMenu->addMenu("");
+	MenuTree* videoMenu = new MenuTree(this, optionsMenu,     QT_TR_NOOP("&Video"));
 	// - Anisotropic Filtering
-	anisotropicMenu = videoMenu->addMenu("");
-	NEW_GROUP(anisotropicMenu, anisotropicGroup, QStringList() << "Off" << "2x" << "4x" << "8x" << "16x",
-		QList<int>() << 0 << 1 << 2 << 3 << 4);
-	bufferRenderAct = new MenuAction(this, videoMenu, SLOT(bufferRenderAct_triggered()), QT_TR_NOOP("&Buffered Rendering"), false, Qt::Key_F5);
-	linearAct = new MenuAction(this, videoMenu, SLOT(linearAct_triggered()), QT_TR_NOOP("&Linear Filtering"), true);
+	MenuTree* anisotropicMenu = new MenuTree(this, videoMenu,     QT_TR_NOOP("&Anisotropic Filtering"));
+	anisotropicGroup = new MenuActionGroup(this, anisotropicMenu, SLOT(anisotropicGroup_triggered(QAction *)),
+		QStringList() << "Off" << "2x" << "4x" << "8x" << "16x",
+		QList<int>()  << 0     << 1    << 2    << 3    << 4);
+	// TODO: Check for newer buffer render options
+	videoMenu->add(new MenuAction(this, SLOT(bufferRenderAct()),  QT_TR_NOOP("&Buffered Rendering"), Qt::Key_F5))
+		->addEventChecked(&g_Config.iRenderingMode);
+	videoMenu->add(new MenuAction(this, SLOT(linearAct()),        QT_TR_NOOP("&Linear Filtering")))
+		->addEventChecked(&g_Config.iTexFiltering);
 	videoMenu->addSeparator();
 	// - Screen Size
-	screenMenu = videoMenu->addMenu("");
-	NEW_GROUP_KEYS(screenMenu, screenGroup, QStringList() << "1x" << "2x" << "3x" << "4x", QList<int>() << 1 << 2 << 3 << 4,
+	MenuTree* screenMenu = new MenuTree(this, videoMenu,          QT_TR_NOOP("&Screen Size"));
+	screenGroup = new MenuActionGroup(this, screenMenu, SLOT(screenGroup_triggered(QAction *)),
+		QStringList() << "1x" << "2x" << "3x" << "4x",
+		QList<int>()  << 1    << 2    << 3    << 4,
 		QList<int>() << Qt::CTRL + Qt::Key_1 << Qt::CTRL + Qt::Key_2 << Qt::CTRL + Qt::Key_3 << Qt::CTRL + Qt::Key_4);
-	stretchAct = new MenuAction(this, videoMenu, SLOT(stretchAct_triggered()), QT_TR_NOOP("&Stretch to Display"), true);
+
+	videoMenu->add(new MenuAction(this, SLOT(stretchAct()),       QT_TR_NOOP("&Stretch to Display")))
+		->addEventChecked(&g_Config.bStretchToDisplay);
 	videoMenu->addSeparator();
-	transformAct = new MenuAction(this, videoMenu, SLOT(transformAct_triggered()), QT_TR_NOOP("&Hardware Transform"), true, Qt::Key_F6);
-	vertexCacheAct = new MenuAction(this, videoMenu, SLOT(vertexCacheAct_triggered()), QT_TR_NOOP("&Vertex Cache"), true);
-	frameskipAct = new MenuAction(this, videoMenu, SLOT(frameskipAct_triggered()), QT_TR_NOOP("&Frameskip"), true);
-	audioAct = new MenuAction(this, videoMenu, SLOT(audioAct_triggered()), QT_TR_NOOP("&Audio"), true);
+	videoMenu->add(new MenuAction(this, SLOT(transformAct()),     QT_TR_NOOP("&Hardware Transform"), Qt::Key_F6))
+		->addEventChecked(&g_Config.bHardwareTransform);
+	videoMenu->add(new MenuAction(this, SLOT(vertexCacheAct()),   QT_TR_NOOP("&Vertex Cache")))
+		->addEventChecked(&g_Config.bVertexCache);
+	videoMenu->add(new MenuAction(this, SLOT(frameskipAct()),     QT_TR_NOOP("&Frameskip")))
+		->addEventChecked(&g_Config.iFrameSkip);
+	optionsMenu->add(new MenuAction(this, SLOT(audioAct()),   QT_TR_NOOP("&Audio")))
+		->addEventChecked(&g_Config.bEnableSound);
 	optionsMenu->addSeparator();
-	fullscreenAct = new MenuAction(this, optionsMenu, SLOT(fullscreenAct_triggered()), QT_TR_NOOP("&Fullscreen"), true, Qt::Key_F11);
-	statsAct = new MenuAction(this, optionsMenu, SLOT(statsAct_triggered()), QT_TR_NOOP("&Show debug statistics"), true);
-	showFPSAct = new MenuAction(this, optionsMenu, SLOT(showFPSAct_triggered()), QT_TR_NOOP("&Show FPS"), true);
+	optionsMenu->add(new MenuAction(this, SLOT(fullscrAct()), QT_TR_NOOP("&Fullscreen"), Qt::Key_F11))
+		->addEventChecked(&g_Config.bFullScreen);
+	optionsMenu->add(new MenuAction(this, SLOT(statsAct()),   QT_TR_NOOP("&Show debug statistics")))
+		->addEventChecked(&g_Config.bShowDebugStats);
+	optionsMenu->add(new MenuAction(this, SLOT(showFPSAct()), QT_TR_NOOP("&Show FPS")))
+		->addEventChecked(&g_Config.iShowFPSCounter);
 	optionsMenu->addSeparator();
 	// - Log Levels
-	levelsMenu = optionsMenu->addMenu("");
+	MenuTree* levelsMenu = new MenuTree(this, optionsMenu,    QT_TR_NOOP("Lo&g levels"));
 	QMenu* defaultLogMenu = levelsMenu->addMenu("Default");
-	NEW_GROUP(defaultLogMenu, defaultLogGroup, QStringList() << "Debug" << "Warning" << "Info" << "Error",
-		QList<int>() << LogTypes::LDEBUG << LogTypes::LWARNING << LogTypes::LINFO << LogTypes::LERROR);
+	defaultLogGroup = new MenuActionGroup(this, defaultLogMenu, SLOT(defaultLogGroup_triggered(QAction *)),
+		QStringList() << "Debug"          << "Warning"          << "Info"          << "Error",
+		QList<int>()  << LogTypes::LDEBUG << LogTypes::LWARNING << LogTypes::LINFO << LogTypes::LERROR);
 	QMenu* g3dLogMenu = levelsMenu->addMenu("G3D");
-	NEW_GROUP(g3dLogMenu, g3dLogGroup, QStringList() << "Debug" << "Warning" << "Info" << "Error",
-		QList<int>() << LogTypes::LDEBUG << LogTypes::LWARNING << LogTypes::LINFO << LogTypes::LERROR);
+	g3dLogGroup = new MenuActionGroup(this, g3dLogMenu, SLOT(g3dLogGroup_triggered(QAction *)),
+		QStringList() << "Debug"          << "Warning"          << "Info"          << "Error",
+		QList<int>()  << LogTypes::LDEBUG << LogTypes::LWARNING << LogTypes::LINFO << LogTypes::LERROR);
 	QMenu* hleLogMenu = levelsMenu->addMenu("HLE");
-	NEW_GROUP(hleLogMenu, hleLogGroup, QStringList() << "Debug" << "Warning" << "Info" << "Error",
-		QList<int>() << LogTypes::LDEBUG << LogTypes::LWARNING << LogTypes::LINFO << LogTypes::LERROR);
+	hleLogGroup = new MenuActionGroup(this, hleLogMenu, SLOT(hleLogGroup_triggered(QAction *)),
+		QStringList() << "Debug"          << "Warning"          << "Info"          << "Error",
+		QList<int>()  << LogTypes::LDEBUG << LogTypes::LWARNING << LogTypes::LINFO << LogTypes::LERROR);
 	optionsMenu->addSeparator();
 	// - Language
-	langMenu = optionsMenu->addMenu("");
-	langGroup = new QActionGroup(this);
+	MenuTree* langMenu = new MenuTree(this, optionsMenu,      QT_TR_NOOP("&Language"));
+	QActionGroup* langGroup = new QActionGroup(this);
 	QStringList fileNames = QDir(":/languages").entryList(QStringList("ppsspp_*.qm"));
 
 	if (fileNames.size() == 0)
@@ -650,7 +605,6 @@ void MainWindow::createMenus()
 			std::string testLang = g_Config.sLanguageIni;
 			if (currentLocale == locale || currentLang == locale) {
 				action->setChecked(true);
-				currentLanguage = locale;
 				loadLanguage(locale, false);
 				found = true;
 			}
@@ -663,11 +617,11 @@ void MainWindow::createMenus()
 	langMenu->addActions(langGroup->actions());
 	
 	// Help
-	helpMenu = menuBar()->addMenu("");
-	websiteAct = new MenuAction(this, helpMenu, SLOT(websiteAct_triggered()), QT_TR_NOOP("&Go to official website"), false);
-	aboutAct = new MenuAction(this, helpMenu, SLOT(aboutAct_triggered()), QT_TR_NOOP("&About PPSSPP..."), false);
+	MenuTree* helpMenu = new MenuTree(this, menuBar(),    QT_TR_NOOP("&Help"));
+	helpMenu->add(new MenuAction(this, SLOT(websiteAct()),    QT_TR_NOOP("&Go to official website")));
+	helpMenu->add(new MenuAction(this, SLOT(aboutAct()),      QT_TR_NOOP("&About PPSSPP...")));
 
-	retranslateUi();
+	retranslate();
 }
 
 void MainWindow::notifyMapsLoaded()
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index 43f47f9e17..7c105f8b76 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -16,6 +16,8 @@
 #include "debugger_displaylist.h"
 
 class QtEmuGL;
+class MenuAction;
+class MenuTree;
 
 class MainWindow : public QMainWindow
 {
@@ -42,63 +44,64 @@ protected:
 
 signals:
 	void retranslate();
+	void updateMenu();
 
 public slots:
 	void Boot();
 
 private slots:
 	// File
-	void openAct_triggered();
-	void closeAct_triggered();
-	void qlstateAct_triggered();
-	void qsstateAct_triggered();
-	void lstateAct_triggered();
-	void sstateAct_triggered();
-	void exitAct_triggered();
+	void openAct();
+	void closeAct();
+	void qlstateAct();
+	void qsstateAct();
+	void lstateAct();
+	void sstateAct();
+	void exitAct();
 
 	// Emulation
-	void runAct_triggered();
-	void pauseAct_triggered();
-	void resetAct_triggered();
-	void runonloadAct_triggered();
+	void runAct();
+	void pauseAct();
+	void resetAct();
+	void runonloadAct();
 
 	// Debug
-	void lmapAct_triggered();
-	void smapAct_triggered();
-	void resetTableAct_triggered();
-	void dumpNextAct_triggered();
-	void disasmAct_triggered();
-	void dpyListAct_triggered();
-	void consoleAct_triggered();
-	void memviewAct_triggered();
-	void memviewTexAct_triggered();
+	void lmapAct();
+	void smapAct();
+	void resetTableAct();
+	void dumpNextAct();
+	void disasmAct();
+	void dpyListAct();
+	void consoleAct();
+	void memviewAct();
+	void memviewTexAct();
 
 	// Options
 	// Core
-	void dynarecAct_triggered() { g_Config.bJit = !g_Config.bJit; }
-	void vertexDynarecAct_triggered() { g_Config.bVertexDecoderJit = !g_Config.bVertexDecoderJit; }
-	void fastmemAct_triggered() { g_Config.bFastMemory = !g_Config.bFastMemory; }
-	void ignoreIllegalAct_triggered() { g_Config.bIgnoreBadMemAccess = !g_Config.bIgnoreBadMemAccess; }
+	void dynarecAct() { g_Config.bJit = !g_Config.bJit; }
+	void vertexDynarecAct() { g_Config.bVertexDecoderJit = !g_Config.bVertexDecoderJit; }
+	void fastmemAct() { g_Config.bFastMemory = !g_Config.bFastMemory; }
+	void ignoreIllegalAct() { g_Config.bIgnoreBadMemAccess = !g_Config.bIgnoreBadMemAccess; }
 
 	// Video
 	void anisotropicGroup_triggered(QAction *action) { g_Config.iAnisotropyLevel = action->data().toInt(); }
 
-	void bufferRenderAct_triggered() { g_Config.iRenderingMode = !g_Config.iRenderingMode; }
-	void linearAct_triggered() { g_Config.iTexFiltering = (g_Config.iTexFiltering != 0) ? 0 : 3; }
+	void bufferRenderAct() { g_Config.iRenderingMode = !g_Config.iRenderingMode; }
+	void linearAct() { g_Config.iTexFiltering = (g_Config.iTexFiltering != 0) ? 0 : 3; }
 
 	void screenGroup_triggered(QAction *action) { SetZoom(action->data().toInt()); }
 
-	void stretchAct_triggered();
-	void transformAct_triggered() { g_Config.bHardwareTransform = !g_Config.bHardwareTransform; }
-	void vertexCacheAct_triggered() { g_Config.bVertexCache = !g_Config.bVertexCache; }
-	void frameskipAct_triggered() { g_Config.iFrameSkip = !g_Config.iFrameSkip; }
+	void stretchAct();
+	void transformAct() { g_Config.bHardwareTransform = !g_Config.bHardwareTransform; }
+	void vertexCacheAct() { g_Config.bVertexCache = !g_Config.bVertexCache; }
+	void frameskipAct() { g_Config.iFrameSkip = !g_Config.iFrameSkip; }
 
 	// Sound
-	void audioAct_triggered() { g_Config.bEnableSound = !g_Config.bEnableSound; }
+	void audioAct() { g_Config.bEnableSound = !g_Config.bEnableSound; }
 
-	void fullscreenAct_triggered();
-	void statsAct_triggered() { g_Config.bShowDebugStats = !g_Config.bShowDebugStats; }
-	void showFPSAct_triggered() { g_Config.iShowFPSCounter = !g_Config.iShowFPSCounter; }
+	void fullscrAct();
+	void statsAct() { g_Config.bShowDebugStats = !g_Config.bShowDebugStats; }
+	void showFPSAct() { g_Config.iShowFPSCounter = !g_Config.iShowFPSCounter; }
 
 	// Logs
 	void defaultLogGroup_triggered(QAction * action) {
@@ -115,12 +118,11 @@ private slots:
 	void hleLogGroup_triggered(QAction * action) { LogManager::GetInstance()->SetLogLevel(LogTypes::HLE, (LogTypes::LOG_LEVELS)action->data().toInt()); }
 
 	// Help
-	void websiteAct_triggered();
-	void aboutAct_triggered();
+	void websiteAct();
+	void aboutAct();
 
 	// Others
 	void langChanged(QAction *action) { loadLanguage(action->data().toString(), true); }
-	void retranslateUi();
 
 private:
 	void SetZoom(int zoom);
@@ -142,33 +144,8 @@ private:
 	Debugger_MemoryTex *memoryTexWindow;
 	Debugger_DisplayList *displaylistWindow;
 
-	// Menus
-	// File
-	QMenu *fileMenu;
-	QAction *openAct, *closeAct, *qlstateAct, *qsstateAct,
-	        *lstateAct, *sstateAct, *exitAct;
-	// Emulation
-	QMenu *emuMenu;
-	QAction *runAct, *pauseAct, *resetAct, *runonloadAct;
-	// Debug
-	QMenu *debugMenu;
-	QAction *lmapAct, *smapAct, *resetTableAct, *dumpNextAct,
-	        *disasmAct, *dpyListAct, *consoleAct, *memviewAct,
-	        *memviewTexAct;
-	// Options
-	QMenu *optionsMenu, *coreMenu, *videoMenu, *anisotropicMenu,
-	      *screenMenu, *levelsMenu, *langMenu;
-	QAction *dynarecAct, *vertexDynarecAct, *fastmemAct,
-	        *ignoreIllegalAct, *bufferRenderAct,
-	        *linearAct, *stretchAct, *transformAct, *vertexCacheAct,
-	        *frameskipAct, *audioAct, *fullscreenAct, *statsAct,
-	        *showFPSAct;
-	QActionGroup *anisotropicGroup, *screenGroup, *langGroup,
+	QActionGroup *anisotropicGroup, *screenGroup,
 	             *defaultLogGroup, *g3dLogGroup, *hleLogGroup;
-	// Help
-	QMenu *helpMenu;
-	QAction *websiteAct, *aboutAct;
-	
 };
 
 class MenuAction : public QAction
@@ -176,34 +153,116 @@ class MenuAction : public QAction
 	Q_OBJECT
 
 public:
-	MenuAction(QWidget* parent, QMenu* menu, const char* callback, char* text, bool isCheckable = false, QKeySequence key = 0) :
-		QAction(parent), _text(text)
+	// Add to QMenu
+	MenuAction(QWidget* parent, const char* callback, char* text, QKeySequence key = 0) :
+		QAction(parent), _text(text), _eventCheck(0), _stateEnable(-1), _stateDisable(-1), _enableStepping(false)
 	{
-		this->setCheckable(isCheckable);
-		menu->addAction(this);
-		if (key != 0) {
+		if (key != (QKeySequence)0) {
 			this->setShortcut(key);
 			parent->addAction(this); // So we don't lose the shortcut when menubar is hidden
 		}
 		connect(this, SIGNAL(triggered()), parent, callback);
 		connect(parent, SIGNAL(retranslate()), this, SLOT(retranslate()));
+		connect(parent, SIGNAL(updateMenu()), this, SLOT(update()));
 	}
+	// Add to QActionGroup
 	MenuAction(QWidget* parent, QActionGroup* group, QVariant data, QString text, QKeySequence key = 0) :
-		QAction(parent)
+		QAction(parent), _eventCheck(0), _stateEnable(-1), _stateDisable(-1), _enableStepping(false)
 	{
 		this->setCheckable(true);
 		this->setData(data);
 		this->setText(text); // Not translatable, yet
-		if (key != 0) {
+		if (key != (QKeySequence)0) {
 			this->setShortcut(key);
 			parent->addAction(this); // So we don't lose the shortcut when menubar is hidden
 		}
 		group->addAction(this);
 	}
+	// Event which causes it to be checked
+	void addEventChecked(bool* event) {
+		this->setCheckable(true);
+		_eventCheck = event;
+	}
+	// TODO: Possibly handle compares
+	void addEventChecked(int* event) {
+		this->setCheckable(true);
+		_eventCheck = (bool*)event;
+	}
+	// UI State which causes it to be enabled
+	void addEnableState(int state) {
+		_stateEnable = state;
+	}
+	void addDisableState(int state) {
+		_stateDisable = state;
+	}
+	MenuAction* addEnableStepping() {
+		_enableStepping = true;
+		return this;
+	}
 public slots:
 	void retranslate() {
 		setText(qApp->translate("MainWindow", _text));
 	}
+	void update() {
+		if (_eventCheck)
+			setChecked(*_eventCheck);
+		if (_stateEnable >= 0)
+			setEnabled(globalUIState == _stateEnable);
+		if (_stateDisable >= 0)
+			setEnabled(globalUIState != _stateDisable);
+		if (_enableStepping && Core_IsStepping())
+			setEnabled(true);
+	}
+private:
+	char* _text;
+	bool* _eventCheck;
+	int _stateEnable, _stateDisable;
+	bool _enableStepping;
+};
+
+class MenuActionGroup : public QActionGroup
+{
+	Q_OBJECT
+public:
+	MenuActionGroup(QWidget* parent, QMenu* menu, const char* callback, QStringList nameList,
+		QList<int> valueList, QList<int> keyList = QList<int>()) :
+		QActionGroup(parent)
+	{
+		QListIterator<int> i(valueList);
+		QListIterator<int> k(keyList);
+		foreach(QString name, nameList) {
+			new MenuAction(parent, this, i.next(), name, k.next());
+		}
+		connect(this, SIGNAL(triggered(QAction *)), parent, callback);
+		menu->addActions(this->actions());
+	}
+};
+
+class MenuTree : public QMenu
+{
+	Q_OBJECT
+public:
+	MenuTree(QWidget* parent, QMenuBar* menu, char* text) :
+		QMenu(parent), _text(text)
+	{
+		menu->addMenu(this);
+		connect(parent, SIGNAL(retranslate()), this, SLOT(retranslate()));
+	}
+	MenuTree(QWidget* parent, QMenu* menu, char* text) :
+		QMenu(parent), _text(text)
+	{
+		menu->addMenu(this);
+		connect(parent, SIGNAL(retranslate()), this, SLOT(retranslate()));
+	}
+	MenuAction* add(MenuAction* action)
+	{
+		addAction(action);
+		return action;
+	}
+public slots:
+	void retranslate() {
+		setTitle(qApp->translate("MainWindow", _text));
+	}
 private:
 	char* _text;
 };