Merge pull request #4002 from lasers/improvs-one-at-a-time

Improvs one at a time - Core
This commit is contained in:
Twinaphex 2016-11-16 06:49:33 +01:00 committed by GitHub
commit bde2de740d
7 changed files with 72 additions and 50 deletions

View File

@ -3270,7 +3270,8 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS: case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS:
return "驱动"; return "驱动";
case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN: case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN:
return "Dummy On Core Shutdown"; /* FIXME? Translate 'Load Dummy on Core Shutdown' */
return "Load Dummy on Core Shutdown";
case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER: case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "动态壁纸"; return "动态壁纸";
case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY: case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:

View File

@ -892,7 +892,8 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS: case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS:
return "Shader Preset Opslaan Als"; return "Shader Preset Opslaan Als";
case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT: case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
return "HW Shared Context Activeren"; /* FIXME? Translate 'Enable Hardware Shared Context' */
return "Activeren Hardware Shared Context";
case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH: case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH:
return "Hardware Bilinear Filtering"; return "Hardware Bilinear Filtering";
case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER: case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER:

View File

@ -829,7 +829,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS: case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS:
return "Zapisz preset shadera jako"; return "Zapisz preset shadera jako";
case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT: case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
return "HW Shared Context Enable"; return "Enable Hardware Shared Context";
case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH: case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH:
return "Sprzętowe filtrowanie dwuliniowe"; return "Sprzętowe filtrowanie dwuliniowe";
case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER: case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER:

View File

@ -451,7 +451,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_OPTIONS,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS,
"Core") "Core")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE, MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
"Automatically start a core") "Start a Core Automatically")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG, MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG,
"Configuration Per-Core") "Configuration Per-Core")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE, MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE,
@ -515,7 +515,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
"Driver") "Driver")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN, MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
"Dummy On Core Shutdown") "Load Dummy on Core Shutdown")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER, MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
"Dynamic Wallpaper") "Dynamic Wallpaper")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY,
@ -1511,7 +1511,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME,
"Save Game Preset") "Save Game Preset")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
"HW Shared Context Enable") "Enable Hardware Shared Context")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
"HW Bilinear Filtering") "HW Bilinear Filtering")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
@ -1606,6 +1606,8 @@ MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO,
"Shader Preset") "Shader Preset")
MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
"Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.") "Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.")
MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
"Change settings for the core.")
MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST, MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
"Scan contents and add to the database.") "Scan contents and add to the database.")
MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,

View File

@ -3240,7 +3240,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS: case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS:
return "Core"; return "Core";
case MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE: case MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE:
return "Automatically start a core"; /* FIXME? Translate 'Start a Core Automatically' */
return "Start a Core Automatically";
case MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG: case MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG:
return "Configuration Per-Core"; return "Configuration Per-Core";
case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE: case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
@ -3304,7 +3305,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS: case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS:
return "Driver"; return "Driver";
case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN: case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN:
return "Dummy On Core Shutdown"; /* FIXME? Translate 'Load Dummy on Core Shutdown' */
return "Load Dummy on Core Shutdown";
case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER: case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Dynamic Wallpaper"; return "Dynamic Wallpaper";
case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY: case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
@ -4296,7 +4298,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME: case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME:
return "Save Game Preset"; return "Save Game Preset";
case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT: case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
return "HW Shared Context Enable"; /* FIXME? Translate 'Enable Hardware Shared Context' */
return "Enable Hardware Shared Context";
case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH: case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH:
return "HW Bilinear Filtering"; return "HW Bilinear Filtering";
case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER: case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER:

View File

@ -40,6 +40,16 @@ static int action_bind_sublabel_generic(
return 0; return 0;
} }
static int action_bind_sublabel_core_settings_list(
file_list_t *list,
unsigned type, unsigned i,
const char *label, const char *path,
char *s, size_t len)
{
strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CORE_SETTINGS), len);
return 0;
}
static int action_bind_sublabel_cheevos_hardcore_mode_enable( static int action_bind_sublabel_cheevos_hardcore_mode_enable(
file_list_t *list, file_list_t *list,
unsigned type, unsigned i, unsigned type, unsigned i,
@ -453,6 +463,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_INPUT_USER_16_BINDS: case MENU_ENUM_LABEL_INPUT_USER_16_BINDS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_bind_settings); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_bind_settings);
break; break;
case MENU_ENUM_LABEL_NETPLAY: case MENU_ENUM_LABEL_NETPLAY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_netplay_settings); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_netplay_settings);
break; break;
@ -474,6 +485,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_AUDIO_SETTINGS: case MENU_ENUM_LABEL_AUDIO_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_settings_list); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_settings_list);
break; break;
case MENU_ENUM_LABEL_CORE_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_settings_list);
break;
case MENU_ENUM_LABEL_INPUT_SETTINGS: case MENU_ENUM_LABEL_INPUT_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_settings_list); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_settings_list);
break; break;

View File

@ -1923,60 +1923,61 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS, MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS,
/* Callback strings */ /* Callback strings */
MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD,
MENU_ENUM_LABEL_CB_DOWNLOAD_URL,
MENU_ENUM_LABEL_CB_UPDATE_OVERLAYS,
MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST,
MENU_ENUM_LABEL_CB_MENU_WALLPAPER,
MENU_ENUM_LABEL_CB_MENU_THUMBNAIL,
MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST,
MENU_ENUM_LABEL_CB_LAKKA_LIST,
MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST,
MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST, MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST,
MENU_ENUM_LABEL_CB_UPDATE_DATABASES, MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD,
MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST,
MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD,
MENU_ENUM_LABEL_CB_CORE_UPDATER_DOWNLOAD,
MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST,
MENU_ENUM_LABEL_CB_DOWNLOAD_URL,
MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD, MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD,
MENU_ENUM_LABEL_CB_LAKKA_LIST,
MENU_ENUM_LABEL_CB_MENU_THUMBNAIL,
MENU_ENUM_LABEL_CB_MENU_WALLPAPER,
MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD,
MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST,
MENU_ENUM_LABEL_CB_UPDATE_ASSETS,
MENU_ENUM_LABEL_CB_UPDATE_AUTOCONFIG_PROFILES,
MENU_ENUM_LABEL_CB_UPDATE_CHEATS, MENU_ENUM_LABEL_CB_UPDATE_CHEATS,
MENU_ENUM_LABEL_CB_UPDATE_CORE_INFO_FILES,
MENU_ENUM_LABEL_CB_UPDATE_DATABASES,
MENU_ENUM_LABEL_CB_UPDATE_OVERLAYS,
MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG, MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG,
MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL, MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL,
MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG, MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG,
MENU_ENUM_LABEL_CB_UPDATE_ASSETS,
MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD,
MENU_ENUM_LABEL_CB_UPDATE_CORE_INFO_FILES,
MENU_ENUM_LABEL_CB_UPDATE_AUTOCONFIG_PROFILES,
MENU_ENUM_LABEL_CB_CORE_UPDATER_DOWNLOAD,
MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD,
MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES, MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO, MENU_ENUM_SUBLABEL_CORE_SETTINGS,
MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX,
MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
MENU_ENUM_SUBLABEL_CPU_CORES, MENU_ENUM_SUBLABEL_CPU_CORES,
MENU_ENUM_SUBLABEL_FPS_SHOW,
MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
MENU_ENUM_SUBLABEL_MENU_SETTINGS,
MENU_ENUM_SUBLABEL_NETPLAY,
MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
MENU_ENUM_SUBLABEL_SSH_ENABLE,
MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
MENU_ENUM_SUBLABEL_USER_LANGUAGE,
MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION, MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY, MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
MENU_ENUM_SUBLABEL_SSH_ENABLE,
MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
MENU_ENUM_SUBLABEL_USER_LANGUAGE,
MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
MENU_ENUM_SUBLABEL_FPS_SHOW,
MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
MENU_ENUM_SUBLABEL_NETPLAY,
MENU_ENUM_SUBLABEL_MENU_SETTINGS,
MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC, MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX,
MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
MENU_ENUM_SUBLABEL_VIDEO_THREADED, MENU_ENUM_SUBLABEL_VIDEO_THREADED,
MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT MENU_ENUM_SUBLABEL_WIFI_SETTINGS
}; };