diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index e2608ee2c5..6244978c56 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -14,6 +14,7 @@ #include "Emu/NP/np_helpers.h" #include "Emu/NP/vport0.h" #include "Emu/system_config.h" +#include "Emu/RSX/Overlays/overlay_message.h" #include "util/asm.hpp" @@ -74,6 +75,25 @@ namespace rpcn } } + void overlay_friend_callback(void* param, rpcn::NotificationType ntype, const std::string& username, bool status) + { + if (!g_cfg.misc.show_rpcn_popups) + return; + + localized_string_id loc_id = localized_string_id::INVALID; + + switch (ntype) + { + case rpcn::NotificationType::FriendQuery: loc_id = localized_string_id::RPCN_FRIEND_REQUEST_RECEIVED; break; + case rpcn::NotificationType::FriendNew: loc_id = localized_string_id::RPCN_FRIEND_ADDED; break; + case rpcn::NotificationType::FriendLost: loc_id = localized_string_id::RPCN_FRIEND_LOST; break; + case rpcn::NotificationType::FriendStatus: loc_id = status ? localized_string_id::RPCN_FRIEND_LOGGED_IN : localized_string_id::RPCN_FRIEND_LOGGED_OUT; break; + default: rpcn_log.fatal("An unhandled notification type was received by the overlay friend callback!"); break; + } + + rsx::overlays::queue_message(get_localized_string(loc_id, username.c_str()), 3'000'000); + } + std::string rpcn_state_to_string(rpcn::rpcn_state state) { return get_localized_string(rpcn_state_to_localized_string_id(state)); @@ -179,7 +199,8 @@ namespace rpcn sptr = instance.lock(); if (!sptr) { - sptr = std::shared_ptr(new rpcn_client()); + sptr = std::shared_ptr(new rpcn_client()); + sptr->register_friend_cb(overlay_friend_callback, nullptr); instance = sptr; } @@ -2559,6 +2580,12 @@ namespace rpcn friend_cbs.insert(std::make_pair(cb_func, cb_param)); } + void rpcn_client::register_friend_cb(friend_cb_func cb_func, void* cb_param) + { + std::lock_guard lock(mutex_friends); + friend_cbs.insert(std::make_pair(cb_func, cb_param)); + } + void rpcn_client::remove_friend_cb(friend_cb_func cb_func, void* cb_param) { std::lock_guard lock(mutex_friends); diff --git a/rpcs3/Emu/NP/rpcn_client.h b/rpcs3/Emu/NP/rpcn_client.h index 152a5bd7ee..02e900989f 100644 --- a/rpcs3/Emu/NP/rpcn_client.h +++ b/rpcs3/Emu/NP/rpcn_client.h @@ -440,6 +440,7 @@ namespace rpcn bool terminate_connection(); void get_friends_and_register_cb(friend_data& friend_infos, friend_cb_func cb_func, void* cb_param); + void register_friend_cb(friend_cb_func, void* cb_param); void remove_friend_cb(friend_cb_func, void* cb_param); ErrorType create_user(std::string_view npid, std::string_view password, std::string_view online_name, std::string_view avatar_url, std::string_view email); diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp index dc7df7699a..fa63aedf17 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp @@ -94,6 +94,7 @@ namespace rsx : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_OVERLAYS)) { add_checkbox(&g_cfg.misc.show_trophy_popups, "Show Trophy Popups"); + add_checkbox(&g_cfg.misc.show_rpcn_popups, "Show RPCN Popups"); add_checkbox(&g_cfg.misc.show_shader_compilation_hint, "Show Shader Compilation Hint"); add_checkbox(&g_cfg.misc.show_ppu_compilation_hint, "Show PPU Compilation Hint"); diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h index 389de56069..aa7cb2285f 100644 --- a/rpcs3/Emu/localized_string_id.h +++ b/rpcs3/Emu/localized_string_id.h @@ -170,6 +170,11 @@ enum class localized_string_id RPCN_ERROR_INVALID_PROTOCOL_VERSION, RPCN_ERROR_UNKNOWN, RPCN_SUCCESS_LOGGED_ON, + RPCN_FRIEND_REQUEST_RECEIVED, + RPCN_FRIEND_ADDED, + RPCN_FRIEND_LOST, + RPCN_FRIEND_LOGGED_IN, + RPCN_FRIEND_LOGGED_OUT, HOME_MENU_TITLE, HOME_MENU_EXIT_GAME, diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 3fbefc8df7..1a6c2eec0c 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -339,6 +339,7 @@ struct cfg_root : cfg::node cfg::_bool start_fullscreen{ this, "Start games in fullscreen mode", false, true }; cfg::_bool prevent_display_sleep{ this, "Prevent display sleep while running games", true, true }; cfg::_bool show_trophy_popups{ this, "Show trophy popups", true, true }; + cfg::_bool show_rpcn_popups{ this, "Show RPCN popups", true, true }; cfg::_bool show_shader_compilation_hint{ this, "Show shader compilation hint", true, true }; cfg::_bool show_ppu_compilation_hint{ this, "Show PPU compilation hint", true, true }; cfg::_bool show_pressure_intensity_toggle_hint{ this, "Show pressure intensity toggle hint", true, true }; diff --git a/rpcs3/rpcs3qt/emu_settings_type.h b/rpcs3/rpcs3qt/emu_settings_type.h index 202b873f64..b3aa1b590a 100644 --- a/rpcs3/rpcs3qt/emu_settings_type.h +++ b/rpcs3/rpcs3qt/emu_settings_type.h @@ -171,6 +171,7 @@ enum class emu_settings_type StartGameFullscreen, PreventDisplaySleep, ShowTrophyPopups, + ShowRpcnPopups, UseNativeInterface, ShowShaderCompilationHint, ShowPPUCompilationHint, @@ -364,6 +365,7 @@ inline static const QMap settings_location = { emu_settings_type::StartGameFullscreen, { "Miscellaneous", "Start games in fullscreen mode"}}, { emu_settings_type::PreventDisplaySleep, { "Miscellaneous", "Prevent display sleep while running games"}}, { emu_settings_type::ShowTrophyPopups, { "Miscellaneous", "Show trophy popups"}}, + { emu_settings_type::ShowRpcnPopups, { "Miscellaneous", "Show RPCN popups"}}, { emu_settings_type::UseNativeInterface, { "Miscellaneous", "Use native user interface"}}, { emu_settings_type::ShowShaderCompilationHint, { "Miscellaneous", "Show shader compilation hint"}}, { emu_settings_type::ShowPPUCompilationHint, { "Miscellaneous", "Show PPU compilation hint"}}, diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h index 20b8eb6e2e..421bafd449 100644 --- a/rpcs3/rpcs3qt/localized_emu.h +++ b/rpcs3/rpcs3qt/localized_emu.h @@ -192,6 +192,11 @@ private: case localized_string_id::RPCN_ERROR_INVALID_PROTOCOL_VERSION: return tr("RPCN Misc Error: Protocol Version Error (outdated RPCS3?)"); case localized_string_id::RPCN_ERROR_UNKNOWN: return tr("RPCN: Unknown Error"); case localized_string_id::RPCN_SUCCESS_LOGGED_ON: return tr("Successfully logged on RPCN!"); + case localized_string_id::RPCN_FRIEND_REQUEST_RECEIVED: return tr("RPCN: Received friend request: %0", "RCPN Friends").arg(std::forward(args)...); + case localized_string_id::RPCN_FRIEND_ADDED: return tr("RPCN: Friend added: %0", "RCPN Friends").arg(std::forward(args)...); + case localized_string_id::RPCN_FRIEND_LOST: return tr("RPCN: Friend removed: %0", "RCPN Friends").arg(std::forward(args)...); + case localized_string_id::RPCN_FRIEND_LOGGED_IN: return tr("RPCN: %0 logged in", "RCPN Friends").arg(std::forward(args)...); + case localized_string_id::RPCN_FRIEND_LOGGED_OUT: return tr("RPCN: %0 logged out", "RCPN Friends").arg(std::forward(args)...); case localized_string_id::HOME_MENU_TITLE: return tr("Home Menu"); case localized_string_id::HOME_MENU_EXIT_GAME: return tr("Exit Game"); case localized_string_id::HOME_MENU_RESUME: return tr("Resume Game"); diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index e8e073e16e..36fc6dc932 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1829,6 +1829,9 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceCheckBox(ui->showTrophyPopups, emu_settings_type::ShowTrophyPopups); SubscribeTooltip(ui->showTrophyPopups, tooltips.settings.show_trophy_popups); + m_emu_settings->EnhanceCheckBox(ui->showRpcnPopups, emu_settings_type::ShowRpcnPopups); + SubscribeTooltip(ui->showRpcnPopups, tooltips.settings.show_rpcn_popups); + m_emu_settings->EnhanceCheckBox(ui->useNativeInterface, emu_settings_type::UseNativeInterface); SubscribeTooltip(ui->useNativeInterface, tooltips.settings.use_native_interface); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 7d3d81a88b..1f6738d9d9 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -3,7 +3,7 @@ settings_dialog - Qt::WindowModal + Qt::WindowModality::WindowModal @@ -30,7 +30,7 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame true @@ -128,10 +128,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -200,7 +200,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -212,7 +212,7 @@ 0 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -231,10 +231,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -323,10 +323,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -343,10 +343,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -371,10 +371,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -560,10 +560,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -627,14 +627,14 @@ 25 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - Qt::Horizontal + Qt::Orientation::Horizontal @@ -656,7 +656,7 @@ 0 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -689,14 +689,14 @@ 1 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - Qt::Horizontal + Qt::Orientation::Horizontal @@ -717,7 +717,7 @@ 1x1 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -747,7 +747,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -778,7 +778,7 @@ RCAS Sharpening Strength - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft 1 @@ -797,7 +797,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -824,7 +824,7 @@ 0 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -846,10 +846,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -930,7 +930,7 @@ Additional Settings - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -978,10 +978,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1001,10 +1001,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1029,10 +1029,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -1083,7 +1083,7 @@ - QAbstractItemView::ExtendedSelection + QAbstractItemView::SelectionMode::ExtendedSelection @@ -1113,10 +1113,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1132,10 +1132,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1240,10 +1240,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksBelow + QSlider::TickPosition::TicksBelow 50 @@ -1256,10 +1256,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1314,10 +1314,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksBelow + QSlider::TickPosition::TicksBelow 10 @@ -1359,10 +1359,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksBelow + QSlider::TickPosition::TicksBelow 10 @@ -1375,10 +1375,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1416,10 +1416,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1549,10 +1549,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1577,10 +1577,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -1832,10 +1832,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1853,10 +1853,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -1881,10 +1881,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -1976,7 +1976,7 @@ - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight false @@ -1985,13 +1985,13 @@ true - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter false - QAbstractSpinBox::UpDownArrows + QAbstractSpinBox::ButtonSymbols::UpDownArrows true @@ -2082,10 +2082,10 @@ 512 - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksBelow + QSlider::TickPosition::TicksBelow 1024 @@ -2106,10 +2106,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -2134,10 +2134,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -2241,10 +2241,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -2290,10 +2290,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -2311,10 +2311,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -2339,10 +2339,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -2513,7 +2513,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2525,7 +2525,7 @@ 100% - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2544,10 +2544,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -2576,7 +2576,7 @@ - QAbstractItemView::ExtendedSelection + QAbstractItemView::SelectionMode::ExtendedSelection @@ -2589,7 +2589,7 @@ - QAbstractItemView::ExtendedSelection + QAbstractItemView::SelectionMode::ExtendedSelection @@ -2599,7 +2599,7 @@ 6 - QLayout::SetNoConstraint + QLayout::SizeConstraint::SetNoConstraint @@ -2767,7 +2767,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2779,7 +2779,7 @@ 1 µs - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2810,7 +2810,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2822,7 +2822,7 @@ 60 Hz - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2848,10 +2848,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -2868,7 +2868,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -2893,10 +2893,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -2965,6 +2965,13 @@ + + + + Show RPCN popups + + + @@ -3017,10 +3024,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -3111,7 +3118,7 @@ true - QAbstractSpinBox::CorrectToNearestValue + QAbstractSpinBox::CorrectionMode::CorrectToNearestValue false @@ -3126,7 +3133,7 @@ 99999 - QAbstractSpinBox::DefaultStepType + QAbstractSpinBox::StepType::DefaultStepType 2000 @@ -3179,7 +3186,7 @@ true - QAbstractSpinBox::CorrectToNearestValue + QAbstractSpinBox::CorrectionMode::CorrectToNearestValue false @@ -3213,7 +3220,7 @@ true - QAbstractSpinBox::CorrectToNearestValue + QAbstractSpinBox::CorrectionMode::CorrectToNearestValue false @@ -3263,7 +3270,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3277,17 +3284,17 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -3312,7 +3319,7 @@ FPS: 60 | Renderer | Version | Game [ID] - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -3503,7 +3510,7 @@ 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3535,7 +3542,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3567,7 +3574,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3596,7 +3603,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3625,7 +3632,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3635,10 +3642,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -3658,10 +3665,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -3686,10 +3693,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -3781,10 +3788,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -3906,10 +3913,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -3988,10 +3995,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4064,7 +4071,7 @@ UUID-placeholder - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -4085,10 +4092,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4113,10 +4120,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -4144,10 +4151,10 @@ GPU - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop - + Debug Output @@ -4210,7 +4217,7 @@ - + true @@ -4227,7 +4234,7 @@ - + Use High Precision Z-Buffer @@ -4237,10 +4244,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4346,10 +4353,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4440,10 +4447,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4459,10 +4466,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4480,10 +4487,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -4508,10 +4515,10 @@ - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -4529,7 +4536,7 @@ - QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save + QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 185bf56dd3..faa67f21c7 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -133,6 +133,7 @@ public: const QString game_window_title_format = tr("Configure the game window title.\nChanging this and/or adding the framerate may cause buggy or outdated recording software to not notice RPCS3."); const QString resize_on_boot = tr("Automatically resizes the game window on boot.\nThis does not change the internal game resolution."); const QString show_trophy_popups = tr("Show trophy pop-ups when a trophy is unlocked."); + const QString show_rpcn_popups = tr("Show RPCN friend list pop-ups."); const QString disable_mouse = tr("Disables the activation of fullscreen mode per double-click while the game screen is active.\nCheck this if you want to play with mouse and keyboard (for example with UCR)."); const QString disable_kb_hotkeys = tr("Disables keyboard hotkeys such as Ctrl+S, Ctrl+E, Ctrl+R, Ctrl+P while the game screen is active.\nThis does not include Ctrl+L (hide and lock mouse) and Alt+Enter (toggle fullscreen).\nCheck this if you want to play with mouse and keyboard."); const QString max_llvm_threads = tr("Limits the maximum number of threads used for the initial PPU and SPU module compilation.\nLower this in order to increase performance of other open applications.\nThe default uses all available threads.");