mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-12 11:09:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: use shortcut instead of hardcoded keypress event

Browse source
This commit is contained in:
Megamouse 2023-06-26 01:20:26 +02:00
commit 12f2b900ca
4 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rpcs3/rpcs3qt/main_window.cpp
View file

@ -319,6 +319,12 @@ void main_window::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const Q
switch (shortcut_key) 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: case gui::shortcuts::shortcut::mw_toggle_fullscreen:
{ {
ui->toolbar_fullscreen->trigger(); ui->toolbar_fullscreen->trigger();
@ -3397,24 +3403,3 @@ void main_window::dragLeaveEvent(QDragLeaveEvent* event)
{ {
event->accept(); 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;
}
}

1
rpcs3/rpcs3qt/main_window.h
View file

@ -135,7 +135,6 @@ protected:
void dragEnterEvent(QDragEnterEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override;
void dragMoveEvent(QDragMoveEvent* event) override; void dragMoveEvent(QDragMoveEvent* event) override;
void dragLeaveEvent(QDragLeaveEvent* event) override; void dragLeaveEvent(QDragLeaveEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;
private: private:
void ConfigureGuiFromSettings(); void ConfigureGuiFromSettings();

2
rpcs3/rpcs3qt/shortcut_settings.cpp
View file

@ -16,6 +16,7 @@ void fmt_class_string<gui::shortcuts::shortcut>::format(std::string& out, u64 ar
case shortcut::mw_toggle_fullscreen: return "mw_toggle_fullscreen"; case shortcut::mw_toggle_fullscreen: return "mw_toggle_fullscreen";
case shortcut::mw_exit_fullscreen: return "mw_exit_fullscreen"; case shortcut::mw_exit_fullscreen: return "mw_exit_fullscreen";
case shortcut::mw_refresh: return "mw_refresh"; 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_toggle_fullscreen: return "gw_toggle_fullscreen";
case shortcut::gw_exit_fullscreen: return "gw_exit_fullscreen"; case shortcut::gw_exit_fullscreen: return "gw_exit_fullscreen";
case shortcut::gw_log_mark: return "gw_log_mark"; 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_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_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_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_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_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 } }, { shortcut::gw_log_mark, shortcut_info{ "game_window_log_mark", tr("Add Log Mark"), "Alt+L", shortcut_handler_id::game_window } },

1
rpcs3/rpcs3qt/shortcut_settings.h
View file

@ -23,6 +23,7 @@ namespace gui
mw_toggle_fullscreen, mw_toggle_fullscreen,
mw_exit_fullscreen, mw_exit_fullscreen,
mw_refresh, mw_refresh,
mw_welcome_dialog,
gw_toggle_fullscreen, gw_toggle_fullscreen,
gw_exit_fullscreen, gw_exit_fullscreen,