mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 03:22:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6883 from spycrab/qt_fix_hk_state

Browse Source 
Qt/HotkeyScheduler: Fix state loading
This commit is contained in:
spycrab 2018-05-17 22:08:57 +02:00 committed by GitHub
commit 0b5d29a347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinQt2/HotkeyScheduler.cpp
View File

@ -446,25 +446,25 @@ void HotkeyScheduler::Run()
for (u32 i = 0; i < State::NUM_STATES; i++) for (u32 i = 0; i < State::NUM_STATES; i++)
{ {
if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i)) if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i))
State::Load(i + 1); emit StateLoadSlot(i + 1);
if (IsHotkey(HK_SAVE_STATE_SLOT_1 + i)) if (IsHotkey(HK_SAVE_STATE_SLOT_1 + i))
State::Save(i + 1); emit StateSaveSlot(i + 1);
if (IsHotkey(HK_LOAD_LAST_STATE_1 + i)) if (IsHotkey(HK_LOAD_LAST_STATE_1 + i))
State::LoadLastSaved(i + 1); emit StateLoadLastSaved(i + 1);
if (IsHotkey(HK_SELECT_STATE_SLOT_1 + i)) if (IsHotkey(HK_SELECT_STATE_SLOT_1 + i))
emit SetStateSlotHotkey(i + 1); emit SetStateSlotHotkey(i + 1);
} }
if (IsHotkey(HK_SAVE_FIRST_STATE)) if (IsHotkey(HK_SAVE_FIRST_STATE))
State::SaveFirstSaved(); emit StateSaveOldest();
if (IsHotkey(HK_UNDO_LOAD_STATE)) if (IsHotkey(HK_UNDO_LOAD_STATE))
State::UndoLoadState(); emit StateLoadUndo();
if (IsHotkey(HK_UNDO_SAVE_STATE)) if (IsHotkey(HK_UNDO_SAVE_STATE))
State::UndoSaveState(); emit StateSaveUndo();
} }
} }

6
Source/Core/DolphinQt2/HotkeyScheduler.h
View File

@ -33,6 +33,12 @@ signals:
void SetStateSlotHotkey(int slot); void SetStateSlotHotkey(int slot);
void StateLoadSlotHotkey(); void StateLoadSlotHotkey();
void StateSaveSlotHotkey(); void StateSaveSlotHotkey();
void StateLoadSlot(int state);
void StateSaveSlot(int state);
void StateLoadLastSaved(int state);
void StateSaveOldest();
void StateLoadUndo();
void StateSaveUndo();
void StartRecording(); void StartRecording();
void ExportRecording(); void ExportRecording();
void ToggleReadOnlyMode(); void ToggleReadOnlyMode();

14
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -364,6 +364,15 @@ void MainWindow::ConnectHotkeys()
connect(m_hotkey_scheduler, &HotkeyScheduler::ScreenShotHotkey, this, &MainWindow::ScreenShot); connect(m_hotkey_scheduler, &HotkeyScheduler::ScreenShotHotkey, this, &MainWindow::ScreenShot);
connect(m_hotkey_scheduler, &HotkeyScheduler::FullScreenHotkey, this, &MainWindow::FullScreen); connect(m_hotkey_scheduler, &HotkeyScheduler::FullScreenHotkey, this, &MainWindow::FullScreen);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlot, this, &MainWindow::StateLoadSlotAt);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveSlot, this, &MainWindow::StateSaveSlotAt);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadLastSaved, this,
&MainWindow::StateLoadLastSavedAt);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadUndo, this, &MainWindow::StateLoadUndo);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveUndo, this, &MainWindow::StateSaveUndo);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveOldest, this,
&MainWindow::StateSaveOldest);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlotHotkey, this, connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlotHotkey, this,
&MainWindow::StateLoadSlot); &MainWindow::StateLoadSlot);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveSlotHotkey, this, connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveSlotHotkey, this,
@ -898,6 +907,11 @@ void MainWindow::StateLoadSlotAt(int slot)
State::Load(slot); State::Load(slot);
} }
void MainWindow::StateLoadLastSavedAt(int slot)
{
State::LoadLastSaved(slot);
}
void MainWindow::StateSaveSlotAt(int slot) void MainWindow::StateSaveSlotAt(int slot)
{ {
State::Save(slot, true); State::Save(slot, true);

1
Source/Core/DolphinQt2/MainWindow.h
View File

@ -83,6 +83,7 @@ private:
void StateSaveSlot(); void StateSaveSlot();
void StateLoadSlotAt(int slot); void StateLoadSlotAt(int slot);
void StateSaveSlotAt(int slot); void StateSaveSlotAt(int slot);
void StateLoadLastSavedAt(int slot);
void StateLoadUndo(); void StateLoadUndo();
void StateSaveUndo(); void StateSaveUndo();
void StateSaveOldest(); void StateSaveOldest();