(Menu) Change some RGUI references to Menu

This commit is contained in:
twinaphex 2014-06-13 18:47:02 +02:00
parent 7cba4fe0fb
commit 97c5b9976d
5 changed files with 7 additions and 7 deletions

View File

@ -49,7 +49,7 @@ Darren Alton -
Fabian Knopf - Fabian Knopf -
- WGL multi-monitor support - WGL multi-monitor support
- D3D9 overlay, multi-monitor and RGUI support - D3D9 overlay, multi-monitor and menu support
Gražvydas Ignotas - Gražvydas Ignotas -
- ARM Linux patches - ARM Linux patches

View File

@ -187,7 +187,7 @@ public final class UserPreferences
config.setBoolean("video_threaded", prefs.getBoolean("video_threaded", true)); config.setBoolean("video_threaded", prefs.getBoolean("video_threaded", true));
// Refactor these weird values - 'full', 'auto', 'square', whatever - // Refactor these weird values - 'full', 'auto', 'square', whatever -
// go by what we have in RGUI - makes maintaining state easier too // go by what we have in the menu - makes maintaining state easier too
String aspect = prefs.getString("video_aspect_ratio", "auto"); String aspect = prefs.getString("video_aspect_ratio", "auto");
if (aspect.equals("full")) if (aspect.equals("full"))
{ {

View File

@ -170,7 +170,7 @@
<string key="resetGame:">id</string> <string key="resetGame:">id</string>
<string key="saveState:">id</string> <string key="saveState:">id</string>
<string key="showPauseMenu:">id</string> <string key="showPauseMenu:">id</string>
<string key="showRGUI:">id</string> <string key="showMenu:">id</string>
<string key="startBluetooth">id</string> <string key="startBluetooth">id</string>
<string key="stopBluetooth">id</string> <string key="stopBluetooth">id</string>
</dictionary> </dictionary>
@ -203,8 +203,8 @@
<string key="name">showPauseMenu:</string> <string key="name">showPauseMenu:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo" key="showRGUI:"> <object class="IBActionInfo" key="showMenu:">
<string key="name">showRGUI:</string> <string key="name">showMenu:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo" key="startBluetooth"> <object class="IBActionInfo" key="startBluetooth">

View File

@ -70,7 +70,7 @@ typedef enum
MENU_SETTINGS_SHADER_PRESET, MENU_SETTINGS_SHADER_PRESET,
MENU_SETTINGS_SHADER_APPLY, MENU_SETTINGS_SHADER_APPLY,
MENU_SETTINGS_SHADER_PARAMETERS, // Modifies current shader directly. Will not get saved to CGP. MENU_SETTINGS_SHADER_PARAMETERS, // Modifies current shader directly. Will not get saved to CGP.
MENU_SETTINGS_SHADER_PRESET_PARAMETERS, // Modifies shader preset currently in RGUI. MENU_SETTINGS_SHADER_PRESET_PARAMETERS, // Modifies shader preset currently in menu.
MENU_SETTINGS_SHADER_PASSES, MENU_SETTINGS_SHADER_PASSES,
MENU_SETTINGS_SHADER_PARAMETER_0, MENU_SETTINGS_SHADER_PARAMETER_0,
MENU_SETTINGS_SHADER_PARAMETER_LAST = MENU_SETTINGS_SHADER_PARAMETER_0 + (GFX_MAX_PARAMETERS - 1), MENU_SETTINGS_SHADER_PARAMETER_LAST = MENU_SETTINGS_SHADER_PARAMETER_0 + (GFX_MAX_PARAMETERS - 1),

View File

@ -181,7 +181,7 @@ static void rmenu_render(void)
else if (menu_type == MENU_SETTINGS_SHADER_PARAMETERS) else if (menu_type == MENU_SETTINGS_SHADER_PARAMETERS)
strlcpy(title, "SHADER PARAMETERS (CURRENT)", sizeof(title)); strlcpy(title, "SHADER PARAMETERS (CURRENT)", sizeof(title));
else if (menu_type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS) else if (menu_type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS)
strlcpy(title, "SHADER PARAMETERS (RGUI PRESET)", sizeof(title)); strlcpy(title, "SHADER PARAMETERS (MENU PRESET)", sizeof(title));
#endif #endif
else if (menu_type == MENU_SETTINGS_AUDIO_OPTIONS) else if (menu_type == MENU_SETTINGS_AUDIO_OPTIONS)
strlcpy(title, "AUDIO OPTIONS", sizeof(title)); strlcpy(title, "AUDIO OPTIONS", sizeof(title));