Added order-by to save list

Author: Causeless

Menus/SaveLoadMenuGUI.cpp

@@ -13,6 +13,7 @@
 #include "GUIButton.h"
 #include "GUIListBox.h"
 #include "GUITextBox.h"
+#include "GUIComboBox.h"
 
 namespace RTE {
 
@@ -32,6 +33,12 @@ namespace RTE {
 		saveGameMenuBox->CenterInParent(true, true);
 		saveGameMenuBox->SetPositionAbs(saveGameMenuBox->GetXPos(), (rootBox->GetHeight() < 540) ? saveGameMenuBox->GetYPos() - 15 : 140);
 
+		m_OrderByComboBox = dynamic_cast<GUIComboBox*>(m_GUIControlManager->GetControl("ComboOrderBy"));
+		m_OrderByComboBox->AddItem("Name");
+		m_OrderByComboBox->AddItem("Date");
+		m_OrderByComboBox->AddItem("Activity");
+		m_OrderByComboBox->SetSelectedIndex(1); //order by Date by default
+
 		m_BackToMainButton = dynamic_cast<GUIButton *>(m_GUIControlManager->GetControl("ButtonBackToMainMenu"));
 
 		if (createForPauseMenu) {
@@ -107,7 +114,14 @@ namespace RTE {
 
 	void SaveLoadMenuGUI::UpdateSaveGamesGUIList()
 	{
-		std::sort(m_SaveGames.begin(), m_SaveGames.end());
+		const std::string& currentOrder = m_OrderByComboBox->GetSelectedItem()->m_Name;
+		if (currentOrder == "Name") {
+			std::stable_sort(m_SaveGames.begin(), m_SaveGames.end(), [](const SaveRecord& lhs, const SaveRecord& rhs) { return lhs.SavePath.stem().string() < rhs.SavePath.stem().string(); });
+		} else if (currentOrder == "Date") {
+			std::stable_sort(m_SaveGames.begin(), m_SaveGames.end(), [](const SaveRecord& lhs, const SaveRecord& rhs) { return lhs.SaveDate > rhs.SaveDate; });
+		} else if (currentOrder == "Activity") {
+			std::stable_sort(m_SaveGames.begin(), m_SaveGames.end(), [](const SaveRecord& lhs, const SaveRecord& rhs) { return lhs.Activity < rhs.Activity; });
+		}
 
 		m_SaveGamesListBox->ClearList();
 		for (int i = 0; i < m_SaveGames.size(); i++) {
@@ -181,6 +195,10 @@ namespace RTE {
 					//m_DescriptionLabel->SetText(record.GetDisplayString());
 					m_SaveGameName->SetText(record.SavePath.stem().string());
 				}
+
+				if (guiEvent.GetControl() == m_OrderByComboBox && guiEvent.GetMsg() == GUIComboBox::Closed) {
+					UpdateSaveGamesGUIList();
+				}
 			}
 		}
 		return false;

Menus/SaveLoadMenuGUI.h

@@ -12,6 +12,7 @@ namespace RTE {
 	class GUIButton;
 	class GUIListBox;
 	class GUITextBox;
+	class GUIComboBox;
 
 	/// <summary>
 	/// Integrated savegame user interface composition and handling.
@@ -52,8 +53,6 @@ namespace RTE {
 			std::filesystem::file_time_type SaveDate; //!< Last modified date.
 			std::string Activity; //!< The activity name.
 			std::string Scene; //!< The scene name.
-
-			bool operator<(const SaveRecord &rhs) const { return SaveDate > rhs.SaveDate; }
 		};
 
 		std::unique_ptr<GUIControlManager> m_GUIControlManager; //!< The GUIControlManager which holds all the GUIControls of the SaveLoadMenuGUI.
@@ -70,7 +69,8 @@ namespace RTE {
 		GUIButton *m_LoadButton;
 		GUIButton *m_CreateButton;
 		GUIListBox *m_SaveGamesListBox;
-		GUILabel *m_DescriptionLabel;
+		GUILabel* m_DescriptionLabel;
+		GUIComboBox *m_OrderByComboBox;
 
 #pragma region Mod and Script Handling
 		/// <summary>