Ticket #3742: restore_selection_v1.patch

binaries/data/mods/public/gui/replaymenu/replay_actions.js

@@ -33 +33 @@
             }
         },
         "savedGUIData": "",
-        "isReplay" : true
+        "isReplay" : true,
+        "replayMenuData" : {
+            "selectedDirectory" : replayDirectory, 
+            "selectedColumn" : Engine.GetGUIObjectByName("replaySelection").selected_column,
+            "selectedColumnOrder" : Engine.GetGUIObjectByName("replaySelection").selected_column_order,
+            "selectedFilters" : {
+                "date" : Engine.GetGUIObjectByName("dateTimeFilter").selected,
+                "playernames" : Engine.GetGUIObjectByName("playersFilter").caption,
+                "mapName" : Engine.GetGUIObjectByName("mapNameFilter").selected,
+                "mapSize" : Engine.GetGUIObjectByName("mapSizeFilter").selected,
+                "popCap" : Engine.GetGUIObjectByName("populationFilter").selected,
+                "duration" : Engine.GetGUIObjectByName("durationFilter").selected
+            }
+        }
     });
 }
 
@@ -79 +92 @@
     // Open summary screen
     summary.isReplay = true;
     summary.gameResult = translate("Scores at the end of the game.");
-    summary.replayDirectory = g_ReplaysFiltered[selected].directory;
+    summary.replayMenuData = {
+        "selectedDirectory" : g_ReplaysFiltered[selected].directory, 
+        "selectedColumn" : Engine.GetGUIObjectByName("replaySelection").selected_column,
+        "selectedColumnOrder" : Engine.GetGUIObjectByName("replaySelection").selected_column_order,
+        "selectedFilters" : {
+            "date" : Engine.GetGUIObjectByName("dateTimeFilter").selected,
+            "playernames" : Engine.GetGUIObjectByName("playersFilter").caption,
+            "mapName" : Engine.GetGUIObjectByName("mapNameFilter").selected,
+            "mapSize" : Engine.GetGUIObjectByName("mapSizeFilter").selected,
+            "popCap" : Engine.GetGUIObjectByName("populationFilter").selected,
+            "duration" : Engine.GetGUIObjectByName("durationFilter").selected
+        }
+    };
     Engine.SwitchGuiPage("page_summary.xml", summary);
 }
 

binaries/data/mods/public/gui/replaymenu/replay_menu.js

@@ -41 +41 @@
 /**
  * Initializes globals, loads replays and displays the list.
  */
-function init()
+function init(data)
 {
+    if (data && data.replayMenuData)
+        {
+            g_selectedReplayDirectory = data.replayMenuData.selectedDirectory;
+            Engine.GetGUIObjectByName("dateTimeFilter").selected = data.replayMenuData.selectedFilters.date;
+            Engine.GetGUIObjectByName("playersFilter").caption = data.replayMenuData.selectedFilters.playernames;
+            Engine.GetGUIObjectByName("mapNameFilter").selected = data.replayMenuData.selectedFilters.mapName;
+            Engine.GetGUIObjectByName("mapSizeFilter").selected = data.replayMenuData.selectedFilters.mapSize;
+            Engine.GetGUIObjectByName("populationFilter").selected = data.replayMenuData.selectedFilters.popCap;
+            Engine.GetGUIObjectByName("durationFilter").selected = data.replayMenuData.selectedFilters.duration;
+            Engine.GetGUIObjectByName("replaySelection").selected_column = data.replayMenuData.selectedColumn;
+            Engine.GetGUIObjectByName("replaySelection").selected_column_order = data.replayMenuData.selectedColumnOrder;
+        }
+
     if (!g_Settings)
     {
         Engine.SwitchGuiPage("page_pregame.xml");

binaries/data/mods/public/gui/session/session.js

@@ -64 +64 @@
  **/
 var g_CivData = {};
 
+/**
+* For restoring selection, order, filters when returning to the replay menu
+**/
+var g_ReplayMenuData;
+
 var g_PlayerAssignments = { "local": { "name": translate("You"), "player": 1 } };
 
 /**
@@ -213 +218 @@
         g_PlayerAssignments = initData.playerAssignments;
         g_MatchID = initData.attribs.matchID;
 
+        g_ReplayMenuData = initData.replayMenuData;
+
         // Cache the player data
         // (This may be updated at runtime by handleNetMessage)
         g_Players = getPlayerData(g_PlayerAssignments);
@@ -473 +480 @@
         Engine.SaveReplayMetadata(JSON.stringify(summary));
 
     summary.replayDirectory = Engine.GetCurrentReplayDirectory();
+    summary.replayMenuData = g_ReplayMenuData;
 
     Engine.EndGame();
 

binaries/data/mods/public/gui/summary/summary.js

@@ -134 +134 @@
     if (Engine.HasXmppClient())
         Engine.StopXmppClient();
 
-    Engine.StartVisualReplay(g_GameData.replayDirectory);
+    Engine.StartVisualReplay(g_GameData.replayMenuData.selectedDirectory);
     Engine.SwitchGuiPage("page_loading.xml", {
-        "attribs": Engine.GetReplayAttributes(g_GameData.replayDirectory),
+        "attribs": Engine.GetReplayAttributes(g_GameData.replayMenuData.selectedDirectory),
         "isNetworked" : false,
         "playerAssignments": {
             "local" : {
@@ -145 +145 @@
             }
         },
         "savedGUIData": "",
-        "isReplay" : true
+        "isReplay" : true,
+        "replayMenuData" : g_GameData.replayMenuData,
     });
 }
 
@@ -159 +160 @@
     Engine.GetGUIObjectByName("timeElapsed").caption = sprintf(translate("Game time elapsed: %(time)s"), { "time": timeToString(data.timeElapsed) });
     Engine.GetGUIObjectByName("summaryText").caption = data.gameResult;
     Engine.GetGUIObjectByName("mapName").caption = sprintf(translate("%(mapName)s - %(mapType)s"), { "mapName": translate(data.mapSettings.Name), "mapType": mapSize ? mapSize.LongName : (mapType ? mapType.Title : "") });
-    Engine.GetGUIObjectByName("replayButton").hidden = g_GameData.isInGame || !g_GameData.replayDirectory;
+    Engine.GetGUIObjectByName("replayButton").hidden = g_GameData.isInGame || !g_GameData.replayMenuData.selectedDirectory;
 
     // Panels
     g_PlayerCount = data.playerStates.length - 1;

binaries/data/mods/public/gui/summary/summary.xml

@@ -187 +187 @@
                 }
                 else if (g_GameData.isReplay)
                 {
-                    Engine.SwitchGuiPage("page_replaymenu.xml");
+                    Engine.SwitchGuiPage("page_replaymenu.xml",{"replayMenuData" : g_GameData.replayMenuData});
                 }
                 else if (!Engine.HasXmppClient())
                 {