From 79846abcbd17ec620d61385f222c4b37b1187361 Mon Sep 17 00:00:00 2001 From: The Dax Date: Sat, 7 Sep 2013 17:53:37 -0400 Subject: [PATCH 1/2] Set the UI state to MENU so that the pause/reset/stop buttons disable appropriately. --- Windows/WndMainWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 8169e05e67..f8acbbe911 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1356,10 +1356,12 @@ namespace MainWindow case ID_OPTIONS_CONTROLS: NativeMessageReceived("control mapping", ""); + globalUIState = UISTATE_MENU; break; case ID_OPTIONS_MORE_SETTINGS: NativeMessageReceived("settings", ""); + globalUIState = UISTATE_MENU; break; case ID_EMULATION_SOUND: From 062e803f03ff674491a67a2154a0c02810621cf9 Mon Sep 17 00:00:00 2001 From: The Dax Date: Sat, 7 Sep 2013 18:04:16 -0400 Subject: [PATCH 2/2] Make More Settings and Control Mapping translatable. --- Windows/WndMainWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index f8acbbe911..4d49e0270c 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -467,6 +467,8 @@ namespace MainWindow TranslateMenuItem(ID_OPTIONS_READFBOTOMEMORYGPU, desktopUI, true, false); TranslateMenuItem(ID_OPTIONS_FRAMESKIP_0, desktopUI); TranslateMenuItem(ID_OPTIONS_FRAMESKIP_AUTO, desktopUI); + TranslateMenuItem(ID_OPTIONS_MORE_SETTINGS, desktopUI); + TranslateMenuItem(ID_OPTIONS_CONTROLS, desktopUI); // Skip frameskipping 2-8.. TranslateMenuItem(ID_OPTIONS_TEXTUREFILTERING_AUTO, desktopUI); TranslateMenuItem(ID_OPTIONS_NEARESTFILTERING, desktopUI);