Permalink
Browse files

Merge pull request #6823 from spycrab/qt_reset_hotkey

Qt: Implement "Reset" hotkey
  • Loading branch information...
leoetlino committed May 12, 2018
2 parents a712cfe + 226b688 commit e78235943eb5ada474f7ec5383f28521feeaf9a4
@@ -165,6 +165,10 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_STOP))
emit StopHotkey();
// Reset
if (IsHotkey(HK_RESET))
emit ResetHotkey();
// Frameskipping
HandleFrameskipHotkeys();
@@ -27,6 +27,7 @@ class HotkeyScheduler : public QObject
void ExitHotkey();
void FullScreenHotkey();
void StopHotkey();
void ResetHotkey();
void TogglePauseHotkey();
void ScreenShotHotkey();
void SetStateSlotHotkey(int slot);
@@ -345,6 +345,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);
@@ -354,7 +355,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,

0 comments on commit e782359

Please sign in to comment.