Ticket #1090: loadsave-v2.patch

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

@@ -8 +8 @@
     if (!savedGames.length)
     {
         gameSelection.list = [translate("No saved games found")];
-        gameSelection.selected = 0;
+        gameSelection.selected = -1;
+        selectionChanged();
         Engine.GetGUIObjectByName("loadGameButton").enabled = false;
         Engine.GetGUIObjectByName("deleteGameButton").enabled = false;
         return;
@@ -26 +27 @@
         gameSelection.selected = 0;
     else if (gameSelection.selected >= savedGames.length) // happens when deleting the last saved game
         gameSelection.selected = savedGames.length - 1;
+    selectionChanged();
 }
 
+function selectionChanged()
+{
+    let gameSelection = Engine.GetGUIObjectByName("gameSelection");
+    let selectionEmpty = gameSelection.selected == -1;
+    Engine.GetGUIObjectByName("gameInfoLogo").hidden = !selectionEmpty;
+    Engine.GetGUIObjectByName("gameInfoText").hidden = selectionEmpty;
+    Engine.GetGUIObjectByName("gameInfoPreview").hidden = selectionEmpty;
+
+    if (selectionEmpty)
+        return;
+
+    let metadata = g_SavedGamesMetadata[gameSelection.selected];
+    let gameInfoText = Engine.GetGUIObjectByName("gameInfoText");
+    gameInfoText.caption = sprintf(translate(" %(players)s \n %(playedTime)s \n %(mapType)s \n %(victory)s \n %(mods)s"), {
+        "players": translate("Players: ") + (metadata.initAttributes.settings.PlayerData.length - 1),
+        "playedTime": translate("Played time: ") + timeToString(metadata.gui.timeElapsed ? metadata.gui.timeElapsed : 0),
+        "mapType": translate("Map type: ") + translateMapType(metadata.initAttributes.mapType),
+        "victory": translate("Victory: ") + translateVictoryCondition(metadata.initAttributes.settings.GameType),
+        "mods": sprintf(translate("Mods: %(mods)s"), { "mods": metadata.mods.join(translate(", ")) })
+    });
+
+    let mapData = getMapDescriptionAndPreview(metadata.initAttributes.mapType, metadata.initAttributes.map);
+    setMapPreviewImage("gameInfoPreview", mapData.preview);
+}
+
 function loadGame()
 {
     var gameSelection = Engine.GetGUIObjectByName("gameSelection");

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

@@ -4 +4 @@
 
     <script file="gui/common/functions_global_object.js" />
     <script file="gui/common/functions_utility.js" />
+    <script file="gui/common/settings.js" />
     <script file="gui/common/functions_utility_loadsave.js" />
     <script file="gui/savedgames/load.js" />
 
@@ -10 +11 @@
     <!-- Add a translucent black background to fade out the menu page -->
     <object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-    <object type="image" style="ModernDialog" size="50%-300 50%-200 50%+300 50%+200">
+    <object type="image" style="ModernDialog" size="50%-400 50%-250 50%+400 50%+250">
 
         <object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
             <translatableAttribute id="caption">Load Game</translatableAttribute>
         </object>
 
-        <object name="gameSelection"
-            style="ModernList"
-            type="list"
-            size="24 24 100%-24 100%-100">
-        </object>
+        <object type="image" size="0 20 550 100%">
+            <object name="gameSelection"
+                style="ModernList"
+                type="list"
+                size="24 24 100%-24 100%-100">
+                <action on="SelectionChange">selectionChanged();</action>
+            </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>
-        </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>
+            </object>
 
-        <object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-15 100%-32" style="StoneButton" hotkey="session.savedgames.delete">
-            <translatableAttribute id="caption">Delete</translatableAttribute>
-            <action on="Press">
-                if (!this.enabled)
-                    return;
-                if (Engine.HotkeyIsPressed("session.savedgames.noconfirmation"))
-                    deleteGameWithoutConfirmation();
-                else
-                    deleteGame();
-            </action>
+            <object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-15 100%-32" style="StoneButton" hotkey="session.savedgames.delete">
+                <translatableAttribute id="caption">Delete</translatableAttribute>
+                <action on="Press">
+                    if (!this.enabled)
+                        return;
+                    if (Engine.HotkeyIsPressed("session.savedgames.noconfirmation"))
+                        deleteGameWithoutConfirmation();
+                    else
+                        deleteGame();
+                </action>
+            </object>
+
+            <object name="loadGameButton" type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32">
+                <translatableAttribute id="caption">Load</translatableAttribute>
+                <action on="Press">loadGame();</action>
+            </object>
+
         </object>
 
-        <object name="loadGameButton" type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32">
-            <translatableAttribute id="caption">Load</translatableAttribute>
-            <action on="Press">loadGame();</action>
+        <object type="image" size="550 20 100%-20 100%">
+            <object name="gameInfoLogo" size="0 65 220 165" type="image" sprite="logo"/>
+            <object name="gameInfoPreview" size="0 24 220 244"  type="image" sprite=""/>
+            <object name="gameInfoText" type="text" style="ModernLeftLabelText" text_valign="top" size="0 260 100%-20 100%-5" />
         </object>
-
     </object>
 
-    </objects>
+</objects>

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

@@ -14 +14 @@
 
 function init(data)
 {
-    g_SavedGameData = data && data.savedGameData || undefined;
+    g_SavedGameData = data && data.savedGameData || {};
+    g_SavedGameData.timeElapsed = Engine.GuiInterfaceCall("GetSimulationState").timeElapsed;
 
     var gameSelection = Engine.GetGUIObjectByName("gameSelection");
     Engine.GetGUIObjectByName("deleteGameButton").enabled = false;