CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 06:18:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Menu) Improvements

Browse Source
This commit is contained in:
twinaphex 2015-10-20 01:35:08 +02:00
parent a6475bd99f
commit e357f6b320
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/intl/menu_hash_us.c
View File

@ -26,6 +26,10 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
{ {
switch (hash) switch (hash)
{ {
case MENU_LABEL_CHEEVOS_USERNAME:
return "cheevos_username";
case MENU_LABEL_CHEEVOS_PASSWORD:
return "cheevos_password";
case MENU_LABEL_ACCOUNTS_CHEEVOS_USERNAME: case MENU_LABEL_ACCOUNTS_CHEEVOS_USERNAME:
return "accounts_cheevos_username"; return "accounts_cheevos_username";
case MENU_LABEL_ACCOUNTS_CHEEVOS_PASSWORD: case MENU_LABEL_ACCOUNTS_CHEEVOS_PASSWORD:
@ -662,6 +666,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
switch (hash) switch (hash)
{ {
case MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS:
return "Accounts Cheevos";
case MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME: case MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME:
return "Username"; return "Username";
case MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD: case MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD:

4
menu/menu_displaylist.c
View File

@ -2289,7 +2289,9 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
break; break;
case DISPLAYLIST_ACCOUNTS_CHEEVOS_LIST: case DISPLAYLIST_ACCOUNTS_CHEEVOS_LIST:
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
ret = menu_displaylist_parse_settings(menu, info, "Accounts", PARSE_NONE); ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS),
PARSE_NONE);
#else #else
menu_entries_push(info->list, menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS), menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),

5
menu/menu_hash.h
View File

@ -22,6 +22,11 @@
extern "C" { extern "C" {
#endif #endif
#define MENU_LABEL_CHEEVOS_USERNAME 0x6ce57e31U
#define MENU_LABEL_CHEEVOS_PASSWORD 0x86c38d24U
#define MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS 0xe0b53ce3U
#define MENU_LABEL_ACCOUNTS_CHEEVOS_PASSWORD 0x45cf62e3U #define MENU_LABEL_ACCOUNTS_CHEEVOS_PASSWORD 0x45cf62e3U
#define MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD 0xe5a73d05U #define MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD 0xe5a73d05U

24
menu/menu_setting.c
View File

@ -5905,22 +5905,18 @@ static bool setting_append_list_playlist_options(
return true; return true;
} }
static bool setting_append_list_accounts_options( #ifdef HAVE_CHEEVOS
static bool setting_append_list_accounts_cheevos_options(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
const char *parent_group) const char *parent_group)
{ {
#ifdef HAVE_CHEEVOS
rarch_setting_group_info_t group_info = {0}; rarch_setting_group_info_t group_info = {0};
rarch_setting_group_info_t subgroup_info = {0}; rarch_setting_group_info_t subgroup_info = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
START_GROUP(group_info, START_GROUP(group_info,
#if 0 menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS),
menu_hash_to_str(MENU_LABEL_VALUE_USER_SETTINGS),
#else
"Accounts",
#endif
parent_group); parent_group);
parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS);
@ -5929,11 +5925,10 @@ static bool setting_append_list_accounts_options(
CONFIG_STRING( CONFIG_STRING(
settings->cheevos.username, settings->cheevos.username,
#if 0
menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME), menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME),
#if 0
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_USERNAME), menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_USERNAME),
#else #else
"cheevos_username",
"Username", "Username",
#endif #endif
"", "",
@ -5946,11 +5941,10 @@ static bool setting_append_list_accounts_options(
CONFIG_STRING( CONFIG_STRING(
settings->cheevos.password, settings->cheevos.password,
menu_hash_to_str(MENU_LABEL_CHEEVOS_PASSWORD),
#if 0 #if 0
menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME), menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_PASSWORD),
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_USERNAME),
#else #else
"cheevos_password",
"Password", "Password",
#endif #endif
"", "",
@ -5963,10 +5957,10 @@ static bool setting_append_list_accounts_options(
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group);
#endif
return true; return true;
} }
#endif
static bool setting_append_list_user_options( static bool setting_append_list_user_options(
rarch_setting_t **list, rarch_setting_t **list,
@ -6792,8 +6786,10 @@ rarch_setting_t *menu_setting_new(void)
if (!setting_append_list_user_options(&list, list_info, root)) if (!setting_append_list_user_options(&list, list_info, root))
goto error; goto error;
if (!setting_append_list_accounts_options(&list, list_info, root)) #ifdef HAVE_CHEEVOS
if (!setting_append_list_accounts_cheevos_options(&list, list_info, root))
goto error; goto error;
#endif
if (!setting_append_list_directory_options(&list, list_info, root)) if (!setting_append_list_directory_options(&list, list_info, root))
goto error; goto error;