From 32382438bee66c49c85c0595c135286b325bb467 Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Sun, 1 Jul 2018 16:14:29 +0200
Subject: [PATCH 1/2] Qt/Hotkeys: Implement "Load from File" / "Save from File"
 hotkeys

---
 Source/Core/DolphinQt2/HotkeyScheduler.cpp | 6 ++++++
 Source/Core/DolphinQt2/HotkeyScheduler.h   | 2 ++
 Source/Core/DolphinQt2/MainWindow.cpp      | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.cpp b/Source/Core/DolphinQt2/HotkeyScheduler.cpp
index 49dc69dd67..8ce14c6cd2 100644
--- a/Source/Core/DolphinQt2/HotkeyScheduler.cpp
+++ b/Source/Core/DolphinQt2/HotkeyScheduler.cpp
@@ -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();
   }
 }
 
diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.h b/Source/Core/DolphinQt2/HotkeyScheduler.h
index f4ea514534..673f6fcab7 100644
--- a/Source/Core/DolphinQt2/HotkeyScheduler.h
+++ b/Source/Core/DolphinQt2/HotkeyScheduler.h
@@ -38,6 +38,8 @@ signals:
   void StateSaveSlot(int state);
   void StateLoadLastSaved(int state);
   void StateSaveOldest();
+  void StateLoadFile();
+  void StateSaveFile();
   void StateLoadUndo();
   void StateSaveUndo();
   void StartRecording();
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index 762ef125f7..f5c29753ba 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -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);

From b5141ca6cecf4995130eff35a99e4372c7a11ba8 Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Sun, 1 Jul 2018 16:30:12 +0200
Subject: [PATCH 2/2] Qt/Hotkeys: Show OSD message when selecting slots

---
 Source/Core/DolphinQt2/MainWindow.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index f5c29753ba..b81b60b83a 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -1014,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)