From 71ca56e0fbaef09bdce7f136f99c4a3383b1f4f4 Mon Sep 17 00:00:00 2001 From: sonninnos Date: Mon, 23 Aug 2021 17:44:02 +0300 Subject: [PATCH] Add missing sublabels for video options --- intl/msg_hash_us.h | 8 ++++++++ menu/cbs/menu_cbs_sublabel.c | 8 ++++++++ menu/menu_displaylist.c | 19 +++++++++++-------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 89395451b6..8e7fe5ca06 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1502,6 +1502,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_VIDEO_GPU_INDEX, "GPU Index" ) +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_GPU_INDEX, + "Select which graphics card to use." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE, "Vertical Refresh Rate" @@ -12142,6 +12146,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution" ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SCREEN_RESOLUTION, + "Select display mode." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_SHUTDOWN, "Shutdown" diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index e3aae650db..3b5e435c4c 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -880,6 +880,8 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_dingux_refresh_rate, DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_dingux_rs90_softfilter_type, MENU_ENUM_SUBLABEL_VIDEO_DINGUX_RS90_SOFTFILTER_TYPE) #endif #endif +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_screen_resolution, MENU_ENUM_SUBLABEL_SCREEN_RESOLUTION) +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_gpu_index, MENU_ENUM_SUBLABEL_VIDEO_GPU_INDEX) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_height, MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_width, MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_x, MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_X) @@ -1984,6 +1986,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_materialui_thumbnail_background_enable); #endif break; + case MENU_ENUM_LABEL_SCREEN_RESOLUTION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_screen_resolution); + break; + case MENU_ENUM_LABEL_VIDEO_GPU_INDEX: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_gpu_index); + break; case MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_viewport_custom_height); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 69bd85f260..e988b5e7de 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7770,6 +7770,17 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_VIDEO_DRIVER, PARSE_ONLY_STRING_OPTIONS, false) == 0) count++; + + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_GPU_INDEX, + PARSE_ONLY_INT, false) == 0) + count++; + + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX, + PARSE_ONLY_UINT, false) == 0) + count++; + #if defined(GEKKO) || !defined(__PSL1GHT__) && defined(__PS3__) if (true) #else @@ -7799,10 +7810,6 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER, PARSE_ONLY_UINT, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX, - PARSE_ONLY_UINT, false) == 0) - count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_ROTATION, PARSE_ONLY_UINT, false) == 0) @@ -7813,10 +7820,6 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_SCREEN_ORIENTATION, PARSE_ONLY_UINT, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_GPU_INDEX, - PARSE_ONLY_INT, false) == 0) - count++; #if defined(DINGUX) && defined(DINGUX_BETA) if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_DINGUX_REFRESH_RATE,