From f6458334b6a9d865e78741a3d302557d8b2df2dd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 13 Aug 2017 18:29:34 +0200 Subject: [PATCH] Move some settings around, and rename 'Menu' to 'Appearance' --- intl/msg_hash_eo.h | 2 +- intl/msg_hash_fr.h | 2 +- intl/msg_hash_it.h | 2 +- intl/msg_hash_nl.h | 2 +- intl/msg_hash_pt_br.h | 2 +- intl/msg_hash_pt_pt.h | 2 +- intl/msg_hash_us.h | 2 +- intl/msg_hash_vn.h | 2 +- menu/menu_displaylist.c | 30 +++++++++++++++--------------- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 58d85f3d4e..5e07da30b6 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -863,7 +863,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_HORIZONTAL_ANIMATION, "Horizontal Animation") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index edf2d39225..8775cab098 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -950,7 +950,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, "Filtre linéaire pour le menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Fond d'écran") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 47ed227e03..f23da90c3b 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -827,7 +827,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, /* TODO/FIXME - updat MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, "Filtro lineare del menù") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menù") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Menù sfondi") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index c6de568cab..9a55eda969 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -861,7 +861,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, "Menu Linear Filter") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Achtergrond") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 7a2b5636f7..44f22e0c2a 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -1061,7 +1061,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, "Filtro Linear de Menu" ) MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu" + "Appearance" ) MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Plano de Fundo" diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 7d37530f5f..154b80c9cc 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -936,7 +936,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, "Filtro de menu Linear") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Fundo") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index b647b2a679..4e136f0f86 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -960,7 +960,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_HORIZONTAL_ANIMATION, "Horizontal Animation") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 9d253653e7..1459a99f45 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -948,7 +948,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, "Menu Linear Filter") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, - "Menu") + "Appearance") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 68e9f1593d..ca66eb45da 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5112,6 +5112,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_CORE_ENABLE, PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN, + PARSE_ONLY_BOOL, false); info->need_refresh = true; info->need_push = true; @@ -5128,24 +5131,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY, PARSE_ONLY_FLOAT, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_PAUSE_LIBRETRO, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_MOUSE_ENABLE, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_POINTER_ENABLE, - PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MENU_LINEAR_FILTER, PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MENU_HORIZONTAL_ANIMATION, PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND, - PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_ENTRY_NORMAL_COLOR, PARSE_ONLY_HEX, false); @@ -5191,9 +5182,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY, PARSE_ONLY_FLOAT, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN, - PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_THUMBNAILS, PARSE_ONLY_UINT, false); @@ -5211,6 +5199,18 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS, PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_PAUSE_LIBRETRO, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_MOUSE_ENABLE, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_POINTER_ENABLE, + PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE, PARSE_ONLY_BOOL, false);