From 8ef7bb34e9f0c5c450d6063f1bb789c5bf0010cc Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 20 Jun 2015 18:35:53 +0200 Subject: [PATCH] (Menu) Menu label updates --- menu/menu_hash.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ menu/menu_hash.h | 25 +++++++++++++++++++++++++ menu/menu_setting.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 91 insertions(+), 22 deletions(-) diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 4af37db9a5..9c130b4ea8 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -311,6 +311,50 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_MOUSE_ENABLE: + return "menu_mouse_enable"; + case MENU_LABEL_VALUE_MOUSE_ENABLE: + return "Mouse Support"; + case MENU_LABEL_POINTER_ENABLE: + return "menu_pointer_enable"; + case MENU_LABEL_VALUE_POINTER_ENABLE: + return "Touch Support"; + case MENU_LABEL_CORE_ENABLE: + return "menu_core_enable"; + case MENU_LABEL_VALUE_CORE_ENABLE: + return "Display core name"; + case MENU_LABEL_DPI_OVERRIDE_ENABLE: + return "dpi_override_enable"; + case MENU_LABEL_VALUE_DPI_OVERRIDE_ENABLE: + return "DPI Override Enable"; + case MENU_LABEL_DPI_OVERRIDE_VALUE: + return "dpi_override_value"; + case MENU_LABEL_VALUE_DPI_OVERRIDE_VALUE: + return "DPI Override"; + case MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE: + return "suspend_screensaver_enable"; + case MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE: + return "Suspend Screensaver"; + case MENU_LABEL_VIDEO_DISABLE_COMPOSITION: + return "video_disable_composition"; + case MENU_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION: + return "Disable Desktop Composition"; + case MENU_LABEL_PAUSE_NONACTIVE: + return "pause_nonactive"; + case MENU_LABEL_VALUE_PAUSE_NONACTIVE: + return "Don't run in background"; + case MENU_LABEL_UI_COMPANION_START_ON_BOOT: + return "ui_companion_start_on_boot"; + case MENU_LABEL_VALUE_UI_COMPANION_START_ON_BOOT: + return "UI Companion Start On Boot"; + case MENU_LABEL_UI_MENUBAR_ENABLE: + return "ui_menubar_enable"; + case MENU_LABEL_VALUE_UI_MENUBAR_ENABLE: + return "Menubar (Hint)"; + case MENU_LABEL_ARCHIVE_MODE: + return "archive_mode"; + case MENU_LABEL_VALUE_ARCHIVE_MODE: + return "Archive Mode"; case MENU_LABEL_NETWORK_CMD_ENABLE: return "network_cmd_enable"; case MENU_LABEL_VALUE_NETWORK_CMD_ENABLE: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index f9242f9d5a..d5bb673352 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -20,6 +20,15 @@ extern "C" { #endif +#define MENU_LABEL_CORE_ENABLE 0x2f37fe48U +#define MENU_LABEL_VALUE_CORE_ENABLE 0x751e2065U + +#define MENU_LABEL_MOUSE_ENABLE 0x1240fa88U +#define MENU_LABEL_VALUE_MOUSE_ENABLE 0xd5bf366bU + +#define MENU_LABEL_POINTER_ENABLE 0xf051a7a0U +#define MENU_LABEL_VALUE_POINTER_ENABLE 0x1e24b9e5U + #define MENU_LABEL_RESET 0x10474288U #define MENU_LABEL_SLOWMOTION 0x6a269ea0U #define MENU_LABEL_HOLD_FAST_FORWARD 0xebe2e4cdU @@ -32,6 +41,14 @@ extern "C" { #define MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND 0xcdf3c0d5U #define MENU_LABEL_VALUE_NO_ITEMS 0x7d33e412U +#define MENU_LABEL_UI_MENUBAR_ENABLE 0x1ddc5492U +#define MENU_LABEL_VALUE_UI_MENUBAR_ENABLE 0x11927e13U + +#define MENU_LABEL_UI_COMPANION_START_ON_BOOT 0x36b23782U +#define MENU_LABEL_VALUE_UI_COMPANION_START_ON_BOOT 0x94796ba6U + +#define MENU_LABEL_ARCHIVE_MODE 0x7fac00cbU +#define MENU_LABEL_VALUE_ARCHIVE_MODE 0x5cbac0ccU #define MENU_LABEL_VALUE_SHADER_OPTIONS 0xf3fb0028U #define MENU_LABEL_VALUE_USE_THIS_DIRECTORY 0xc5fc9ed9U #define MENU_LABEL_USE_THIS_DIRECTORY 0xc51d351dU @@ -70,6 +87,7 @@ extern "C" { #define MENU_LABEL_VIDEO_GPU_SCREENSHOT 0xee2fcb44U #define MENU_LABEL_VALUE_VIDEO_GPU_SCREENSHOT 0x4af80c36U #define MENU_LABEL_PAUSE_NONACTIVE 0x580bf549U +#define MENU_LABEL_VALUE_PAUSE_NONACTIVE 0xe985d38dU #define MENU_LABEL_BLOCK_SRAM_OVERWRITE 0xc4e88d08U #define MENU_LABEL_VALUE_BLOCK_SRAM_OVERWRITE 0x9b38260aU #define MENU_LABEL_VIDEO_FULLSCREEN 0x9506dd4eU @@ -107,6 +125,13 @@ extern "C" { #define MENU_LABEL_VALUE_SAVESTATE_AUTO_LOAD 0x9b5ca25fU #define MENU_LABEL_SYSTEM_DIRECTORY 0x35a6fb9eU #define MENU_LABEL_VIDEO_DISABLE_COMPOSITION 0x5cbb6222U +#define MENU_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION 0xa6200347U +#define MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE 0x459fcb0dU +#define MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE 0xf423ff48U +#define MENU_LABEL_DPI_OVERRIDE_ENABLE 0xb4bf52c7U +#define MENU_LABEL_VALUE_DPI_OVERRIDE_ENABLE 0xd535f449U +#define MENU_LABEL_DPI_OVERRIDE_VALUE 0x543a3efdU +#define MENU_LABEL_VALUE_DPI_OVERRIDE_VALUE 0x1462aba2U #define MENU_LABEL_VOLUME_UP 0xa66e9681U #define MENU_LABEL_VOLUME_DOWN 0xfc64f3d4U #define MENU_LABEL_LOG_VERBOSITY 0x6648c96dU diff --git a/menu/menu_setting.c b/menu/menu_setting.c index fd5e386517..0d538e5f01 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5754,8 +5754,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu.mouse.enable, - "menu_mouse_enable", - "Mouse Support", + menu_hash_to_str(MENU_LABEL_MOUSE_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_MOUSE_ENABLE), false, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5767,8 +5767,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu.pointer.enable, - "menu_pointer_enable", - "Touch Support", + menu_hash_to_str(MENU_LABEL_POINTER_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_POINTER_ENABLE), pointer_enable, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5940,8 +5940,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu.core_enable, - "menu_core_enable", - "Display core name", + menu_hash_to_str(MENU_LABEL_CORE_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_CORE_ENABLE), true, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5957,8 +5957,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu.dpi.override_enable, - "dpi_override_enable", - "DPI Override Enable", + menu_hash_to_str(MENU_LABEL_DPI_OVERRIDE_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_DPI_OVERRIDE_ENABLE), menu_dpi_override_enable, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5970,8 +5970,8 @@ static bool setting_append_list_menu_options( CONFIG_UINT( settings->menu.dpi.override_value, - "dpi_override_value", - "DPI Override", + menu_hash_to_str(MENU_LABEL_DPI_OVERRIDE_VALUE), + menu_hash_to_str(MENU_LABEL_VALUE_DPI_OVERRIDE_VALUE), menu_dpi_override_value, group_info.name, subgroup_info.name, @@ -6003,8 +6003,8 @@ static bool setting_append_list_ui_options( CONFIG_BOOL( settings->video.disable_composition, - "video_disable_composition", - "Disable Desktop Composition", + menu_hash_to_str(MENU_LABEL_VIDEO_DISABLE_COMPOSITION), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION), disable_composition, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -6018,8 +6018,8 @@ static bool setting_append_list_ui_options( CONFIG_BOOL( settings->pause_nonactive, - "pause_nonactive", - "Don't run in background", + menu_hash_to_str(MENU_LABEL_PAUSE_NONACTIVE), + menu_hash_to_str(MENU_LABEL_VALUE_PAUSE_NONACTIVE), pause_nonactive, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -6031,8 +6031,8 @@ static bool setting_append_list_ui_options( CONFIG_BOOL( settings->ui.companion_start_on_boot, - "ui_companion_start_on_boot", - "UI Companion Start on Boot", + menu_hash_to_str(MENU_LABEL_UI_COMPANION_START_ON_BOOT), + menu_hash_to_str(MENU_LABEL_VALUE_UI_COMPANION_START_ON_BOOT), true, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -6045,8 +6045,8 @@ static bool setting_append_list_ui_options( CONFIG_BOOL( settings->ui.menubar_enable, - "ui_menubar_enable", - "Menubar (Windows)", + menu_hash_to_str(MENU_LABEL_UI_MENUBAR_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_UI_MENUBAR_ENABLE), true, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -6058,8 +6058,8 @@ static bool setting_append_list_ui_options( CONFIG_BOOL( settings->ui.suspend_screensaver_enable, - "suspend_screensaver_enable", - "Suspend Screensaver", + menu_hash_to_str(MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE), true, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -6092,8 +6092,8 @@ static bool setting_append_list_archive_options( CONFIG_UINT( settings->archive.mode, - "archive_mode", - "Archive Mode", + menu_hash_to_str(MENU_LABEL_ARCHIVE_MODE), + menu_hash_to_str(MENU_LABEL_VALUE_ARCHIVE_MODE), 0, group_info.name, subgroup_info.name,