Ticket #4413: 4413_load.patch

binaries/data/mods/public/gui/common/functions_utility_loadsave.js

@@ -3 +3 @@
     return b.metadata.time - a.metadata.time;
 }
 
-function generateLabel(metadata, engineInfo)
+function generateDateString(metadata, engineInfo)
 {
     let dateTimeString = Engine.FormatMillisecondsIntoDateString(metadata.time*1000, translate("yyyy-MM-dd HH:mm:ss"));
     let dateString = sprintf(translate("\\[%(date)s]"), { "date": dateTimeString });
@@ -16 +16 @@
             dateString = "[color=\"orange\"]" + dateString + "[/color]";
     }
 
+    return dateString;
+}
+
+function generateLabel(metadata, engineInfo)
+{
     return sprintf(
         metadata.description ?
             translate("%(dateString)s %(map)s - %(description)s") :
             translate("%(dateString)s %(map)s"),
         {
-            "dateString": dateString,
+            "dateString": generateDateString(metadata, engineInfo),
             "map": metadata.initAttributes.map,
             "description": metadata.description || ""
         }

binaries/data/mods/public/gui/savedgames/load.js

@@ -8 +8 @@
 function init()
 {
     let gameSelection = Engine.GetGUIObjectByName("gameSelection");
-    let savedGames = Engine.GetSavedGames().sort(sortDecreasingDate);
+    let savedGames = Engine.GetSavedGames();
     gameSelection.enabled = !!savedGames.length;
     if (!savedGames.length)
     {
-        gameSelection.list = [translate("No saved games found")];
+        Engine.GetGUIObjectByName("gameSelectionFeedback").hidden = false;
         gameSelection.selected = -1;
         return;
     }
 
+    g_SavedGamesMetadata = savedGames.map(game =>
+    {
+        let metadata = game.metadata;
+        metadata["id"] = game.id;
+        return metadata;
+    });
+
+    displayList();
+
+    Engine.GetGUIObjectByName("deleteGameButton").tooltip = deleteTooltip();
+}
+
+function displayList()
+{
+    let gameSelection = Engine.GetGUIObjectByName("gameSelection");
+
     // Get current game version and loaded mods
     let engineInfo = Engine.GetEngineInfo();
 
-    g_SavedGamesMetadata = savedGames.map(game => game.metadata);
+    let selectedGameId = gameSelection.list_data[gameSelection.selected];
+    const sortKey = gameSelection.selected_column;
+    const sortOrder = gameSelection.selected_column_order;
+    g_SavedGamesMetadata = g_SavedGamesMetadata.sort((a, b) =>
+    {
+        let cmpA, cmpB;
+        switch (sortKey)
+        {
+        case 'date':
+            cmpA = +a.time;
+            cmpB = +b.time;
+            break;
+        case 'mapName':
+            cmpA = translate(a.initAttributes.settings.Name);
+            cmpB = translate(b.initAttributes.settings.Name);
+            break;
+        case 'mapType':
+            cmpA = translateMapType(a.initAttributes.mapType);
+            cmpB = translateMapType(b.initAttributes.mapType);
+            break;
+        case 'description':
+            cmpA = a.description;
+            cmpB = b.description;
+            break;
+        }
+        
+        if (cmpA < cmpB)
+            return -sortOrder;
+        else if (cmpA > cmpB)
+            return +sortOrder;
 
-    gameSelection.list = savedGames.map(game => generateLabel(game.metadata, engineInfo));
-    gameSelection.list_data = savedGames.map(game => game.id);
+        return 0;
+    });
+    
+    let list = g_SavedGamesMetadata.map(metadata => {
+        return {
+            "date": generateDateString(metadata, engineInfo),
+            "mapName": translate(metadata.initAttributes.settings.Name),
+            "mapType": translateMapType(metadata.initAttributes.mapType),
+            "description": metadata.description
+        };
+    });
 
+    if (list.length)
+        list = prepareForDropdown(list);
+
+    gameSelection.list_date = list.date || [];
+    gameSelection.list_mapName = list.mapName || [];
+    gameSelection.list_mapType = list.mapType || [];
+    gameSelection.list_description = list.description || [];
+
+    // Change these last, otherwise crash
+    gameSelection.list = g_SavedGamesMetadata.map(metadata => generateLabel(metadata, engineInfo));
+    gameSelection.list_data = g_SavedGamesMetadata.map(metadata => metadata.id);
+
     if (gameSelection.selected == -1)
         gameSelection.selected = 0;
-    else if (gameSelection.selected >= savedGames.length) // happens when deleting the last saved game
-        gameSelection.selected = savedGames.length - 1;
+    else if (gameSelection.selected >= g_SavedGamesMetadata.length) // happens when deleting the last saved game
+        gameSelection.selected = g_SavedGamesMetadata.length - 1;
     else
-        selectionChanged();
-
-    Engine.GetGUIObjectByName("deleteGameButton").tooltip = deleteTooltip();
+        gameSelection.selected = g_SavedGamesMetadata.findIndex(metadata => metadata.id == selectedGameId);
 }
 
 function selectionChanged()

binaries/data/mods/public/gui/savedgames/load.xml

@@ -21 +21 @@
         </object>
 
         <object type="image" size="0 20 550 100%">
-            <object name="gameSelection" style="ModernList" type="list" size="24 12 100%-24 100%-90">
+            <object name="gameSelection"
+                selected_column="date"
+                selected_column_order="-1"
+                sortable="true"
+                size="24 4 100%-24 100%-90"
+                sprite_asc="ModernArrowDown"
+                sprite_desc="ModernArrowUp"
+                sprite_not_sorted="ModernNotSorted"
+                style="ModernList"
+                type="olist"
+            >
                 <action on="SelectionChange">selectionChanged();</action>
+                <action on="SelectionColumnChange">displayList();</action>
+                <action on="mouseleftdoubleclickitem">loadGame();</action>
+
+                <column id="date" color="255 255 255" width="29%">
+                    <translatableAttribute id="heading" context="replay">Date / Time</translatableAttribute>
+                </column>
+
+                <column id="mapType" color="255 255 255" width="17%">
+                    <translatableAttribute id="heading" context="replay">Map Type</translatableAttribute>
+                </column>
+
+                <column id="mapName" color="255 255 255" width="24%">
+                    <translatableAttribute id="heading" context="replay">Map Name</translatableAttribute>
+                </column>
+
+                <column id="description" color="255 255 255" width="30%">
+                    <translatableAttribute id="heading" context="replay">Description</translatableAttribute>
+                </column>
             </object>
 
+            <object name="gameSelectionFeedback" size="24 12 100%-24 100" type="text" style="ModernLabelText" hidden="true">
+                <translatableAttribute id="caption">No saved games found.</translatableAttribute>
+            </object>
+
             <object type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
                 <translatableAttribute id="caption">Cancel</translatableAttribute>
                 <action on="Press">Engine.PopGuiPage();</action>