Permalink
Browse files

Merge pull request #7198 from spycrab/qt_hotkey_fixes

Qt/Hotkeys: Various fixes
  • Loading branch information...
spycrab committed Jul 1, 2018
2 parents 9cfcbfa + b5141ca commit 87c5d00e2085090e51c1d44e4fd271437123c722
@@ -483,6 +483,12 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_UNDO_SAVE_STATE))
emit StateSaveUndo();
if (IsHotkey(HK_LOAD_STATE_FILE))
emit StateLoadFile();
if (IsHotkey(HK_SAVE_STATE_FILE))
emit StateSaveFile();
}
}
@@ -38,6 +38,8 @@ class HotkeyScheduler : public QObject
void StateSaveSlot(int state);
void StateLoadLastSaved(int state);
void StateSaveOldest();
void StateLoadFile();
void StateSaveFile();
void StateLoadUndo();
void StateSaveUndo();
void StartRecording();
@@ -413,6 +413,8 @@ void MainWindow::ConnectHotkeys()
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveUndo, this, &MainWindow::StateSaveUndo);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveOldest, this,
&MainWindow::StateSaveOldest);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveFile, this, &MainWindow::StateSave);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadFile, this, &MainWindow::StateLoad);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlotHotkey, this,
&MainWindow::StateLoadSlot);
@@ -1012,6 +1014,10 @@ void MainWindow::SetStateSlot(int slot)
{
Settings::Instance().SetStateSlot(slot);
m_state_slot = slot;
Core::DisplayMessage(StringFromFormat("Selected slot %d - %s", m_state_slot,
State::GetInfoStringOfSlot(m_state_slot, false).c_str()),
2500);
}
void MainWindow::PerformOnlineUpdate(const std::string& region)

0 comments on commit 87c5d00

Please sign in to comment.