From 12f2b900caf7533b62bbb5fb310295b9077e4b30 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 26 Jun 2023 01:20:26 +0200 Subject: [PATCH] Qt: use shortcut instead of hardcoded keypress event --- rpcs3/rpcs3qt/main_window.cpp | 27 ++++++--------------------- rpcs3/rpcs3qt/main_window.h | 1 - rpcs3/rpcs3qt/shortcut_settings.cpp | 2 ++ rpcs3/rpcs3qt/shortcut_settings.h | 1 + 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 4b46a770fa..ce9a0fc2b0 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -319,6 +319,12 @@ void main_window::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const Q switch (shortcut_key) { + case gui::shortcuts::shortcut::mw_welcome_dialog: + { + welcome_dialog* welcome = new welcome_dialog(m_gui_settings, true, this); + welcome->open(); + break; + } case gui::shortcuts::shortcut::mw_toggle_fullscreen: { ui->toolbar_fullscreen->trigger(); @@ -3397,24 +3403,3 @@ void main_window::dragLeaveEvent(QDragLeaveEvent* event) { event->accept(); } - -void main_window::keyPressEvent(QKeyEvent* event) -{ - QMainWindow::keyPressEvent(event); - - if (event->isAutoRepeat() || event->modifiers()) - { - return; - } - - switch (event->key()) - { - case Qt::Key_F1: - { - welcome_dialog* welcome = new welcome_dialog(m_gui_settings, true, this); - welcome->open(); - break; - } - default: break; - } -} diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index c3190ee37c..ffaec22808 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -135,7 +135,6 @@ protected: void dragEnterEvent(QDragEnterEvent* event) override; void dragMoveEvent(QDragMoveEvent* event) override; void dragLeaveEvent(QDragLeaveEvent* event) override; - void keyPressEvent(QKeyEvent* event) override; private: void ConfigureGuiFromSettings(); diff --git a/rpcs3/rpcs3qt/shortcut_settings.cpp b/rpcs3/rpcs3qt/shortcut_settings.cpp index b90daa494b..87de5e58fa 100644 --- a/rpcs3/rpcs3qt/shortcut_settings.cpp +++ b/rpcs3/rpcs3qt/shortcut_settings.cpp @@ -16,6 +16,7 @@ void fmt_class_string::format(std::string& out, u64 ar case shortcut::mw_toggle_fullscreen: return "mw_toggle_fullscreen"; case shortcut::mw_exit_fullscreen: return "mw_exit_fullscreen"; case shortcut::mw_refresh: return "mw_refresh"; + case shortcut::mw_welcome_dialog: return "mw_welcome_dialog"; case shortcut::gw_toggle_fullscreen: return "gw_toggle_fullscreen"; case shortcut::gw_exit_fullscreen: return "gw_exit_fullscreen"; case shortcut::gw_log_mark: return "gw_log_mark"; @@ -43,6 +44,7 @@ shortcut_settings::shortcut_settings() { shortcut::mw_toggle_fullscreen, shortcut_info{ "main_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::main_window } }, { shortcut::mw_exit_fullscreen, shortcut_info{ "main_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::main_window } }, { shortcut::mw_refresh, shortcut_info{ "main_window_refresh", tr("Refresh"), "Ctrl+F5", shortcut_handler_id::main_window } }, + { shortcut::mw_welcome_dialog, shortcut_info{ "main_window_welcome_dialog", tr("Show Welcome Dialog"), "F1", shortcut_handler_id::main_window } }, { shortcut::gw_toggle_fullscreen, shortcut_info{ "game_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::game_window } }, { shortcut::gw_exit_fullscreen, shortcut_info{ "game_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::game_window } }, { shortcut::gw_log_mark, shortcut_info{ "game_window_log_mark", tr("Add Log Mark"), "Alt+L", shortcut_handler_id::game_window } }, diff --git a/rpcs3/rpcs3qt/shortcut_settings.h b/rpcs3/rpcs3qt/shortcut_settings.h index cd87fd5df4..412b4f68a9 100644 --- a/rpcs3/rpcs3qt/shortcut_settings.h +++ b/rpcs3/rpcs3qt/shortcut_settings.h @@ -23,6 +23,7 @@ namespace gui mw_toggle_fullscreen, mw_exit_fullscreen, mw_refresh, + mw_welcome_dialog, gw_toggle_fullscreen, gw_exit_fullscreen,