diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 2b321521fe..901590dadd 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -797,6 +797,8 @@ MSG_HASH(MENU_ENUM_LABEL_RESTART_CONTENT, "restart_content") MSG_HASH(MENU_ENUM_LABEL_RESTART_RETROARCH, "restart_retroarch") +MSG_HASH(MENU_ENUM_LABEL_RESUME, + "resume") MSG_HASH(MENU_ENUM_LABEL_RESUME_CONTENT, "resume_content") MSG_HASH(MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index fa2f9b6948..623e15a067 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -449,7 +449,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT, - "Close" + "Quit/Close Application" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG, @@ -2715,3 +2715,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_DATABASE_MANAGER, "View databases.") MSG_HASH(MENU_ENUM_SUBLABEL_CURSOR_MANAGER, "View previous searches.") +MSG_HASH(MENU_ENUM_SUBLABEL_TAKE_SCREENSHOT, + "Captures an image of the screen.") +MSG_HASH( + MENU_ENUM_SUBLABEL_CLOSE_CONTENT, + "Closes the current game. Any unsaved changes might be lost." + ) +MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_STATE, + "Load a saved state from the currently selected slot.") +MSG_HASH(MENU_ENUM_SUBLABEL_SAVE_STATE, + "Save a state to the currently selected slot.") +MSG_HASH(MENU_ENUM_SUBLABEL_RESUME, + "Resume the currently running application and leave the Quick Menu.") +MSG_HASH(MENU_ENUM_SUBLABEL_RESUME_CONTENT, + "Resume the currently running application and leave the Quick Menu.") +MSG_HASH(MENU_ENUM_SUBLABEL_STATE_SLOT, + "Changes the currently selected state slot.") +MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE, + "If a state was loaded, content will go back to the state prior to loading.") +MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE, + "If a state was overwritten, it will roll back to the previous save state.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 36d84013cd..d356ece23c 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -221,6 +221,14 @@ default_sublabel_macro(action_bind_sublabel_game_specific_options, default_sublabel_macro(action_bind_sublabel_core_enable, MENU_ENUM_SUBLABEL_CORE_ENABLE) default_sublabel_macro(action_bind_sublabel_database_manager, MENU_ENUM_SUBLABEL_DATABASE_MANAGER) default_sublabel_macro(action_bind_sublabel_cursor_manager, MENU_ENUM_SUBLABEL_CURSOR_MANAGER) +default_sublabel_macro(action_bind_sublabel_take_screenshot, MENU_ENUM_SUBLABEL_TAKE_SCREENSHOT) +default_sublabel_macro(action_bind_sublabel_close_content, MENU_ENUM_SUBLABEL_CLOSE_CONTENT) +default_sublabel_macro(action_bind_sublabel_load_state, MENU_ENUM_SUBLABEL_LOAD_STATE) +default_sublabel_macro(action_bind_sublabel_save_state, MENU_ENUM_SUBLABEL_SAVE_STATE) +default_sublabel_macro(action_bind_sublabel_resume_content, MENU_ENUM_SUBLABEL_RESUME_CONTENT) +default_sublabel_macro(action_bind_sublabel_state_slot, MENU_ENUM_SUBLABEL_STATE_SLOT) +default_sublabel_macro(action_bind_sublabel_undo_load_state, MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE) +default_sublabel_macro(action_bind_sublabel_undo_save_state, MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -282,6 +290,31 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_UNDO_SAVE_STATE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_undo_save_state); + break; + case MENU_ENUM_LABEL_UNDO_LOAD_STATE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_undo_load_state); + break; + case MENU_ENUM_LABEL_STATE_SLOT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_state_slot); + break; + case MENU_ENUM_LABEL_RESUME: + case MENU_ENUM_LABEL_RESUME_CONTENT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_resume_content); + break; + case MENU_ENUM_LABEL_SAVE_STATE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_save_state); + break; + case MENU_ENUM_LABEL_LOAD_STATE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_load_state); + break; + case MENU_ENUM_LABEL_CLOSE_CONTENT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_close_content); + break; + case MENU_ENUM_LABEL_TAKE_SCREENSHOT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_take_screenshot); + break; case MENU_ENUM_LABEL_CURSOR_MANAGER: case MENU_ENUM_LABEL_CURSOR_MANAGER_LIST: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cursor_manager); diff --git a/msg_hash.h b/msg_hash.h index f612a7551c..6a5308044d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1324,14 +1324,13 @@ enum msg_hash_enums MENU_LABEL(REMAP_FILE_SAVE_CORE), MENU_LABEL(REMAP_FILE_SAVE_GAME), MENU_LABEL(RESTART_CONTENT), + MENU_LABEL(RESUME), MENU_LABEL(RESUME_CONTENT), MENU_LABEL(CHEAT_FILE_SAVE_AS), MENU_LABEL(DELETE_ENTRY), MENU_LABEL(RESTART_RETROARCH), - MENU_ENUM_LABEL_VALUE_RESUME, - MENU_LABEL(TAKE_SCREENSHOT), MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,