From 0074856a2baf7ab518a3daa6a6754838c896a369 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 20 Jun 2015 19:46:13 +0200 Subject: [PATCH] (Menu) More menu hashes --- menu/menu_hash.c | 16 ++++++++++++++++ menu/menu_hash.h | 8 ++++++++ menu/menu_setting.c | 41 +++++++++++++++++++++-------------------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/menu/menu_hash.c b/menu/menu_hash.c index c516dd9b17..5d62e3e99e 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -311,6 +311,22 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_RGUI_SHOW_START_SCREEN: + return "rgui_show_start_screen"; + case MENU_LABEL_VALUE_RGUI_SHOW_START_SCREEN: + return "Show Start Screen"; + case MENU_LABEL_TITLE_COLOR: + return "menu_title_color"; + case MENU_LABEL_VALUE_TITLE_COLOR: + return "Menu title color"; + case MENU_LABEL_ENTRY_HOVER_COLOR: + return "menu_entry_hover_color"; + case MENU_LABEL_VALUE_ENTRY_HOVER_COLOR: + return "Menu entry hover color"; + case MENU_LABEL_TIMEDATE_ENABLE: + return "menu_timedate_enable"; + case MENU_LABEL_VALUE_TIMEDATE_ENABLE: + return "Display time / date"; case MENU_LABEL_THREADED_DATA_RUNLOOP_ENABLE: return "threaded_data_runloop_enable"; case MENU_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index ade619b69b..a6025e38e1 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -105,6 +105,7 @@ extern "C" { #define MENU_LABEL_AUTO_REMAPS_ENABLE 0x98c8f98bU #define MENU_LABEL_VALUE_AUTO_REMAPS_ENABLE 0x390f9666U #define MENU_LABEL_RGUI_SHOW_START_SCREEN 0x6b38f0e8U +#define MENU_LABEL_VALUE_RGUI_SHOW_START_SCREEN 0x76784454U #define MENU_LABEL_VIDEO_BLACK_FRAME_INSERTION 0x53477f5cU #define MENU_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION 0xb823faa8U #define MENU_LABEL_VIDEO_HARD_SYNC_FRAMES 0xce0ece13U @@ -119,8 +120,15 @@ extern "C" { #define MENU_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE 0x04d8c10fU #define MENU_LABEL_VIDEO_THREADED 0x0626179cU #define MENU_LABEL_VALUE_VIDEO_THREADED 0xc7524afdU + +#define MENU_LABEL_TITLE_COLOR 0x10059879U +#define MENU_LABEL_VALUE_TITLE_COLOR 0xea87e1dbU +#define MENU_LABEL_TIMEDATE_ENABLE 0xd3adcbecU +#define MENU_LABEL_VALUE_TIMEDATE_ENABLE 0x104bcdf7U #define MENU_LABEL_ENTRY_NORMAL_COLOR 0x5154ffd1U #define MENU_LABEL_VALUE_ENTRY_NORMAL_COLOR 0xa989a754U +#define MENU_LABEL_ENTRY_HOVER_COLOR 0x4143cfccU +#define MENU_LABEL_VALUE_ENTRY_HOVER_COLOR 0xb56f1b0fU #define MENU_LABEL_AUDIO_SYNC 0xe0cd6bd3U #define MENU_LABEL_VALUE_AUDIO_SYNC 0xcbeb903bU #define MENU_LABEL_VIDEO_VSYNC 0x09c2d34eU diff --git a/menu/menu_setting.c b/menu/menu_setting.c index fe57981e8a..65806e5e82 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5724,18 +5724,6 @@ static bool setting_append_list_menu_options( general_write_handler, general_read_handler); - CONFIG_BOOL( - settings->menu.boxart_enable, - menu_hash_to_str(MENU_LABEL_BOXART), - menu_hash_to_str(MENU_LABEL_VALUE_BOXART), - true, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), - group_info.name, - subgroup_info.name, - parent_group, - general_write_handler, - general_read_handler); CONFIG_BOOL( settings->menu.pause_libretro, @@ -5872,8 +5860,8 @@ static bool setting_append_list_menu_options( CONFIG_HEX( settings->menu.entry_hover_color, - "menu_entry_hover_color", - "Menu entry hover color", + menu_hash_to_str(MENU_LABEL_ENTRY_HOVER_COLOR), + menu_hash_to_str(MENU_LABEL_VALUE_ENTRY_HOVER_COLOR), menu_entry_hover_color, group_info.name, subgroup_info.name, @@ -5885,8 +5873,8 @@ static bool setting_append_list_menu_options( CONFIG_HEX( settings->menu.title_color, - "menu_title_color", - "Menu title color", + menu_hash_to_str(MENU_LABEL_TITLE_COLOR), + menu_hash_to_str(MENU_LABEL_VALUE_TITLE_COLOR), menu_title_color, group_info.name, subgroup_info.name, @@ -5914,8 +5902,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu_show_start_screen, - "rgui_show_start_screen", - "Show Start Screen", + menu_hash_to_str(MENU_LABEL_RGUI_SHOW_START_SCREEN), + menu_hash_to_str(MENU_LABEL_VALUE_RGUI_SHOW_START_SCREEN), menu_show_start_screen, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5925,10 +5913,23 @@ static bool setting_append_list_menu_options( general_write_handler, general_read_handler); + CONFIG_BOOL( + settings->menu.boxart_enable, + menu_hash_to_str(MENU_LABEL_BOXART), + menu_hash_to_str(MENU_LABEL_VALUE_BOXART), + true, + menu_hash_to_str(MENU_VALUE_OFF), + menu_hash_to_str(MENU_VALUE_ON), + group_info.name, + subgroup_info.name, + parent_group, + general_write_handler, + general_read_handler); + CONFIG_BOOL( settings->menu.timedate_enable, - "menu_timedate_enable", - "Display time / date", + menu_hash_to_str(MENU_LABEL_TIMEDATE_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_TIMEDATE_ENABLE), true, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON),