summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp16
-rw-r--r--src/yuzu/main.ui1
2 files changed, 17 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index b21fbf826..b5dd3e0d6 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -526,19 +526,30 @@ void GMainWindow::InitializeHotkeys() {
526 526
527 const QString main_window = QStringLiteral("Main Window"); 527 const QString main_window = QStringLiteral("Main Window");
528 const QString load_file = QStringLiteral("Load File"); 528 const QString load_file = QStringLiteral("Load File");
529 const QString load_amiibo = QStringLiteral("Load Amiibo");
529 const QString exit_yuzu = QStringLiteral("Exit yuzu"); 530 const QString exit_yuzu = QStringLiteral("Exit yuzu");
531 const QString restart_emulation = QStringLiteral("Restart Emulation");
530 const QString stop_emulation = QStringLiteral("Stop Emulation"); 532 const QString stop_emulation = QStringLiteral("Stop Emulation");
531 const QString toggle_filter_bar = QStringLiteral("Toggle Filter Bar"); 533 const QString toggle_filter_bar = QStringLiteral("Toggle Filter Bar");
532 const QString toggle_status_bar = QStringLiteral("Toggle Status Bar"); 534 const QString toggle_status_bar = QStringLiteral("Toggle Status Bar");
533 const QString fullscreen = QStringLiteral("Fullscreen"); 535 const QString fullscreen = QStringLiteral("Fullscreen");
536 const QString capture_screenshot = QStringLiteral("Capture Screenshot");
534 537
535 ui.action_Load_File->setShortcut(hotkey_registry.GetKeySequence(main_window, load_file)); 538 ui.action_Load_File->setShortcut(hotkey_registry.GetKeySequence(main_window, load_file));
536 ui.action_Load_File->setShortcutContext( 539 ui.action_Load_File->setShortcutContext(
537 hotkey_registry.GetShortcutContext(main_window, load_file)); 540 hotkey_registry.GetShortcutContext(main_window, load_file));
538 541
542 ui.action_Load_Amiibo->setShortcut(hotkey_registry.GetKeySequence(main_window, load_amiibo));
543 ui.action_Load_Amiibo->setShortcutContext(
544 hotkey_registry.GetShortcutContext(main_window, load_amiibo));
545
539 ui.action_Exit->setShortcut(hotkey_registry.GetKeySequence(main_window, exit_yuzu)); 546 ui.action_Exit->setShortcut(hotkey_registry.GetKeySequence(main_window, exit_yuzu));
540 ui.action_Exit->setShortcutContext(hotkey_registry.GetShortcutContext(main_window, exit_yuzu)); 547 ui.action_Exit->setShortcutContext(hotkey_registry.GetShortcutContext(main_window, exit_yuzu));
541 548
549 ui.action_Restart->setShortcut(hotkey_registry.GetKeySequence(main_window, restart_emulation));
550 ui.action_Restart->setShortcutContext(
551 hotkey_registry.GetShortcutContext(main_window, restart_emulation));
552
542 ui.action_Stop->setShortcut(hotkey_registry.GetKeySequence(main_window, stop_emulation)); 553 ui.action_Stop->setShortcut(hotkey_registry.GetKeySequence(main_window, stop_emulation));
543 ui.action_Stop->setShortcutContext( 554 ui.action_Stop->setShortcutContext(
544 hotkey_registry.GetShortcutContext(main_window, stop_emulation)); 555 hotkey_registry.GetShortcutContext(main_window, stop_emulation));
@@ -553,6 +564,11 @@ void GMainWindow::InitializeHotkeys() {
553 ui.action_Show_Status_Bar->setShortcutContext( 564 ui.action_Show_Status_Bar->setShortcutContext(
554 hotkey_registry.GetShortcutContext(main_window, toggle_status_bar)); 565 hotkey_registry.GetShortcutContext(main_window, toggle_status_bar));
555 566
567 ui.action_Capture_Screenshot->setShortcut(
568 hotkey_registry.GetKeySequence(main_window, capture_screenshot));
569 ui.action_Capture_Screenshot->setShortcutContext(
570 hotkey_registry.GetShortcutContext(main_window, capture_screenshot));
571
556 connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load File"), this), 572 connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load File"), this),
557 &QShortcut::activated, this, &GMainWindow::OnMenuLoadFile); 573 &QShortcut::activated, this, &GMainWindow::OnMenuLoadFile);
558 connect( 574 connect(
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index 21f422500..581a10ddc 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -98,6 +98,7 @@
98 <addaction name="action_Display_Dock_Widget_Headers"/> 98 <addaction name="action_Display_Dock_Widget_Headers"/>
99 <addaction name="action_Show_Filter_Bar"/> 99 <addaction name="action_Show_Filter_Bar"/>
100 <addaction name="action_Show_Status_Bar"/> 100 <addaction name="action_Show_Status_Bar"/>
101 <addaction name="separator"/>
101 <addaction name="menu_View_Debugging"/> 102 <addaction name="menu_View_Debugging"/>
102 </widget> 103 </widget>
103 <widget class="QMenu" name="menu_Tools"> 104 <widget class="QMenu" name="menu_Tools">