XMB add an option to show desktop ui aka WIMP

CHANGES.md

@@ -21,6 +21,8 @@
 - MENU/QT/WIMP: Initial grid view.
 - MENU/QT/WIMP: Drag&drop to add new playlist items, add option to add/edit/delete playlists.
 - MENU/QT/WIMP: Add menu option to update RetroArch (Windows only for now).
+- MENU/XMB: Add new icons for the settings
+- MENU/XMB: Add an option to show the desktop ui
 - METAL: Initial work-in-progress video driver for Metal. macOS-only right now, and currently requires macOS 10.13.
 - METAL: Supports XMB/MaterialUI, has a menu display driver. Has a font rendering driver.
 - METAL/SLANG: Slang shaders should be compatible with Metal video driver.

intl/msg_hash_es.h

@@ -6417,6 +6417,10 @@ MSG_HASH(
 	"<li>reiniciar RetroArch si actualizaste algo con el \"Actualizador en línea\"</li></ul>\n"
 	"Por último, el contenido debe coincidir las bases de datos existente de <a href=\"https://docs.libretro.com/guides/roms-playlists-thumbnails/#sources\">aquí</a>. Si aún no funciona, considere <a href=\"https://www.github.com/libretro/RetroArch/issues\">enviar un reporte de error.</a>"
 	)
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
+      "Mostrar intefaz de escritorio"
+      )
 #endif
 MSG_HASH(
 	MENU_ENUM_LABEL_VALUE_QT_DONT_SHOW_AGAIN,

intl/msg_hash_us.h

@@ -3839,6 +3839,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_SCAN_FINISHED,
       "<li>have \"Databases\" updated via Online Updater</li>\n"
       "<li>restart RetroArch if any of the above was just done</li></ul>\n"
       "Finally, the content must match existing databases from <a href=\"https://docs.libretro.com/guides/roms-playlists-thumbnails/#sources\">here</a>. If it is still not working, consider <a href=\"https://www.github.com/libretro/RetroArch/issues\">submitting a bug report</a>.")
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
+      "Show Desktop UI"
+      )
 #endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_DONT_SHOW_AGAIN,
       "Don't show this again")

menu/cbs/menu_cbs_ok.c

@@ -88,6 +88,9 @@ enum
    ACTION_OK_SET_PATH_VIDEO_FILTER,
    ACTION_OK_SET_PATH_OVERLAY,
    ACTION_OK_SET_DIRECTORY,
+#ifdef HAVE_QT
+   ACTION_OK_SHOW_WIMP,
+#endif
    ACTION_OK_LOAD_CHEAT_FILE_APPEND
 };
 
@@ -3167,7 +3170,6 @@ static void cb_generic_dir_download(void *task_data,
       void *user_data, const char *err)
 {
    file_transfer_t     *transf      = (file_transfer_t*)user_data;
-
    if (transf)
    {
       generic_action_ok_network(transf->path, transf->path, 0, 0, 0,
@@ -3521,15 +3523,17 @@ int (func_name)(const char *path, const char *label, unsigned type, size_t idx,
    return generic_action_ok_command(cmd); \
 }
 
-default_action_ok_cmd_func(action_ok_cheat_apply_changes,CMD_EVENT_CHEATS_APPLY)
-default_action_ok_cmd_func(action_ok_quit,               CMD_EVENT_QUIT)
-default_action_ok_cmd_func(action_ok_save_new_config,    CMD_EVENT_MENU_SAVE_CONFIG)
-default_action_ok_cmd_func(action_ok_resume_content,     CMD_EVENT_RESUME)
-default_action_ok_cmd_func(action_ok_restart_content,    CMD_EVENT_RESET)
-default_action_ok_cmd_func(action_ok_screenshot,         CMD_EVENT_TAKE_SCREENSHOT)
-default_action_ok_cmd_func(action_ok_disk_cycle_tray_status, CMD_EVENT_DISK_EJECT_TOGGLE        )
-default_action_ok_cmd_func(action_ok_shader_apply_changes, CMD_EVENT_SHADERS_APPLY_CHANGES        )
-
+default_action_ok_cmd_func(action_ok_cheat_apply_changes,      CMD_EVENT_CHEATS_APPLY)
+default_action_ok_cmd_func(action_ok_quit,                     CMD_EVENT_QUIT)
+default_action_ok_cmd_func(action_ok_save_new_config,          CMD_EVENT_MENU_SAVE_CONFIG)
+default_action_ok_cmd_func(action_ok_resume_content,           CMD_EVENT_RESUME)
+default_action_ok_cmd_func(action_ok_restart_content,          CMD_EVENT_RESET)
+default_action_ok_cmd_func(action_ok_screenshot,               CMD_EVENT_TAKE_SCREENSHOT)
+default_action_ok_cmd_func(action_ok_disk_cycle_tray_status,   CMD_EVENT_DISK_EJECT_TOGGLE)
+default_action_ok_cmd_func(action_ok_shader_apply_changes,     CMD_EVENT_SHADERS_APPLY_CHANGES)
+#ifdef HAVE_QT
+default_action_ok_cmd_func(action_ok_show_wimp,                CMD_EVENT_UI_COMPANION_TOGGLE)
+#endif
 
 static int action_ok_reset_core_association(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
@@ -4739,6 +4743,11 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS:
             BIND_ACTION_OK(cbs, action_ok_enable_settings);
             break;
+#ifdef HAVE_QT
+         case MENU_ENUM_LABEL_SHOW_WIMP:
+            BIND_ACTION_OK(cbs, action_ok_show_wimp);
+            break;
+#endif
          case MENU_ENUM_LABEL_QUIT_RETROARCH:
             BIND_ACTION_OK(cbs, action_ok_quit);
             break;

menu/drivers/xmb.c

@@ -2359,6 +2359,9 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                      return xmb->textures.list[XMB_TEXTURE_RECORD];
                   case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_OSD];
+#ifdef HAVE_QT
+                  case MENU_ENUM_LABEL_SHOW_WIMP:
+#endif
                   case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_UI];
                   case MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS:
@@ -5263,6 +5266,13 @@ static int xmb_list_push(void *data, void *userdata,
 
             entry.enum_idx      = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
             menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+#ifdef HAVE_QT
+            if (settings->bools.desktop_menu_enable)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_SHOW_WIMP;
+               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            }
+#endif
 #if defined(HAVE_NETWORKING)
             {
                settings_t *settings      = config_get_ptr();
@@ -5307,7 +5317,6 @@ static int xmb_list_push(void *data, void *userdata,
                entry.enum_idx      = MENU_ENUM_LABEL_HELP_LIST;
                menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
             }
-
 #if !defined(IOS)
             if (settings->bools.menu_show_quit_retroarch)
             {

menu/menu_displaylist.c

@@ -5538,7 +5538,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_MENU_SHOW_HELP,
                PARSE_ONLY_BOOL, false);
-
+#ifdef HAVE_QT
+         menu_displaylist_parse_settings_enum(menu, info,
+               MENU_ENUM_LABEL_SHOW_WIMP,
+               PARSE_ONLY_UINT, false);
+#endif
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH,
                PARSE_ONLY_BOOL, false);

menu/menu_setting.c

@@ -2468,7 +2468,16 @@ static bool setting_append_list(
                &subgroup_info,
                parent_group);
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
-
+#ifdef HAVE_QT
+         CONFIG_ACTION(
+               list, list_info,
+               MENU_ENUM_LABEL_SHOW_WIMP,
+               MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
+               &group_info,
+               &subgroup_info,
+               parent_group);
+         menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_UI_COMPANION_TOGGLE);
+#endif
 #if !defined(IOS)
          /* Apple rejects iOS apps that let you forcibly quit them. */
          CONFIG_ACTION(

msg_hash.h

@@ -1496,6 +1496,9 @@ enum msg_hash_enums
    MENU_LABEL(BUILDBOT_ASSETS_URL),
    MENU_LABEL(CORE_SET_SUPPORTS_NO_CONTENT_ENABLE),
    MENU_LABEL(CLOSE_CONTENT),
+#ifdef HAVE_QT
+   MENU_LABEL(SHOW_WIMP),
+#endif
    MENU_LABEL(QUIT_RETROARCH),
    MENU_LABEL(SHUTDOWN),
    MENU_LABEL(REBOOT),