Enable Discord setting

This commit is contained in:
twinaphex 2018-05-29 12:18:01 +02:00
parent b5f6ae7931
commit 6d81d31ef5
23 changed files with 160 additions and 0 deletions

View File

@ -1263,6 +1263,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
SETTING_BOOL("video_font_enable", &settings->bools.video_font_enable, true, font_enable, false);
SETTING_BOOL("core_updater_auto_extract_archive", &settings->bools.network_buildbot_auto_extract_archive, true, true, false);
SETTING_BOOL("camera_allow", &settings->bools.camera_allow, true, false, false);
SETTING_BOOL("discord_allow", &settings->bools.discord_enable, true, false, false);
#if defined(VITA)
SETTING_BOOL("input_backtouch_enable", &settings->bools.input_backtouch_enable, false, false, false);
SETTING_BOOL("input_backtouch_toggle", &settings->bools.input_backtouch_toggle, false, false, false);

View File

@ -230,6 +230,7 @@ typedef struct settings
bool bundle_assets_extract_enable;
/* Misc. */
bool discord_enable;
bool threaded_data_runloop_enable;
bool set_supports_no_game_enable;
bool auto_screenshot_filename;

View File

@ -3507,3 +3507,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3293,3 +3293,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3285,3 +3285,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3399,3 +3399,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3158,3 +3158,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -6378,3 +6378,11 @@ MSG_HASH(
)
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3323,3 +3323,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3381,3 +3381,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Cancella")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3535,3 +3535,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3284,3 +3284,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -74,6 +74,8 @@ MSG_HASH(MENU_ENUM_LABEL_CACHE_DIRECTORY,
"cache_directory")
MSG_HASH(MENU_ENUM_LABEL_CAMERA_ALLOW,
"camera_allow")
MSG_HASH(MENU_ENUM_LABEL_DISCORD_ALLOW,
"discord_allow")
MSG_HASH(MENU_ENUM_LABEL_CAMERA_DRIVER,
"camera_driver")
MSG_HASH(MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST,

View File

@ -3160,3 +3160,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3562,3 +3562,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Oczyść")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3718,3 +3718,11 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME,
"Continuar conquistas para a sessão atual (Esta ação desabilitará Estados de Jogos, Trapaças, Rebobinagem, Pausa e Câmera Lenta e reiniciará o jogo atual).")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3258,3 +3258,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3342,3 +3342,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3718,3 +3718,11 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME,
"Resume achievements for current session (This action will disable savestates, cheats, rewind, pause, and slow-motion and reset the current game).")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -3315,3 +3315,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
"Clear")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
"Enable or disable Discord support. Will not work with the browser version, only native desktop client."
)

View File

@ -5926,6 +5926,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
MENU_ENUM_LABEL_CAMERA_ALLOW,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_DISCORD_ALLOW,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_LOCATION_ALLOW,
PARSE_ONLY_BOOL, true) == 0)

View File

@ -7872,6 +7872,21 @@ static bool setting_append_list(
SD_FLAG_NONE);
}
CONFIG_BOOL(
list, list_info,
&settings->bools.discord_enable,
MENU_ENUM_LABEL_DISCORD_ALLOW,
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
false,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
if (string_is_not_equal(settings->arrays.location_driver, "null"))
{
CONFIG_BOOL(

View File

@ -1309,6 +1309,7 @@ enum msg_hash_enums
/* Privacy settings */
MENU_LABEL(CAMERA_ALLOW),
MENU_LABEL(DISCORD_ALLOW),
MENU_LABEL(LOCATION_ALLOW),
/* RDB Settings */