From a4479e67385400738bf997608804387916d2c113 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 25 Nov 2018 11:39:05 -0500 Subject: [PATCH] pack the fullscreen settings together --- intl/msg_hash_ar.h | 4 ++-- intl/msg_hash_cht.h | 4 ++-- intl/msg_hash_el.h | 4 ++-- intl/msg_hash_eo.h | 4 ++-- intl/msg_hash_nl.h | 4 ++-- intl/msg_hash_us.h | 4 ++-- intl/msg_hash_vn.h | 4 ++-- menu/menu_displaylist.c | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index 9a9163aa47..865fd63e2b 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -2669,9 +2669,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH, MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT, "Set the custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution.") + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution") + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, "Specify custom X axis position for onscreen text.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y, diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index f619da864f..ad767dcb25 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -2499,9 +2499,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH, MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT, "Set the custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution.") + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution") + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, "Specify custom X axis position for onscreen text.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y, diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h index 4a1a64116c..3954649d49 100644 --- a/intl/msg_hash_el.h +++ b/intl/msg_hash_el.h @@ -4862,11 +4862,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution." + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution." ) MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution" + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution." ) MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 4069f0cb2f..b4eda865a4 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2372,9 +2372,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH, MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT, "Set the custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution.") + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution") + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, "Specify custom X axis position for onscreen text.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 3f169052d4..e1ffd5b701 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2388,9 +2388,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH, MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT, "Set the custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution.") + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution") + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, "Specify custom X axis position for onscreen text.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c7ac4fc74f..f400919e98 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -4898,11 +4898,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution." + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution." ) MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution" + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution." ) MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 79a6cdb8d7..e1c45a5d7e 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -2537,9 +2537,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH, MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT, "Set the custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X, - "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution.") + "Set the custom width size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y, - "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution") + "Set the custom height size for the non-windowed fullscreen mode. Leaving it unset will use the desktop resolution.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, "Specify custom X axis position for onscreen text.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 73e3f6e744..5cfdbcdd8c 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -6546,9 +6546,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE, PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_SCREEN_RESOLUTION, - PARSE_ACTION, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_PAL60_ENABLE, PARSE_ONLY_BOOL, false); @@ -6570,6 +6567,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN, PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_SCREEN_RESOLUTION, + PARSE_ACTION, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_VIDEO_FULLSCREEN_X, PARSE_ONLY_UINT, false);