diff --git a/config.def.h b/config.def.h index 2048ebf331..6e30fe126c 100644 --- a/config.def.h +++ b/config.def.h @@ -58,6 +58,10 @@ static bool bundle_assets_extract_enable = true; static bool bundle_assets_extract_enable = false; #endif +#ifdef HAVE_MATERIALUI +static bool materialui_icons_enable = true; +#endif + static const bool def_history_list_enable = true; static const bool def_playlist_entry_remove = true; diff --git a/configuration.c b/configuration.c index f14ff753b5..cf37d12a05 100644 --- a/configuration.c +++ b/configuration.c @@ -1192,6 +1192,9 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("menu_battery_level_enable", &settings->bools.menu_battery_level_enable, true, true, false); SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false); SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, false, false); +#ifdef HAVE_MATERIALUI + SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, materialui_icons_enable, false); +#endif #ifdef HAVE_XMB SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, xmb_shadows_enable, false); SETTING_BOOL("xmb_show_settings", &settings->bools.menu_xmb_show_settings, true, xmb_show_settings, false); diff --git a/configuration.h b/configuration.h index 1102e0ef15..3f72595181 100644 --- a/configuration.h +++ b/configuration.h @@ -123,6 +123,7 @@ typedef struct settings bool menu_horizontal_animation; bool menu_show_online_updater; bool menu_show_core_updater; + bool menu_materialui_icons_enable; bool menu_xmb_shadows_enable; bool menu_xmb_show_settings; bool menu_xmb_show_favorites; diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index e5466c1ae5..ee5a060882 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -3027,3 +3027,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 96c49a87db..cd4fad6170 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -3027,3 +3027,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index cfa8f0d7d9..df3745b2a7 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -3021,3 +3021,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index fe67876405..81172d1911 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2890,3 +2890,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 9516a68a0d..36af547423 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -3059,3 +3059,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 6022d9eed5..ca56c41be7 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -2531,3 +2531,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, "Mostra colonna Preferiti") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, "Mostra colonna stanze Netplay") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 8d3e2dad64..088dfba49e 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3013,3 +3013,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index e38f544fc2..e835c27307 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3022,3 +3022,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index ac9b36106a..7069e2d7f3 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1295,3 +1295,5 @@ MSG_HASH(MENU_ENUM_LABEL_GOTO_IMAGES, "goto_images") MSG_HASH(MENU_ENUM_LABEL_GOTO_VIDEO, "goto_video") +MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE, + "materialui_icons_enable") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 914e76cf7a..8fd37c1c3a 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2890,3 +2890,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 8d5899fdc2..8e4dfffdec 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -3868,3 +3868,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 516a93eab7..3a37981f9f 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -2997,3 +2997,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 78a7825202..68c7096277 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -3080,3 +3080,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 412cea3538..1354bd7150 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -3125,3 +3125,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, "Video") MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 35c41edf11..d53502697a 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -3051,3 +3051,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY, "Modify the opacity of the framebuffer.") MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES, "Favorites") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES, + "Content which you have added to 'Favorites' will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC, + "Music") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC, + "Music which has been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES, + "Image") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES, + "Images which has been previously viewed will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO, + "Video") +MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO, + "Videos which have been previously played will appear here.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + "Menu Icons") +MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, + "Enable/disable the menu icons shown at the lefthand side of the menu entries.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index c5a8996691..4054790c85 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -84,6 +84,7 @@ default_sublabel_macro(action_bind_sublabel_fps_show, MENU_ default_sublabel_macro(action_bind_sublabel_netplay_settings, MENU_ENUM_SUBLABEL_NETPLAY) default_sublabel_macro(action_bind_sublabel_user_bind_settings, MENU_ENUM_SUBLABEL_INPUT_USER_BINDS) default_sublabel_macro(action_bind_sublabel_input_hotkey_settings, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS) +default_sublabel_macro(action_bind_sublabel_materialui_icons_enable, MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE) default_sublabel_macro(action_bind_sublabel_add_content_list, MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST) default_sublabel_macro(action_bind_sublabel_video_frame_delay, MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY) default_sublabel_macro(action_bind_sublabel_video_black_frame_insertion, MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION) @@ -406,6 +407,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_materialui_icons_enable); + 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/drivers/materialui.c b/menu/drivers/materialui.c index be23e8da9f..8654d6bd99 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -2222,6 +2222,7 @@ static void mui_list_insert(void *userdata, float scale_factor; int i = (int)list_size; mui_node_t *node = NULL; + settings_t *settings = config_get_ptr(); mui_handle_t *mui = (mui_handle_t*)userdata; if (!mui || !list) @@ -2249,370 +2250,373 @@ static void mui_list_insert(void *userdata, node->switch_is_on = false; node->do_draw_text = false; - switch (type) + if (settings->bools.menu_materialui_icons_enable) { - case FILE_TYPE_DOWNLOAD_CORE: - case FILE_TYPE_CORE: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORES]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_IMAGE]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_PARENT_DIRECTORY: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_PARENT_DIRECTORY]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_PLAYLIST_COLLECTION: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_PLAYLIST]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_RDB: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_DATABASE]; - node->texture_switch2_set = true; - break; - case 32: /* TODO: Need to find out what this is */ - case FILE_TYPE_RDB_ENTRY: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SETTINGS]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_IN_CARCHIVE: - case FILE_TYPE_PLAIN: - case FILE_TYPE_DOWNLOAD_CORE_CONTENT: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_FILE]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_MUSIC: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_MUSIC]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_MOVIE: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_VIDEO]; - node->texture_switch2_set = true; - break; - case FILE_TYPE_DIRECTORY: - case FILE_TYPE_DOWNLOAD_URL: - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_FOLDER]; - node->texture_switch2_set = true; - break; - default: - if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INFORMATION_LIST)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_INFO]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_IMAGE]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_MUSIC]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_VIDEO]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SCAN]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_HISTORY]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_LIST))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_HELP]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RESTART_CONTENT))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RESTART]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RESUME_CONTENT))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RESUME]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CLOSE_CONTENT))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CLOSE]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_OPTIONS))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORE_OPTIONS]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORE_CHEAT_OPTIONS]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CONTROLS]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SHADER_OPTIONS))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SHADERS]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) - { + switch (type) + { + case FILE_TYPE_DOWNLOAD_CORE: + case FILE_TYPE_CORE: node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORES]; node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RUN))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RUN]; + break; + case FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_IMAGE]; node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ADD_TO_FAVORITES)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_FAVORITES)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_ADD_TO_FAVORITES]; + break; + case FILE_TYPE_PARENT_DIRECTORY: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_PARENT_DIRECTORY]; node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RENAME]; + break; + case FILE_TYPE_PLAYLIST_COLLECTION: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_PLAYLIST]; node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ADD_TO_MIXER)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ADD_TO_MIXER_AND_COLLECTION)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_ADD_TO_MIXER]; + break; + case FILE_TYPE_RDB: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_DATABASE]; node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_START_CORE)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RUN_MUSIC)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_START_CORE]; + break; + case 32: /* TODO: Need to find out what this is */ + case FILE_TYPE_RDB_ENTRY: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SETTINGS]; node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_STATE)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_LOAD_STATE]; + break; + case FILE_TYPE_IN_CARCHIVE: + case FILE_TYPE_PLAIN: + case FILE_TYPE_DOWNLOAD_CORE_CONTENT: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_FILE]; node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_EJECT]; + break; + case FILE_TYPE_MUSIC: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_MUSIC]; node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_IMAGE_APPEND)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_OPTIONS)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_DISK]; + break; + case FILE_TYPE_MOVIE: + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_VIDEO]; node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE)) - || - (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE))) - || - (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME))) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SAVE_STATE]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_UNDO_LOAD_STATE]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UNDO_SAVE_STATE))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_UNDO_SAVE_STATE]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_STATE_SLOT))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_STATE_SLOT]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_TAKE_SCREENSHOT))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_TAKE_SCREENSHOT]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS_LIST))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CONFIGURATIONS]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_LIST))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_LOAD_CONTENT]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DELETE_ENTRY))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_REMOVE]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_NETPLAY]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_SETTINGS))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_QUICKMENU]; - node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_ASSETS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CHEATS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_DATABASES)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_OVERLAYS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CG_SHADERS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_SLANG_SHADERS)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_UPDATER]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_DIRECTORY)) || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_FILE)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_ADD]; - node->texture_switch2_set = true; - } - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_QUIT_RETROARCH))) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_QUIT]; - node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DRIVER_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVING_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOGGING_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RECORDING_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_WIFI_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LAKKA_SERVICES)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLIST_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_USER_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DIRECTORY_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PRIVACY_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ACCOUNTS_LIST)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_REWIND_SETTINGS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST)) - || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS)) - ) - { - node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SETTINGS]; - node->texture_switch2_set = true; - } - else if ( - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES)) || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST)) - ) - { + break; + case FILE_TYPE_DIRECTORY: + case FILE_TYPE_DOWNLOAD_URL: node->texture_switch2 = mui->textures.list[MUI_TEXTURE_FOLDER]; node->texture_switch2_set = true; - } - break; + break; + default: + if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INFORMATION_LIST)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_INFO]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_IMAGE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_MUSIC]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_VIDEO]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SCAN]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_HISTORY]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_LIST))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_HELP]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RESTART_CONTENT))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RESTART]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RESUME_CONTENT))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RESUME]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CLOSE_CONTENT))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CLOSE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_OPTIONS))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORE_OPTIONS]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORE_CHEAT_OPTIONS]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CONTROLS]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SHADER_OPTIONS))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SHADERS]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CORES]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RUN))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RUN]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ADD_TO_FAVORITES)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_FAVORITES)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_ADD_TO_FAVORITES]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_RENAME]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ADD_TO_MIXER)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ADD_TO_MIXER_AND_COLLECTION)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_ADD_TO_MIXER]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_START_CORE)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RUN_MUSIC)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_START_CORE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_STATE)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_LOAD_STATE]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_EJECT]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_IMAGE_APPEND)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_OPTIONS)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_DISK]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE)) + || + (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE))) + || + (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME))) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SAVE_STATE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_UNDO_LOAD_STATE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UNDO_SAVE_STATE))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_UNDO_SAVE_STATE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_STATE_SLOT))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_STATE_SLOT]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_TAKE_SCREENSHOT))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_TAKE_SCREENSHOT]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS_LIST))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_CONFIGURATIONS]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_LIST))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_LOAD_CONTENT]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DELETE_ENTRY))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_REMOVE]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_NETPLAY]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_SETTINGS))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_QUICKMENU]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_ASSETS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CHEATS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_DATABASES)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_OVERLAYS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CG_SHADERS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_SLANG_SHADERS)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_UPDATER]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_DIRECTORY)) || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_FILE)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_ADD]; + node->texture_switch2_set = true; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_QUIT_RETROARCH))) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_QUIT]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DRIVER_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVING_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOGGING_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RECORDING_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_WIFI_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LAKKA_SERVICES)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLIST_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_USER_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DIRECTORY_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PRIVACY_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ACCOUNTS_LIST)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_REWIND_SETTINGS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST)) + || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SETTINGS]; + node->texture_switch2_set = true; + } + else if ( + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES)) || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST)) + ) + { + node->texture_switch2 = mui->textures.list[MUI_TEXTURE_FOLDER]; + node->texture_switch2_set = true; + } + break; + } } file_list_set_userdata(list, i, node); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index f27e32f935..9a29b03239 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5235,6 +5235,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME, PARSE_ONLY_UINT, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE, + PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME, PARSE_ONLY_UINT, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 4bdc55bee6..db6715c516 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5509,6 +5509,21 @@ static bool setting_append_list( /* only MaterialUI uses these values, don't show them on other drivers */ if (string_is_equal_fast(settings->arrays.menu_driver, "glui", 4)) { + CONFIG_BOOL( + list, list_info, + &settings->bools.menu_materialui_icons_enable, + MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE, + MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE, + materialui_icons_enable, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_ADVANCED); + CONFIG_UINT( list, list_info, &settings->uints.menu_materialui_color_theme, diff --git a/msg_hash.h b/msg_hash.h index 791a288c64..4aaefd0c8a 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -405,6 +405,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_OVERLAY, MENU_ENUM_LABEL_VALUE_AUTO, + MENU_LABEL(MATERIALUI_ICONS_ENABLE), + MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,