From 226b6888d61fa5bf21e7d796017cadcf38103a98 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sat, 12 May 2018 03:56:10 +0200 Subject: [PATCH] Qt: Implement "Reset" hotkey --- Source/Core/DolphinQt2/HotkeyScheduler.cpp | 4 ++++ Source/Core/DolphinQt2/HotkeyScheduler.h | 1 + Source/Core/DolphinQt2/MainWindow.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.cpp b/Source/Core/DolphinQt2/HotkeyScheduler.cpp index e94e1489e1..543d78fa61 100644 --- a/Source/Core/DolphinQt2/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt2/HotkeyScheduler.cpp @@ -165,6 +165,10 @@ void HotkeyScheduler::Run() if (IsHotkey(HK_STOP)) emit StopHotkey(); + // Reset + if (IsHotkey(HK_RESET)) + emit ResetHotkey(); + // Frameskipping HandleFrameskipHotkeys(); diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.h b/Source/Core/DolphinQt2/HotkeyScheduler.h index e8e8c6602a..3d2a9741a3 100644 --- a/Source/Core/DolphinQt2/HotkeyScheduler.h +++ b/Source/Core/DolphinQt2/HotkeyScheduler.h @@ -27,6 +27,7 @@ signals: void ExitHotkey(); void FullScreenHotkey(); void StopHotkey(); + void ResetHotkey(); void TogglePauseHotkey(); void ScreenShotHotkey(); void SetStateSlotHotkey(int slot); diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 3b0e796735..577f58c655 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -342,6 +342,7 @@ void MainWindow::ConnectHotkeys() connect(m_hotkey_scheduler, &HotkeyScheduler::ExitHotkey, this, &MainWindow::close); connect(m_hotkey_scheduler, &HotkeyScheduler::TogglePauseHotkey, this, &MainWindow::TogglePause); connect(m_hotkey_scheduler, &HotkeyScheduler::StopHotkey, this, &MainWindow::RequestStop); + connect(m_hotkey_scheduler, &HotkeyScheduler::ResetHotkey, this, &MainWindow::Reset); connect(m_hotkey_scheduler, &HotkeyScheduler::ScreenShotHotkey, this, &MainWindow::ScreenShot); connect(m_hotkey_scheduler, &HotkeyScheduler::FullScreenHotkey, this, &MainWindow::FullScreen); @@ -351,7 +352,6 @@ void MainWindow::ConnectHotkeys() &MainWindow::StateSaveSlot); connect(m_hotkey_scheduler, &HotkeyScheduler::SetStateSlotHotkey, this, &MainWindow::SetStateSlot); - connect(m_hotkey_scheduler, &HotkeyScheduler::StartRecording, this, &MainWindow::OnStartRecording); connect(m_hotkey_scheduler, &HotkeyScheduler::ExportRecording, this,