ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7198 from spycrab/qt_hotkey_fixes 

Qt/Hotkeys: Various fixes
This commit is contained in:
spycrab 2018-07-02 00:15:22 +02:00 committed by GitHub
parent 9cfcbfacbe b5141ca6ce
commit 87c5d00e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,6 +483,12 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_UNDO_SAVE_STATE)) if (IsHotkey(HK_UNDO_SAVE_STATE))
emit StateSaveUndo(); emit StateSaveUndo();
if (IsHotkey(HK_LOAD_STATE_FILE))
emit StateLoadFile();
if (IsHotkey(HK_SAVE_STATE_FILE))
emit StateSaveFile();
} }
} }

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

@ -38,6 +38,8 @@ signals:
void StateSaveSlot(int state); void StateSaveSlot(int state);
void StateLoadLastSaved(int state); void StateLoadLastSaved(int state);
void StateSaveOldest(); void StateSaveOldest();
void StateLoadFile();
void StateSaveFile();
void StateLoadUndo(); void StateLoadUndo();
void StateSaveUndo(); void StateSaveUndo();
void StartRecording(); void StartRecording();

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

@ -413,6 +413,8 @@ void MainWindow::ConnectHotkeys()
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveUndo, this, &MainWindow::StateSaveUndo); connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveUndo, this, &MainWindow::StateSaveUndo);
connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveOldest, this, connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveOldest, this,
&MainWindow::StateSaveOldest); &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, connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlotHotkey, this,
&MainWindow::StateLoadSlot); &MainWindow::StateLoadSlot);
@ -1012,6 +1014,10 @@ void MainWindow::SetStateSlot(int slot)
{ {
Settings::Instance().SetStateSlot(slot); Settings::Instance().SetStateSlot(slot);
m_state_slot = 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) void MainWindow::PerformOnlineUpdate(const std::string& region)