Merge pull request libretro#4035 from lasers/add-sublabel

Add sublabel for User Interface, Privacy, Directory, Frame Throttle
mme4crt · Nov 21, 2016 · 0da9b6c · 0da9b6c
2 parents 6642000 + c51bb8c
commit 0da9b6c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
@@ -1624,10 +1624,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
       "Change settings for the core.")
 MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
       "Change settings for the recording.")
+MSG_HASH(MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
+      "Change settings for rewinding, fast-forwarding, and slow-motion.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
       "Change settings for the saving.")
 MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
       "Change settings for the logging.")
+MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
+      "Change settings for the user interface.")
+MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
+      "Change your privacy settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
+      "Change default directories for this system.")
 MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS,
       "Change settings for the playlists.")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS,

diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
@@ -39,9 +39,13 @@ default_sublabel_macro(action_bind_sublabel_driver_settings_list,             ME
 default_sublabel_macro(action_bind_sublabel_retro_achievements_settings_list, MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_saving_settings_list,          MENU_ENUM_SUBLABEL_SAVING_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_logging_settings_list,         MENU_ENUM_SUBLABEL_LOGGING_SETTINGS)
+default_sublabel_macro(action_bind_sublabel_user_interface_settings_list,  MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS)
+default_sublabel_macro(action_bind_sublabel_privacy_settings_list,         MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS)
+default_sublabel_macro(action_bind_sublabel_directory_settings_list,       MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_playlist_settings_list,        MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_network_settings_list,         MENU_ENUM_SUBLABEL_NETWORK_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_recording_settings_list,       MENU_ENUM_SUBLABEL_RECORDING_SETTINGS)
+default_sublabel_macro(action_bind_sublabel_frame_throttle_settings_list,  MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_core_settings_list,            MENU_ENUM_SUBLABEL_CORE_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_information_list_list,         MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST)
 default_sublabel_macro(action_bind_sublabel_cheevos_hardcore_mode_enable,  MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE)
@@ -270,6 +274,18 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_PLAYLIST_SETTINGS:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_playlist_settings_list);
             break;
+         case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_interface_settings_list);
+            break;
+         case MENU_ENUM_LABEL_PRIVACY_SETTINGS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_privacy_settings_list);
+            break;
+         case MENU_ENUM_LABEL_DIRECTORY_SETTINGS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_directory_settings_list);
+            break;
+         case MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_frame_throttle_settings_list);
+            break;
          case MENU_ENUM_LABEL_NETWORK_SETTINGS:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list);
             break;

diff --git a/msg_hash.h b/msg_hash.h
@@ -820,15 +820,24 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST,
 
    MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS,
+   MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
+   MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
+
    MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
    MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS,
    MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
    MENU_ENUM_LABEL_UPDATER_SETTINGS,
    MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
    MENU_ENUM_LABEL_WIFI_SETTINGS,
    MENU_ENUM_LABEL_USER_SETTINGS,
+
    MENU_ENUM_LABEL_DIRECTORY_SETTINGS,
+   MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
+   MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
+
    MENU_ENUM_LABEL_PRIVACY_SETTINGS,
+   MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
+   MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
 
    MENU_ENUM_LABEL_NETWORK_SETTINGS,
    MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
@@ -1052,9 +1061,9 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS,
    MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS,
 
-
    MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS,
    MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
+   MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
 
    MENU_ENUM_LABEL_FRAME_THROTTLE_ENABLE,
    MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE,
@@ -1701,7 +1710,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_MENU_ENUM_FILE_BROWSER_SETTINGS,
    MENU_ENUM_LABEL_MENU_ENUM_SETTINGS,
    MENU_ENUM_LABEL_VALUE_MENU_ENUM_SETTINGS,
-   MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
    MENU_ENUM_LABEL_PATCH_SETTINGS,
 
    MENU_ENUM_LABEL_PLAYLIST_SETTINGS,
@@ -1715,8 +1723,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_LAKKA_SERVICES,
    MENU_ENUM_LABEL_ARCHIVE_SETTINGS,
    MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
-   MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
-   MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
    MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,
    MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
    MENU_ENUM_LABEL_SAVE_NEW_CONFIG,