diff options
| author | Léo Lam <leo@leolam.fr> | 2020-03-15 15:07:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-15 15:07:47 +0100 |
| commit | 19a46dd67b19e2fc0dce38f716850ec790fb112d (patch) | |
| tree | 5238fb11dd1131b2b6170a08a02d66884b16e914 /Source/Core | |
| parent | 4944e4b42972034db49691947bd7f9d0de0e3bbc (diff) | |
| parent | cd2cf137bab0c710c6c253f3e0b35a1685488bd9 (diff) | |
Merge pull request #8652 from sonic2kk/qtshortcuts
Qt: Use Builtin QKeySequence Shortcuts
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/GameList/GameList.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/MenuBar.cpp | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index 9f166db56e..2f83d5b2b7 100644 --- a/Source/Core/DolphinQt/GameList/GameList.cpp +++ b/Source/Core/DolphinQt/GameList/GameList.cpp @@ -82,8 +82,8 @@ GameList::GameList(QWidget* parent) : QStackedWidget(parent) m_prefer_list = Settings::Instance().GetPreferredView(); ConsiderViewChange(); - auto* zoom_in = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Plus), this); - auto* zoom_out = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Minus), this); + auto* zoom_in = new QShortcut(QKeySequence::ZoomIn, this); + auto* zoom_out = new QShortcut(QKeySequence::ZoomOut, this); connect(zoom_in, &QShortcut::activated, this, &GameList::ZoomIn); connect(zoom_out, &QShortcut::activated, this, &GameList::ZoomOut); diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index 36be3e9304..14b433b77b 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -199,8 +199,7 @@ void MenuBar::AddDVDBackupMenu(QMenu* file_menu) void MenuBar::AddFileMenu() { QMenu* file_menu = addMenu(tr("&File")); - m_open_action = file_menu->addAction(tr("&Open..."), this, &MenuBar::Open, - QKeySequence(Qt::CTRL + Qt::Key_O)); + m_open_action = file_menu->addAction(tr("&Open..."), this, &MenuBar::Open, QKeySequence::Open); file_menu->addSeparator(); @@ -211,8 +210,8 @@ void MenuBar::AddFileMenu() file_menu->addSeparator(); - m_exit_action = - file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit, QKeySequence(Qt::ALT + Qt::Key_F4)); + m_exit_action = file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit); + m_exit_action->setShortcuts({QKeySequence::Quit, QKeySequence(Qt::ALT + Qt::Key_F4)}); } void MenuBar::AddToolsMenu() @@ -488,14 +487,14 @@ void MenuBar::AddViewMenu() view_menu->addSeparator(); view_menu->addAction(tr("Purge Game List Cache"), this, &MenuBar::PurgeGameListCache); view_menu->addSeparator(); - view_menu->addAction(tr("Search"), this, &MenuBar::ShowSearch, - QKeySequence(Qt::CTRL + Qt::Key_F)); + view_menu->addAction(tr("Search"), this, &MenuBar::ShowSearch, QKeySequence::Find); } void MenuBar::AddOptionsMenu() { QMenu* options_menu = addMenu(tr("&Options")); - options_menu->addAction(tr("Co&nfiguration"), this, &MenuBar::Configure); + options_menu->addAction(tr("Co&nfiguration"), this, &MenuBar::Configure, + QKeySequence::Preferences); options_menu->addSeparator(); options_menu->addAction(tr("&Graphics Settings"), this, &MenuBar::ConfigureGraphics); options_menu->addAction(tr("&Audio Settings"), this, &MenuBar::ConfigureAudio); |
