summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2015-07-12 04:04:35 +0200
committerAdmiral H. Curtiss <pikachu025@gmail.com>2015-10-10 22:20:05 +0200
commit429f4ea158236174a4c0892b034c2b336ff8c0ee (patch)
treec845e65ada099394abc791dc138fe09f09bbf8c6 /Source/Core
parent16272f49750699a06937defea5d7ee140eed1ac1 (diff)
SaveState/DolphinWX: Display time and date of savestate next to the load/save/select slot menu options.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/State.cpp2
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp11
2 files changed, 8 insertions, 5 deletions
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 4aaa63dff9..f239521882 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -17,6 +17,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
+#include "Core/Host.h"
#include "Core/Movie.h"
#include "Core/State.h"
#include "Core/HW/CPU.h"
@@ -373,6 +374,7 @@ static void CompressAndDumpState(CompressAndDumpState_args save_args)
}
Core::DisplayMessage(StringFromFormat("Saved State to %s", filename.c_str()), 2000);
+ Host_UpdateMainFrame();
}
void SaveAs(const std::string& filename, bool wait)
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index a74ce4645f..d5e80860c5 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -462,8 +462,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_LOAD_STATE_SLOT_8:
case HK_LOAD_STATE_SLOT_9:
case HK_LOAD_STATE_SLOT_10:
- Label = wxString::Format(_("Slot %i"),
- Id - HK_LOAD_STATE_SLOT_1 + 1);
+ Label = wxString::Format(_("Slot %i - %s"),
+ Id - HK_LOAD_STATE_SLOT_1 + 1, State::GetInfoStringOfSlot(Id - HK_LOAD_STATE_SLOT_1 + 1).c_str());
break;
case HK_SAVE_STATE_SLOT_1:
@@ -476,8 +476,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_SAVE_STATE_SLOT_8:
case HK_SAVE_STATE_SLOT_9:
case HK_SAVE_STATE_SLOT_10:
- Label = wxString::Format(_("Slot %i"),
- Id - HK_SAVE_STATE_SLOT_1 + 1);
+ Label = wxString::Format(_("Slot %i - %s"),
+ Id - HK_SAVE_STATE_SLOT_1 + 1, State::GetInfoStringOfSlot(Id - HK_SAVE_STATE_SLOT_1 + 1).c_str());
break;
case HK_SAVE_STATE_FILE:
Label = _("Save State...");
@@ -522,7 +522,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_SELECT_STATE_SLOT_8:
case HK_SELECT_STATE_SLOT_9:
case HK_SELECT_STATE_SLOT_10:
- Label = wxString::Format(_("Select Slot %i"), Id - HK_SELECT_STATE_SLOT_1 + 1);
+ Label = wxString::Format(_("Select Slot %i - %s"),
+ Id - HK_SELECT_STATE_SLOT_1 + 1, State::GetInfoStringOfSlot(Id - HK_SELECT_STATE_SLOT_1 + 1).c_str());
break;