Update CHANGES.md

glui: fix entry box highlight calculation
Merge pull request #5324 from theheroGAC/patch-13
2026-11-11 23:42:58 -10:00 · 2017-08-18 02:52:46 +02:00 · 2017-08-17 20:49:21 -04:00 · 2017-08-18 02:49:32 +02:00 · 2017-08-18 02:40:17 +02:00 · 2017-08-17 21:36:48 -03:00
38 changed files with 851 additions and 447 deletions
@@ -1,4 +1,15 @@
+# 1.6.8 (future)
+
 # 1.6.7 (future)
+- SCANNER: Fix directory scanning.
+- SCANNER: Fix file scanning.
+- COMMON: Fix 'Disk Image Append' option.
+- FREEBSD: Compatibility fixes for Video4Linux2 camera driver.
+- GUI: (MaterialUI) Add disk image append icons.
+- GUI: (MaterialUI) Improve word wrapping when menu icons are enabled.
+- GUI: (MaterialUI) Add User Interface -> Appearance -> Menu Icons Enable. You can turn on/off the icons on the lefthand side of the menu entries.
+- GUI: Performance optimizations for XMB menu driver - only calculates visible items.
+- LOCALIZATION: Update Italian translation.

 # 1.6.6 (future)
 - 3DS: Fixes serious performance regression that affected every core; rewind was always implicitly enabled.
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "1.6.6.0"
+RARCH_VERSION		= "1.6.7.0"

 DEBUG = 0

@@ -1,4 +1,4 @@
-RARCH_VERSION		= "1.6.6.0"
+RARCH_VERSION		= "1.6.7.0"

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "1.6.6.0"
+RARCH_VERSION		= "1.6.7.0"

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "1.6.6.0"
+RARCH_VERSION		= "1.6.7.0"

 DEBUG			= 0
 HAVE_LOGGER		= 0
@@ -16,7 +16,9 @@
 */

 #include <stdio.h>
+#if !defined(__FreeBSD__) || __FreeBSD__ < 5
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include <stddef.h>
@@ -28,7 +30,9 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>

+#ifndef __FreeBSD__
 #include <asm/types.h>
+#endif
 #include <linux/videodev2.h>

 #include <memmap.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;

@@ -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);
@@ -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;
@@ -1,6 +1,6 @@
 #!/bin/sh

-RARCH_VERSION=1.6.5
+RARCH_VERSION=1.6.7
 PLATFORM=$1
 SALAMANDER=no
 MAKEFILE_GRIFFIN=no
@@ -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.")
@@ -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.")
@@ -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.")
@@ -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.")
@@ -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.")
@@ -313,9 +313,9 @@ MSG_HASH(
      "Cheat File"
      )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD,
-      "Carica i trucchi")
+      "Carica cheat/trucchi")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,
-      "Salva i trucchi come")
+      "Salva cheat/trucchi")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES,
      "Trucchi usati")
 MSG_HASH(
@@ -400,7 +400,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS,
      "Estensioni supportate")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER,
-      "Produttore del sitema")
+      "Produttore del sistema")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME,
      "Nome del sistema")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS,
@@ -480,8 +480,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY,
      "Directory degli sfondi dinamici")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
-      /* FIXME? Translate 'Enable Achievements' */
-      "Attivare")
+      "Attivare Achievements")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
      "Colore evidenziato delle voci dei menù")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
@@ -633,59 +632,59 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,
      "Cheat index +")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
-      "Cheat toggle")
+      "Pulsante trucchi/cheat")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
-      "Toggle espulsione disco")
+      "Pulsante espulsione disco")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
-      "Disk next")
+      "Disco successivo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
-      "Disk prev")
+      "Disco precedente")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
      "Abilitare hotkeys")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,
-      "Tenere premuto in avanti")
+      "Pulsante per tenere premuto in avanti ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,
-      "Toggle per andare avanti veloce")
+      "Pulsante per andare avanti veloce")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
      "Frame avanzato")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
-      "Toggle per lo shermo intero")
+      "Pulsante per lo shermo intero")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
-      "Toggle per il tocco del mouse")
+      "Pulsante per il tocco del mouse")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
-      "Game focus toggle")
+      "Pulsante di messa a fuoco del gioco")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
      "Carica stato")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
-      "Toggle per il menu")
+      "Pulsante per il menu")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,
-      "Toggle per la registrazione del film")
+      "Pulsante per la registrazione del film")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
-      "Toggle per l' audio in modalità muto")
+      "Pulsante per l'audio in modalità silenziosa")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,
      "Netplay flip users")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,
-      "Netplay toggle play/spectate mode")
+      "Pulsante Netplay per la modalità giocatore/spettatore")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
-      "Toggle per la tastiera su schermo")
+      "Pulsante per la tastiera su schermo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,
-      "Overlay next")
+      "Overlay successivo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,
-      "Pause toggle")
+      "Pulsante Pausa")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
-      "Esci da RetroArch")
+      "Pulsante per uscire da RetroArch")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
      "Resetta il gioco")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
-      "Riavvolgi")
+      "Pulsante per il riavvolgimento")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
      "Salva stato")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
      "Effettua screenshot")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
-      "Next shader")
+      "Shader successivo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,
-      "Previous shader")
+      "Shader precedente")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,
      "Slow motion")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
@@ -696,10 +695,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
      "Volume -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
      "Volume +")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
-      "Mostra Overlay")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
-      "Nascondi overlay nel menù")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR,
      "Tipo di ritardo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY,
@@ -709,7 +704,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,
      "Normale")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH,
-      "Prefer Front Touch")
+      "Preferire il tocco frontale")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY,
      "Directory per la rimappatura dei dispositivi di input")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
@@ -951,7 +946,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
      "Overlay sullo schermo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS,
-      "Onscreen Notifications")
+      "Notifiche sullo schermo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
      "Apri archivio come cartella") /* TODO/FIXME */
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
@@ -1097,11 +1092,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RETROPAD_WITH_ANALOG,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
      "Achievements")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_ENABLE,
-      "Abilita riavvolgi")
+      "Abilita riavvolgimento")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
      "Livello della funzione riavvolgi")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS,
-      "Impostazioni della funzione di riavvolgimento")
+      "Riavvolgimento")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY,
      "Directory di selezione file")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY,
@@ -1156,6 +1151,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS,
      "Settaggi")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB,
      "Impostazioni")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES_TAB,
+      "Preferiti") 
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER,
      "Shader")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
@@ -1583,7 +1580,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY,
      "Mostra colonna cronologia")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD,
-      "Display Import content Tab")
+      "Mostra colonna scansione/aggiungi directory")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES,
      "Mostra colonna immagini")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC,
@@ -1703,15 +1700,15 @@ MSG_HASH(MSG_APPENDED_DISK,
 MSG_HASH(MSG_APPLICATION_DIR,
      "Directory app")
 MSG_HASH(MSG_APPLYING_CHEAT,
-      "Applying cheat changes.")
+      "Applicazione dei trucchi/cheat in corso")
 MSG_HASH(MSG_APPLYING_SHADER,
-      "Applying shader")
+      "Applicazione dello shader in corso")
 MSG_HASH(MSG_AUDIO_MUTED,
      "MUTO.")
 MSG_HASH(MSG_AUDIO_UNMUTED,
      "MUTO Disattivato.")
 MSG_HASH(MSG_AUTOCONFIG_FILE_ERROR_SAVING,
-      "Error saving autoconf file.")
+      "Errore durante il salvataggio del file autoconf.")
 MSG_HASH(MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY,
      "Il file Autoconfig è stato salvato correttamente.")
 MSG_HASH(MSG_AUTOSAVE_FAILED,
@@ -1749,7 +1746,7 @@ MSG_HASH(MSG_COULD_NOT_FIND_ANY_NEXT_DRIVER,
 MSG_HASH(MSG_COULD_NOT_FIND_COMPATIBLE_SYSTEM,
      "Impossibile trovare un sistema compatibile.")
 MSG_HASH(MSG_COULD_NOT_FIND_VALID_DATA_TRACK,
-      "Could not find valid data track")
+      "Impossibile trovare una traccia di dati valida")
 MSG_HASH(MSG_COULD_NOT_OPEN_DATA_TRACK,
      "could not open data track")
 MSG_HASH(MSG_COULD_NOT_READ_CONTENT_FILE,
@@ -1759,7 +1756,7 @@ MSG_HASH(MSG_COULD_NOT_READ_MOVIE_HEADER,
 MSG_HASH(MSG_COULD_NOT_READ_STATE_FROM_MOVIE,
      "Could not read state from movie.")
 MSG_HASH(MSG_CRC32_CHECKSUM_MISMATCH,
-      "CRC32 checksum mismatch between content file and saved content checksum in replay file header) replay highly likely to desync on playback.")
+      "La mancata corrispondenza del checksum CRC32 tra il file di contenuto e il checksum del contenuto salvato nell'intestazione del file di replay, riproduce molto probabilmente il desync sulla riproduzione.")
 MSG_HASH(MSG_CUSTOM_TIMING_GIVEN,
      "Custom timing given")
 MSG_HASH(MSG_DECOMPRESSION_ALREADY_IN_PROGRESS,
@@ -1809,15 +1806,15 @@ MSG_HASH(MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR,
 MSG_HASH(MSG_FAILED_TO_ALLOCATE_MEMORY_FOR_PATCHED_CONTENT,
      "Failed to allocate memory for patched content...")
 MSG_HASH(MSG_FAILED_TO_APPLY_SHADER,
-      "Failed to apply shader.")
+      "Impossibile applicare lo shader.")
 MSG_HASH(MSG_FAILED_TO_BIND_SOCKET,
      "Failed to bind socket.")
 MSG_HASH(MSG_FAILED_TO_CREATE_THE_DIRECTORY,
-      "Failed to create the directory.")
+      "Impossibile creare la directory.")
 MSG_HASH(MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE,
-      "Failed to extract content from compressed file")
+      "Impossibile estrarre il contenuto dal file compresso")
 MSG_HASH(MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT,
-      "Failed to get nickname from client.")
+      "Impossibile ottenere il nickname dal client.")
 MSG_HASH(MSG_FAILED_TO_LOAD,
      "Caricamento fallito")
 MSG_HASH(MSG_FAILED_TO_LOAD_CONTENT,
@@ -1847,7 +1844,7 @@ MSG_HASH(MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY,
 MSG_HASH(MSG_FAILED_TO_REMOVE_TEMPORARY_FILE,
      "Impossibile rimuovere il file temporaneo")
 MSG_HASH(MSG_FAILED_TO_SAVE_SRAM,
-      "Failed to save SRAM")
+      "Impossibile salvare la SRAM")
 MSG_HASH(MSG_FAILED_TO_SAVE_STATE_TO,
      "Failed to save state to")
 MSG_HASH(MSG_FAILED_TO_SEND_NICKNAME,
@@ -1869,11 +1866,11 @@ MSG_HASH(MSG_FAILED_TO_START_RECORDING,
 MSG_HASH(MSG_FAILED_TO_TAKE_SCREENSHOT,
      "Impossibile eseguire lo screenshot.")
 MSG_HASH(MSG_FAILED_TO_UNDO_LOAD_STATE,
-      "Failed to undo load state.")
+      "Impossibile annullare il carica stato.")
 MSG_HASH(MSG_FAILED_TO_UNDO_SAVE_STATE,
-      "Failed to undo save state.")
+      "Impossibile annullare il salva stato.")
 MSG_HASH(MSG_FAILED_TO_UNMUTE_AUDIO,
-      "Failed to unmute audio.")
+      "Impossibile attivare l'audio.")
 MSG_HASH(MSG_FATAL_ERROR_RECEIVED_IN,
      "Errore irreversibile ricevuto su")
 MSG_HASH(MSG_FILE_NOT_FOUND,
@@ -1887,7 +1884,7 @@ MSG_HASH(MSG_FOUND_FIRST_DATA_TRACK_ON_FILE,
 MSG_HASH(MSG_FOUND_LAST_STATE_SLOT,
      "Found last state slot")
 MSG_HASH(MSG_FOUND_SHADER,
-      "Found shader")
+      "Trovato shader")
 MSG_HASH(MSG_FRAMES,
      "Frames")
 MSG_HASH(MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT,
@@ -1911,7 +1908,7 @@ MSG_HASH(MSG_INPUT_CHEAT_FILENAME,
 MSG_HASH(MSG_INPUT_PRESET_FILENAME,
      "Preset Filename")
 MSG_HASH(MSG_INPUT_RENAME_ENTRY,
-      "Rename Title")
+      "Rinomina Titolo")
 MSG_HASH(MSG_INTERFACE,
      "Interfaccia")
 MSG_HASH(MSG_INTERNAL_STORAGE,
@@ -1953,7 +1950,7 @@ MSG_HASH(MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION,
 MSG_HASH(MSG_MOVIE_PLAYBACK_ENDED,
      "Movie playback ended.")
 MSG_HASH(MSG_MOVIE_RECORD_STOPPED,
-      "Stopping movie record.")
+      "Arresto della registrazione del filmato.")
 MSG_HASH(MSG_NETPLAY_FAILED,
      "Failed to initialize netplay.")
 MSG_HASH(MSG_NO_CONTENT_STARTING_DUMMY_CORE,
@@ -1987,11 +1984,11 @@ MSG_HASH(MSG_REDIRECTING_SAVESTATE_TO,
 MSG_HASH(MSG_REMAP_FILE_SAVED_SUCCESSFULLY,
      "Remap file saved successfully.")
 MSG_HASH(MSG_REMOVED_DISK_FROM_TRAY,
-      "Removed disk from tray.")
+      "Rimosso il disco dal vassoio.")
 MSG_HASH(MSG_REMOVING_TEMPORARY_CONTENT_FILE,
      "Removing temporary content file")
 MSG_HASH(MSG_RESET,
-      "Reset")
+      "Resetta")
 MSG_HASH(MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT,
      "Restarting recording due to driver reinit.")
 MSG_HASH(MSG_RESTORED_OLD_SAVE_STATE,
@@ -2248,7 +2245,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS,
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS,
      "Utilizzare gli stessi controlli sia per il menu che per il gioco. Si applica alla tastiera.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_ENABLE,
-      "Show onscreen messages.")
+      "Mostra i messaggi sullo schermo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE,
      "User %d Remote Enable")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_BATTERY_LEVEL_ENABLE,
@@ -2444,7 +2441,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH,
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT,
      "Imposta le dimensioni dell'altezza personalizzata per la finestra del display. Lasciando il valore a 0 tenterà di scalare la finestra il più grande possibile.")   
 MSG_HASH(MENU_ENUM_SUBLABEL_SLOWMOTION_RATIO,
-      "Quando in slow motion, il contenuto rallenterà il fattore specificato / impostato.") 
+      "In slow motion, il contenuto rallenterà il fattore specificato / impostato.") 
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_GPU_RECORD,
      "Registra l'output GPU del materiale ombreggiato se disponibile.")   
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_POST_FILTER_RECORD,
@@ -2495,5 +2492,61 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CORE_INPUT_REMAPPING_OPTIONS,
      "Modifica i controlli per il contenuto attualmente in esecuzione.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_OPTIONS,
      "Modifica le opzioni per il contenuto attualmente in esecuzione.")   
- MSG_HASH(MENU_ENUM_SUBLABEL_RESTART_CONTENT,
+MSG_HASH(MENU_ENUM_SUBLABEL_RESTART_CONTENT,
      "Riavvia il contenuto dall'inizio.") 
+MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE,
+      "Se viene caricato un salvataggio, il contenuto tornerà allo stato iniziale prima del caricamento.")
+MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE,
+      "Se un salvataggio è stato sovrascritto, si ritorna allo stato del salvataggio precedente.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CORE_CHEAT_OPTIONS,
+      "Imposta i trucchi/cheat.")  
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEAT_APPLY_CHANGES,
+      "Le modifiche dei trucchi/cheat avranno effetto immediato.")   
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEAT_FILE_LOAD,
+      "Carica un file dei trucchi/cheat.")  
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEAT_FILE_SAVE_AS,
+      "Salva i trucchi correnti come file di salvataggio.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEAT_NUM_PASSES,
+      "Aumenta o diminuisce la quantità di trucchi/cheat.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SHADER_OPTIONS,
+      "Imposta gli shader per aumentare visivamente l'immagine.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_PATH,
+      "Seleziona un altro tipo di carattere per le notifiche sullo schermo.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_SIZE,
+      "Specifica la dimensione del carattere nei punti.")   
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X,
+      "Specifica la posizione personalizzata dell'asse X per il testo sullo schermo.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y,
+      "Specifica la posizione personalizzata dell'asse Y per il testo sullo schermo.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
+      "Visualizza Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
+      "Nascondi Overlay nel menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS,
+      "Visualizza input nell'Overlay")
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS,
+      "Mostra gli input della tastiera/controller sull'overlay tramite lo schermo.")
+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,
+      "Icone del Menu")
+MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE,
+      "Abilita/disabilita le icone del menu visualizzate sul lato sinistro di ogni voce.")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_ENUM_THROTTLE_FRAMERATE,
+      "Assicurarsi che il framerate sia limitato all'interno del menu")   
+MSG_HASH(MENU_ENUM_SUBLABEL_MOUSE_ENABLE,
+      "Attiva i comandi del mouse all'interno del menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_POINTER_ENABLE,
+      "Attiva i comandi touch all'interno del menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_THUMBNAILS,
+      "Tipo di miniatura da visualizzare.")
+MSG_HASH(MENU_ENUM_SUBLABEL_TIMEDATE_ENABLE,
+      "Mostra la data e/o l'ora attuale nel menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE,
+      "Mostra il livello di carica della batteria all'interno del menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN,
+      "Mostra la schermata di avvio nel menu. Questo viene automaticamente impostato su off dopo l'avvio del programma per la prima volta.")   
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_DELETE,
+      "Cancella core")
@@ -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.")
@@ -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.")
@@ -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")
@@ -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.")
@@ -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.")
@@ -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.")
@@ -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.")
@@ -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.")
@@ -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.")
@@ -370,6 +370,7 @@ int generic_action_ok_displaylist_push(const char *path,
         break;
      case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST:
         filebrowser_clear_type();
+         filebrowser_set_type(FILEBROWSER_APPEND_IMAGE);
         info.type          = type;
         info.directory_ptr = idx;
         info_path          = settings->paths.directory_menu_content;
@@ -979,8 +980,10 @@ static bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info
      core_info_get_current_core((core_info_t**)&info);
      if (info)
      {
+#if 0
         RARCH_LOG("[lobby] use the current core (%s) to load this content...\n",
               info->path);
+#endif
         supported = 1;
      }
   }
@@ -2125,7 +2128,6 @@ static int generic_action_ok_remap_file_operation(const char *path,
   }
   else
   {
-      RARCH_LOG("removing %s", file);
      if(input_remapping_remove_file(file))
      {
         if (action_type == ACTION_OK_REMAP_FILE_REMOVE_CORE)
@@ -3326,10 +3328,12 @@ static int action_ok_netplay_connect_room(const char *path,
         netplay_room_list[idx - 3].port);
   }

+#if 0
   RARCH_LOG("[lobby] connecting to: %s with game: %s/%08x\n",
         tmp_hostname,
         netplay_room_list[idx - 3].gamename,
         netplay_room_list[idx - 3].gamecrc);
+#endif

   task_push_netplay_crc_scan(netplay_room_list[idx - 3].gamecrc,
      netplay_room_list[idx - 3].gamename,
@@ -3406,8 +3410,11 @@ static int action_ok_push_content_list(const char *path,
 static int action_ok_push_scan_file(const char *path,
      const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   filebrowser_clear_type();
-   return action_ok_push_content_list(path, label, type, idx, entry_idx);
+   settings_t            *settings   = config_get_ptr();
+   filebrowser_set_type(FILEBROWSER_SCAN_FILE);
+   return generic_action_ok_displaylist_push(path,
+         settings->paths.directory_menu_content, label, type, idx,
+         entry_idx, ACTION_OK_DL_CONTENT_LIST);
 }

 #ifdef HAVE_NETWORKING
@@ -3463,8 +3470,6 @@ void netplay_refresh_rooms_menu(file_list_t *list)

   if (netplay_room_count != 0)
   {
-      RARCH_LOG ("[lobby] found %d rooms...\n", netplay_room_count);
-
      for (i = 0; i < netplay_room_count; i++)
      {
         char country[PATH_MAX_LENGTH] = {0};
@@ -3545,7 +3550,6 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha
      if (string_is_empty(data->data))
      {
         netplay_room_count = 0;
-         RARCH_LOG("[lobby] room list empty\n");
      }
      else
      {
@@ -4743,19 +4747,23 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
            BIND_ACTION_OK(cbs, action_ok_directory_push);
            break;
         case FILE_TYPE_CARCHIVE:
-            switch (menu_label_hash)
+            if (filebrowser_get_type() == FILEBROWSER_SCAN_FILE)
            {
-               case MENU_LABEL_FAVORITES:
-                  BIND_ACTION_OK(cbs, action_ok_compressed_archive_push_detect_core);
-                  break;
-               case MENU_LABEL_SCAN_FILE:
 #ifdef HAVE_LIBRETRODB
-                  BIND_ACTION_OK(cbs, action_ok_scan_file);
+               BIND_ACTION_OK(cbs, action_ok_scan_file);
 #endif
-                  break;
-               default:
-                  BIND_ACTION_OK(cbs, action_ok_compressed_archive_push);
-                  break;
+            }
+            else
+            {
+               switch (menu_label_hash)
+               {
+                  case MENU_LABEL_FAVORITES:
+                     BIND_ACTION_OK(cbs, action_ok_compressed_archive_push_detect_core);
+                     break;
+                  default:
+                     BIND_ACTION_OK(cbs, action_ok_compressed_archive_push);
+                     break;
+               }
            }
            break;
         case FILE_TYPE_CORE:
@@ -4853,15 +4861,16 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
            break;
         case FILE_TYPE_IN_CARCHIVE:
         case FILE_TYPE_PLAIN:
-            if (cbs->enum_idx != MSG_UNKNOWN)
+            if (filebrowser_get_type() == FILEBROWSER_SCAN_FILE)
+            {
+#ifdef HAVE_LIBRETRODB
+               BIND_ACTION_OK(cbs, action_ok_scan_file);
+#endif
+            }
+            else if (cbs->enum_idx != MSG_UNKNOWN)
            {
               switch (cbs->enum_idx)
               {
-#ifdef HAVE_LIBRETRODB
-                  case MENU_ENUM_LABEL_SCAN_FILE:
-                     BIND_ACTION_OK(cbs, action_ok_scan_file);
-                     break;
-#endif
                  case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST:
                  case MENU_ENUM_LABEL_FAVORITES:
                  case MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE:
@@ -4872,13 +4881,15 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
                     }
                     else
 #endif
+                     if (filebrowser_get_type() == FILEBROWSER_APPEND_IMAGE)
+                     {
+                        BIND_ACTION_OK(cbs, action_ok_disk_image_append);
+                     }
+                     else
                     {
                        BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core);
                     }
                     break;
-                  case MENU_ENUM_LABEL_DISK_IMAGE_APPEND:
-                     BIND_ACTION_OK(cbs, action_ok_disk_image_append);
-                     break;
                  default:
                     BIND_ACTION_OK(cbs, action_ok_file_load);
                     break;
@@ -4888,11 +4899,6 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
            {
               switch (menu_label_hash)
               {
-#ifdef HAVE_LIBRETRODB
-                  case MENU_LABEL_SCAN_FILE:
-                     BIND_ACTION_OK(cbs, action_ok_scan_file);
-                     break;
-#endif
                  case MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST:
                  case MENU_LABEL_FAVORITES:
                  case MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE:
@@ -4903,13 +4909,15 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
                     }
                     else
 #endif
+                     if (filebrowser_get_type() == FILEBROWSER_APPEND_IMAGE)
+                     {
+                        BIND_ACTION_OK(cbs, action_ok_disk_image_append);
+                     }
+                     else
                     {
                        BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core);
                     }
                     break;
-                  case MENU_LABEL_DISK_IMAGE_APPEND:
-                     BIND_ACTION_OK(cbs, action_ok_disk_image_append);
-                     break;
                  default:
                     BIND_ACTION_OK(cbs, action_ok_file_load);
                     break;
@@ -59,8 +59,7 @@ int action_scan_file(const char *path,

   menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);

-   if (path)
-      fill_pathname_join(fullpath, menu_path, path, sizeof(fullpath));
+   fill_pathname_join(fullpath, menu_path, path, sizeof(fullpath));

   task_push_dbscan(
         settings->paths.directory_playlist,
@@ -83,8 +82,10 @@ int action_scan_directory(const char *path,

   menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);

+   strlcpy(fullpath, menu_path, sizeof(fullpath));
+
   if (path)
-      fill_pathname_join(fullpath, menu_path, path, sizeof(fullpath));
+      fill_pathname_join(fullpath, fullpath, path, sizeof(fullpath));

   task_push_dbscan(
         settings->paths.directory_playlist,
@@ -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;
@@ -124,6 +124,8 @@ enum
   MUI_TEXTURE_TAKE_SCREENSHOT,
   MUI_TEXTURE_CONFIGURATIONS,
   MUI_TEXTURE_LOAD_CONTENT,
+   MUI_TEXTURE_DISK,
+   MUI_TEXTURE_EJECT,
   MUI_TEXTURE_LAST
 };

@@ -294,6 +296,10 @@ static const char *mui_texture_path(unsigned id)
         return "load_state.png";
      case MUI_TEXTURE_SAVE_STATE:
         return "save_state.png";
+      case MUI_TEXTURE_DISK:
+         return "disk.png";
+      case MUI_TEXTURE_EJECT:
+         return "eject.png";
      case MUI_TEXTURE_UNDO_LOAD_STATE:
         return "undo_load_state.png";
      case MUI_TEXTURE_UNDO_SAVE_STATE:
@@ -702,6 +708,7 @@ static void mui_compute_entries_box(mui_handle_t* mui, int width)
   float sum           = 0;
   size_t entries_end  = menu_entries_get_end();
   float scale_factor  = menu_display_get_dpi();
+   uintptr_t texture_switch2 = 0;

   for (i = 0; i < entries_end; i++)
   {
@@ -712,9 +719,15 @@ static void mui_compute_entries_box(mui_handle_t* mui, int width)

      sublabel_str[0]  = '\0';

+      /* set texture_switch2 */
+      if (node->texture_switch2_set)
+         texture_switch2 = node->texture_switch2;
+
      if (menu_entry_get_sublabel(i, sublabel_str, sizeof(sublabel_str)))
      {
-         word_wrap(sublabel_str, sublabel_str, (int)(usable_width / mui->glyph_width2), false);
+         int icon_margin = texture_switch2 ? mui->icon_size : 0;
+
+         word_wrap(sublabel_str, sublabel_str, (int)((usable_width - icon_margin) / mui->glyph_width2), false);
         lines = mui_count_lines(sublabel_str);
      }

@@ -934,7 +947,9 @@ static void mui_render_label_value(mui_handle_t *mui, mui_node_t *node,
   /* Sublabel */
   if (menu_entry_get_sublabel(i, sublabel_str, sizeof(sublabel_str)))
   {
-      word_wrap(sublabel_str, sublabel_str, (int)(usable_width / mui->glyph_width2), false);
+      int icon_margin = texture_switch2 ? mui->icon_size : 0;
+
+      word_wrap(sublabel_str, sublabel_str, (int)((usable_width - icon_margin) / mui->glyph_width2), false);

      menu_display_draw_text(mui->font2, sublabel_str,
            mui->margin + (texture_switch2 ? mui->icon_size : 0),
@@ -2214,6 +2229,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)
@@ -2241,354 +2257,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_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];
+            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_UNDO_LOAD_STATE)))
-         {
-            node->texture_switch2     = mui->textures.list[MUI_TEXTURE_UNDO_LOAD_STATE];
+            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_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);
@@ -555,7 +555,7 @@ static void *xmb_list_get_entry(void *data, enum menu_list_type type, unsigned i
   return NULL;
 }

-static INLINE float xmb_item_y(xmb_handle_t *xmb, int i, size_t current)
+static INLINE float xmb_item_y(const xmb_handle_t *xmb, int i, size_t current)
 {
   float iy = xmb->icon.spacing.vertical;

@@ -2195,6 +2195,35 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
   return xmb->textures.list[XMB_TEXTURE_SUBSETTING];
 }

+static void xmb_calculate_visible_range(const xmb_handle_t *xmb, unsigned height, size_t list_size, unsigned current, unsigned *first, unsigned *last)
+{
+   unsigned j;
+   float    base_y = xmb->margins.screen.top;
+
+   if (current)
+   {
+      for (j = current; j-- > 0; )
+      {
+         float bottom = xmb_item_y(xmb, j, current) + base_y + xmb->icon.size;
+
+         if (bottom < 0)
+            break;
+
+         *first = j;
+      }
+   }
+
+   for (j = current+1; j < list_size; j++)
+   {
+      float top = xmb_item_y(xmb, j, current) + base_y;
+
+      if (top > height)
+         break;
+
+      *last = j;
+   }
+}
+
 static void xmb_draw_items(
      video_frame_info_t *video_info,
      menu_display_frame_info_t menu_disp_info,
@@ -2210,6 +2239,7 @@ static void xmb_draw_items(
   size_t end                  = 0;
   uint64_t frame_count        = xmb->frame_count;
   const char *thumb_ident     = xmb_thumbnails_ident();
+   unsigned first, last;

   if (!list || !list->size)
      return;
@@ -2234,9 +2264,14 @@ static void xmb_draw_items(
   if (list == xmb->selection_buf_old)
      i = 0;

+   first = i;
+   last  = end - 1;
+
+   xmb_calculate_visible_range(xmb, height, end, current, &first, &last);
+
   menu_display_blend_begin();

-   for (; i < end; i++)
+   for (i = first; i <= last; i++)
   {
      float icon_x, icon_y, label_offset;
      menu_animation_ctx_ticker_t ticker;
@@ -2269,12 +2304,6 @@ static void xmb_draw_items(

      icon_y = xmb->margins.screen.top + node->y + half_size;

-      if (icon_y < half_size)
-         continue;
-
-      if (icon_y > height + xmb->icon.size)
-         break;
-
      icon_x = node->x + xmb->margins.screen.left +
         xmb->icon.spacing.horizontal - half_size;

@@ -2488,8 +2517,15 @@ static void xmb_render(void *data, bool is_idle)
      int16_t pointer_y = menu_input_pointer_state(MENU_POINTER_Y_AXIS);
      int16_t mouse_y   = menu_input_mouse_state(MENU_MOUSE_Y_AXIS)
         + (xmb->cursor.size/2);
+      unsigned first = 0, last = end;
+      unsigned height;

-      for (i = 0; i < end; i++)
+      video_driver_get_size(NULL, &height);
+
+      if (height)
+         xmb_calculate_visible_range(xmb, height, end, selection, &first, &last);
+
+      for (i = first; i <= last; i++)
      {
         float item_y1     = xmb->margins.screen.top
            + xmb_item_y(xmb, (int)i, selection);
@@ -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);
@@ -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,
@@ -28,7 +28,9 @@ enum filebrowser_enums
 {
   FILEBROWSER_NONE              = 0,
   FILEBROWSER_SELECT_DIR,
+   FILEBROWSER_APPEND_IMAGE,
   FILEBROWSER_SCAN_DIR,
+   FILEBROWSER_SCAN_FILE,
   FILEBROWSER_SELECT_FILE,
   FILEBROWSER_SELECT_IMAGE,
   FILEBROWSER_SELECT_FONT,
@@ -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,
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.retroarch"
-    android:versionCode="60"
-    android:versionName="1.6.6"
+    android:versionCode="61"
+    android:versionName="1.6.7"
    android:installLocation="internalOnly">
    <uses-feature android:glEsVersion="0x00020000" />
    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
@@ -2,7 +2,7 @@
 <app version="1">
  <name>RetroArch</name>
  <coder>Libretro</coder>
-  <version>1.6.6</version>
+  <version>1.6.7</version>
  <release_date>2012-2017</release_date>
  <short_description>The cross-platform entertainment system</short_description> 
  <long_description>A port of RetroArch to the GameCube/Wii.</long_description> 
@@ -2,7 +2,7 @@
 <app version="1">
  <name>Retroarch</name>
  <coder>Libretro</coder>
-  <version>1.66</version>
+  <version>1.67</version>
  <release_date>20170108133000</release_date>
  <short_description></short_description>
  <long_description>RetroArch
@@ -18,7 +18,7 @@
 #define RARCH_VERSION_H__

 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "1.6.6"
+#define PACKAGE_VERSION "1.6.7"
 #endif

 #endif
Author	SHA1	Message	Date
twinaphex	8e8bdaaab3	Update CHANGES.md	2017-08-18 02:52:46 +02:00
Brad Parker	6c91c39aae	glui: fix entry box highlight calculation	2017-08-17 20:49:21 -04:00
Twinaphex	59aaabb9bf	Merge pull request #5324 from theheroGAC/patch-13 Updated the MATERIALUI translation	2017-08-18 02:49:32 +02:00
Twinaphex	456e1b033f	Merge pull request #5326 from heuripedes/xmb-improv Xmb improvements	2017-08-18 02:40:17 +02:00
Higor Eurípedes	0d59994c42	(xmb) Only iterate over visible items in xmb_render()	2017-08-17 21:36:48 -03:00
Higor Eurípedes	ea9991f749	(xmb) Detect non-visible items before drawing	2017-08-17 21:36:48 -03:00
Brad Parker	139d95c563	FreeBSD buildfix	2017-08-17 20:28:47 -04:00
theheroGAC	87b4576e78	Update msg_hash_it.h	2017-08-18 02:13:28 +02:00
theheroGAC	e70c15e641	Updated the MATERIALUI translation	2017-08-17 23:57:52 +02:00
twinaphex	73e00e021a	Bump up version to 1.6.7	2017-08-17 21:09:42 +02:00
twinaphex	b4912db587	Update CHANGES.md	2017-08-17 21:07:16 +02:00
twinaphex	6fc48a39d9	(MaterialUI) Add Menu Icons Enable setting	2017-08-17 21:05:38 +02:00
twinaphex	6d3292945e	Update CHANGES.md	2017-08-17 20:04:17 +02:00
Brad Parker	9242cdeda9	glui: subtract icon size from word wrap width if one is used	2017-08-17 14:02:41 -04:00
twinaphex	7a402b97ec	Italian language build fixes	2017-08-17 20:01:34 +02:00
Twinaphex	d4ffc6801f	Merge pull request #5321 from theheroGAC/patch-12 Fixed translation errors	2017-08-17 20:00:16 +02:00
theheroGAC	dff78cf0cc	Fixed translation errors	2017-08-17 19:57:00 +02:00
twinaphex	4e37b784d2	Update CHANGES.md	2017-08-17 19:27:59 +02:00
twinaphex	828f4aa8b9	(materialUI) Add disk image append icons	2017-08-17 19:24:23 +02:00
twinaphex	6952d6bd12	Update CHANGES.md	2017-08-17 19:10:23 +02:00
twinaphex	366c73f429	Fix 'Append Disk Image'	2017-08-17 19:07:38 +02:00
twinaphex	5909d72a09	Fix 'Scan File'	2017-08-17 18:53:55 +02:00
Twinaphex	8e2689fca2	Merge pull request #5318 from theheroGAC/patch-11 Updated translation of some strings and tabs	2017-08-17 18:17:39 +02:00
twinaphex	33a2d58891	Fix 'Scan Directory'	2017-08-17 18:16:33 +02:00
theheroGAC	04b8f0584e	Update msg_hash_it.h	2017-08-17 10:55:20 +02:00
theheroGAC	4af569fbcc	Updated translation of some strings and tabs	2017-08-17 10:18:13 +02:00