Add sublabels for 'Aspect Ratio' and windowed 'Opacity/Decorations/Menubar' (#13808)

This commit is contained in:
Tony 2022-04-01 16:03:10 +03:00 committed by GitHub
parent 510af4678e
commit 9276921f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 2 deletions

View File

@ -1774,14 +1774,26 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_OPACITY,
"Window Opacity"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_WINDOW_OPACITY,
"Set the window transparency."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_SHOW_DECORATIONS,
"Show Window Decorations"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SHOW_DECORATIONS,
"Show window title bar and borders."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
"Show Menu Bar"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_UI_MENUBAR_ENABLE,
"Show window menu bar."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_SAVE_POSITION,
"Remember Window Position and Size"
@ -1853,13 +1865,17 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX,
"Aspect Ratio"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO_INDEX,
"Set display aspect ratio."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO,
"Custom Aspect Ratio"
"Config Aspect Ratio"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO,
"Floating point value for video aspect ratio (width / height), used if 'Aspect Ratio' is set to 'Config'."
"Floating point value for video aspect ratio (width / height)."
)
#if defined(DINGUX)
MSG_HASH(

View File

@ -321,6 +321,9 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_output_settings_list,
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_crt_switchres_settings_list, MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_suspend_screensaver_enable, MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_scale, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_opacity, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_OPACITY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_show_decorations, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SHOW_DECORATIONS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_show_menubar, MENU_ENUM_SUBLABEL_UI_MENUBAR_ENABLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_settings_list, MENU_ENUM_SUBLABEL_AUDIO_SETTINGS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_resampler_settings_list, MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_SETTINGS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_output_settings_list, MENU_ENUM_SUBLABEL_AUDIO_OUTPUT_SETTINGS)
@ -1029,6 +1032,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_quick_menu,
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_information, MENU_ENUM_SUBLABEL_CORE_INFORMATION)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_disc_information, MENU_ENUM_SUBLABEL_DISC_INFORMATION)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_aspect_ratio, MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_aspect_ratio_index, MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO_INDEX)
#if defined(DINGUX)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_dingux_ipu_keep_aspect, MENU_ENUM_SUBLABEL_VIDEO_DINGUX_IPU_KEEP_ASPECT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_dingux_ipu_filter_type, MENU_ENUM_SUBLABEL_VIDEO_DINGUX_IPU_FILTER_TYPE)
@ -2210,6 +2214,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_aspect_ratio);
break;
case MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_aspect_ratio_index);
break;
#if defined(DINGUX)
case MENU_ENUM_LABEL_VIDEO_DINGUX_IPU_KEEP_ASPECT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_dingux_ipu_keep_aspect);
@ -4443,6 +4450,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_VIDEO_SCALE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_scale);
break;
case MENU_ENUM_LABEL_VIDEO_WINDOW_OPACITY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_opacity);
break;
case MENU_ENUM_LABEL_VIDEO_WINDOW_SHOW_DECORATIONS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_show_decorations);
break;
case MENU_ENUM_LABEL_UI_MENUBAR_ENABLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_show_menubar);
break;
case MENU_ENUM_LABEL_PAUSE_NONACTIVE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_pause_nonactive);
break;