diff options
Diffstat (limited to 'src/yuzu/uisettings.h')
-rw-r--r-- | src/yuzu/uisettings.h | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index 20a517d34..0be8ee369 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h @@ -14,6 +14,8 @@ #include "common/common_types.h" #include "common/settings.h" +using Settings::Setting; + namespace UISettings { bool IsDarkTheme(); @@ -64,30 +66,33 @@ struct Values { QByteArray gamelist_header_state; QByteArray microprofile_geometry; - Settings::Setting<bool> microprofile_visible{false, "microProfileDialogVisible"}; - - Settings::Setting<bool> single_window_mode{true, "singleWindowMode"}; - Settings::Setting<bool> fullscreen{false, "fullscreen"}; - Settings::Setting<bool> display_titlebar{true, "displayTitleBars"}; - Settings::Setting<bool> show_filter_bar{true, "showFilterBar"}; - Settings::Setting<bool> show_status_bar{true, "showStatusBar"}; - - Settings::Setting<bool> confirm_before_closing{true, "confirmClose"}; - Settings::Setting<bool> first_start{true, "firstStart"}; - Settings::Setting<bool> pause_when_in_background{false, "pauseWhenInBackground"}; - Settings::Setting<bool> mute_when_in_background{false, "muteWhenInBackground"}; - Settings::Setting<bool> hide_mouse{true, "hideInactiveMouse"}; - Settings::Setting<bool> controller_applet_disabled{false, "disableControllerApplet"}; - + Setting<bool> microprofile_visible{false, "microProfileDialogVisible"}; + + Setting<bool> single_window_mode{true, "singleWindowMode"}; + Setting<bool> fullscreen{false, "fullscreen"}; + Setting<bool> display_titlebar{true, "displayTitleBars"}; + Setting<bool> show_filter_bar{true, "showFilterBar"}; + Setting<bool> show_status_bar{true, "showStatusBar"}; + + Setting<bool> confirm_before_closing{true, "confirmClose"}; + Setting<bool> first_start{true, "firstStart"}; + Setting<bool> pause_when_in_background{false, "pauseWhenInBackground"}; + Setting<bool> mute_when_in_background{false, "muteWhenInBackground"}; + Setting<bool> hide_mouse{true, "hideInactiveMouse"}; + Setting<bool> controller_applet_disabled{false, "disableControllerApplet"}; // Set when Vulkan is known to crash the application bool has_broken_vulkan = false; - Settings::Setting<bool> select_user_on_boot{false, "select_user_on_boot"}; + Setting<bool> select_user_on_boot{false, "select_user_on_boot"}; + Setting<bool> disable_web_applet{true, "disable_web_applet"}; // Discord RPC - Settings::Setting<bool> enable_discord_presence{true, "enable_discord_presence"}; + Setting<bool> enable_discord_presence{true, "enable_discord_presence"}; - Settings::Setting<bool> enable_screenshot_save_as{true, "enable_screenshot_save_as"}; + // logging + Setting<bool> show_console{false, "showConsole"}; + + Setting<bool> enable_screenshot_save_as{true, "enable_screenshot_save_as"}; QString roms_path; QString symbols_path; @@ -102,47 +107,42 @@ struct Values { // Shortcut name <Shortcut, context> std::vector<Shortcut> shortcuts; - Settings::Setting<uint32_t> callout_flags{0, "calloutFlags"}; + Setting<u32> callout_flags{0, "calloutFlags"}; // multiplayer settings - Settings::Setting<QString> multiplayer_nickname{{}, "nickname"}; - Settings::Setting<QString> multiplayer_ip{{}, "ip"}; - Settings::SwitchableSetting<uint, true> multiplayer_port{24872, 0, UINT16_MAX, "port"}; - Settings::Setting<QString> multiplayer_room_nickname{{}, "room_nickname"}; - Settings::Setting<QString> multiplayer_room_name{{}, "room_name"}; - Settings::SwitchableSetting<uint, true> multiplayer_max_player{8, 0, 8, "max_player"}; - Settings::SwitchableSetting<uint, true> multiplayer_room_port{24872, 0, UINT16_MAX, - "room_port"}; - Settings::SwitchableSetting<uint, true> multiplayer_host_type{0, 0, 1, "host_type"}; - Settings::Setting<qulonglong> multiplayer_game_id{{}, "game_id"}; - Settings::Setting<QString> multiplayer_room_description{{}, "room_description"}; + Setting<std::string> multiplayer_nickname{{}, "nickname"}; + Setting<std::string> multiplayer_ip{{}, "ip"}; + Setting<u16, true> multiplayer_port{24872, 0, UINT16_MAX, "port"}; + Setting<std::string> multiplayer_room_nickname{{}, "room_nickname"}; + Setting<std::string> multiplayer_room_name{{}, "room_name"}; + Setting<u8, true> multiplayer_max_player{8, 0, 8, "max_player"}; + Setting<u16, true> multiplayer_room_port{24872, 0, UINT16_MAX, "room_port"}; + Setting<u8, true> multiplayer_host_type{0, 0, 1, "host_type"}; + Setting<unsigned long long> multiplayer_game_id{{}, "game_id"}; + Setting<std::string> multiplayer_room_description{{}, "room_description"}; std::pair<std::vector<std::string>, std::vector<std::string>> multiplayer_ban_list; - // logging - Settings::Setting<bool> show_console{false, "showConsole"}; - // Game List - Settings::Setting<bool> show_add_ons{true, "show_add_ons"}; - Settings::Setting<uint32_t> game_icon_size{64, "game_icon_size"}; - Settings::Setting<uint32_t> folder_icon_size{48, "folder_icon_size"}; - Settings::Setting<uint8_t> row_1_text_id{3, "row_1_text_id"}; - Settings::Setting<uint8_t> row_2_text_id{2, "row_2_text_id"}; + Setting<bool> show_add_ons{true, "show_add_ons"}; + Setting<u32> game_icon_size{64, "game_icon_size"}; + Setting<u32> folder_icon_size{48, "folder_icon_size"}; + Setting<u8> row_1_text_id{3, "row_1_text_id"}; + Setting<u8> row_2_text_id{2, "row_2_text_id"}; std::atomic_bool is_game_list_reload_pending{false}; - Settings::Setting<bool> cache_game_list{true, "cache_game_list"}; - Settings::Setting<bool> favorites_expanded{true, "favorites_expanded"}; + Setting<bool> cache_game_list{true, "cache_game_list"}; + Setting<bool> favorites_expanded{true, "favorites_expanded"}; QVector<u64> favorited_ids; // Compatibility List - Settings::Setting<bool> show_compat{false, "show_compat"}; + Setting<bool> show_compat{false, "show_compat"}; // Size & File Types Column - Settings::Setting<bool> show_size{true, "show_size"}; - Settings::Setting<bool> show_types{true, "show_types"}; + Setting<bool> show_size{true, "show_size"}; + Setting<bool> show_types{true, "show_types"}; bool configuration_applied; bool reset_to_defaults; bool shortcut_already_warned{false}; - Settings::Setting<bool> disable_web_applet{true, "disable_web_applet"}; }; extern Values values; |