Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/summary.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/summary.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/summary.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/summary.png	(revision 17423)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/summary.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 17422)
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 17423)
@@ -1,722 +1,742 @@
 const PAUSE = translate("Pause");
 const RESUME = translate("Resume");
 
 /*
  * MENU POSITION CONSTANTS
 */
 
 // Menu / panel border size
 const MARGIN = 4;
 
 // Includes the main menu button
 const NUM_BUTTONS = 8;
 
 // Regular menu buttons
 const BUTTON_HEIGHT = 32;
 
 // The position where the bottom of the menu will end up (currently 228)
 const END_MENU_POSITION = (BUTTON_HEIGHT * NUM_BUTTONS) + MARGIN;
 
 // Menu starting position: bottom
 const MENU_BOTTOM = 0;
 
 // Menu starting position: top
 const MENU_TOP = MENU_BOTTOM - END_MENU_POSITION;
 
 // Menu starting position: overall
 const INITIAL_MENU_POSITION = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM;
 
 // Number of pixels per millisecond to move
 const MENU_SPEED = 1.2;
 
 // Trade menu: available resources and step for probability changes
 const RESOURCES = ["food", "wood", "stone", "metal"];
 const STEP = 5;
 
 var isMenuOpen = false;
 var menu;
 
 var isDiplomacyOpen = false;
 var isTradeOpen = false;
 
 // Redefined every time someone makes a tribute (so we can save some data in a closure). Called in input.js handleInputBeforeGui.
 var flushTributing = function() {};
 
 // Ignore size defined in XML and set the actual menu size here
 function initMenuPosition()
 {
 	menu = Engine.GetGUIObjectByName("menu");
 	menu.size = INITIAL_MENU_POSITION;
 }
 
 
 // =============================================================================
 // Overall Menu
 // =============================================================================
 //
 // Slide menu
 function updateMenuPosition(dt)
 {
 	if (isMenuOpen)
 	{
 		var maxOffset = END_MENU_POSITION - menu.size.bottom;
 		if (maxOffset > 0)
 		{
 			var offset = Math.min(MENU_SPEED * dt, maxOffset);
 			var size = menu.size;
 			size.top += offset;
 			size.bottom += offset;
 			menu.size = size;
 		}
 	}
 	else
 	{
 		var maxOffset = menu.size.top - MENU_TOP;
 		if (maxOffset > 0)
 		{
 			var offset = Math.min(MENU_SPEED * dt, maxOffset);
 			var size = menu.size;
 			size.top -= offset;
 			size.bottom -= offset;
 			menu.size = size;
 		}
 	}
 }
 
 // Opens the menu by revealing the screen which contains the menu
 function openMenu()
 {
 	isMenuOpen = true;
 }
 
 // Closes the menu and resets position
 function closeMenu()
 {
 	isMenuOpen = false;
 }
 
 function toggleMenu()
 {
 	if (isMenuOpen == true)
 		closeMenu();
 	else
 		openMenu();
 }
 
 // Menu buttons
 // =============================================================================
 function optionsMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openOptions();
 }
 
 function chatMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openChat();
 }
 
 function diplomacyMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openDiplomacy();
 }
 
 function pauseMenuButton()
 {
 	togglePause();
 }
 
 function resignMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	var btCaptions = [translate("No"), translate("Yes")];
 	var btCode = [resumeGame, resignGame];
 	messageBox(400, 200, translate("Are you sure you want to resign?"), translate("Confirmation"), 0, btCaptions, btCode);
 }
 
 function exitMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	if (g_IsNetworked && g_IsController)
 	{
 		var btCode = [resumeGame, leaveGame];
 		var message = translate("Are you sure you want to quit? Leaving will disconnect all other players.");
 	}
 	else if (g_IsNetworked && !g_GameEnded && !g_IsObserver)
 	{
 		var btCode = [resumeGame, networkReturnQuestion];
 		var message = translate("Are you sure you want to quit?");
 	}
 	else
 	{
 		var btCode = [resumeGame, leaveGame];
 		var message = translate("Are you sure you want to quit?");
 	}
 	messageBox(400, 200, message, translate("Confirmation"), 0, [translate("No"), translate("Yes")], btCode);
 }
 
 function networkReturnQuestion()
 {
 	var btCaptions = [translate("I will return"), translate("I resign")];
 	var btCode = [leaveGame, resignGame];
 	var btArgs = [true, false];
 	messageBox(400, 200, translate("Do you want to resign or will you return soon?"), translate("Confirmation"), 0, btCaptions, btCode, btArgs);
 }
 
 function openDeleteDialog(selection)
 {
 	closeMenu();
 	closeOpenDialogs();
 
 	var deleteSelectedEntities = function (selectionArg)
 	{
 		Engine.PostNetworkCommand({"type": "delete-entities", "entities": selectionArg});
 	};
 
 	var btCaptions = [translate("No"), translate("Yes")];
 	var btCode = [resumeGame, deleteSelectedEntities];
 	var btArgs = [null, selection];
 
 	messageBox(400, 200, translate("Destroy everything currently selected?"), translate("Delete"), 0, btCaptions, btCode, btArgs);
 }
 
 // Menu functions
 // =============================================================================
 
 function openSave()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	var savedGameData = getSavedGameData();
 	Engine.PushGuiPage("page_savegame.xml", {"savedGameData":savedGameData, "callback":"resumeGame"});
 }
 
 function openOptions()
 {
 	pauseGame();
 	Engine.PushGuiPage("page_options.xml", {"callback":"resumeGame"});
 }
 
 function openChat()
 {
 	if (g_Disconnected)
 		return;
 
 	updateTeamCheckbox(false);
 
 	Engine.GetGUIObjectByName("chatInput").focus(); // Grant focus to the input area
 	Engine.GetGUIObjectByName("chatDialogPanel").hidden = false;
 }
 
 function closeChat()
 {
 	Engine.GetGUIObjectByName("chatInput").caption = ""; // Clear chat input
 	Engine.GetGUIObjectByName("chatInput").blur(); // Remove focus
 	Engine.GetGUIObjectByName("chatDialogPanel").hidden = true;
 }
 
 function updateTeamCheckbox(check)
 {
 	Engine.GetGUIObjectByName("toggleTeamChatLabel").hidden = g_IsObserver;
 	let toggleTeamChat = Engine.GetGUIObjectByName("toggleTeamChat");
 	toggleTeamChat.hidden = g_IsObserver;
 	toggleTeamChat.checked = !g_IsObserver && check;
 }
 
 function toggleChatWindow(teamChat)
 {
 	if (g_Disconnected)
 		return;
 
 	var chatWindow = Engine.GetGUIObjectByName("chatDialogPanel");
 	var chatInput = Engine.GetGUIObjectByName("chatInput");
 
 	if (chatWindow.hidden)
 		chatInput.focus(); // Grant focus to the input area
 	else
 	{
 		if (chatInput.caption.length)
 		{
 			submitChatInput();
 			return;
 		}
 		chatInput.caption = ""; // Clear chat input
 	}
 
 	updateTeamCheckbox(teamChat);
 	chatWindow.hidden = !chatWindow.hidden;
 }
 
 function setDiplomacy(data)
 {
 	Engine.PostNetworkCommand({"type": "diplomacy", "to": data.to, "player": data.player});
 }
 
 function tributeResource(data)
 {
 	Engine.PostNetworkCommand({"type": "tribute", "player": data.player, "amounts":  data.amounts});
 }
 
 function openDiplomacy()
 {
 	if (isTradeOpen)
 		closeTrade();
 	isDiplomacyOpen = true;
 
 	let we = Engine.GetPlayerID();
 
 	// Get offset for one line
 	let onesize = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size;
 	let rowsize = onesize.bottom - onesize.top;
 
 	// We don't include gaia
 	for (let i = 1; i < g_Players.length; ++i)
 	{
 		// Apply offset
 		let row = Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]");
 		let size = row.size;
 		size.top = rowsize*(i-1);
 		size.bottom = rowsize*i;
 		row.size = size;
 
 		// Set background color
 		let playerColor = rgbToGuiColor(g_Players[i].color);
 		row.sprite = "color: "+playerColor + " 32";
 
 		Engine.GetGUIObjectByName("diplomacyPlayerName["+(i-1)+"]").caption = "[color=\"" + playerColor + "\"]" + g_Players[i].name + "[/color]";
 		Engine.GetGUIObjectByName("diplomacyPlayerCiv["+(i-1)+"]").caption = g_CivData[g_Players[i].civ].Name;
 
 		Engine.GetGUIObjectByName("diplomacyPlayerTeam["+(i-1)+"]").caption = (g_Players[i].team < 0) ? translateWithContext("team", "None") : g_Players[i].team+1;
 
 		if (i != we)
 			Engine.GetGUIObjectByName("diplomacyPlayerTheirs["+(i-1)+"]").caption = (g_Players[i].isAlly[we] ? translate("Ally") : (g_Players[i].isNeutral[we] ? translate("Neutral") : translate("Enemy")));
 
 		// Don't display the options for ourself, or if we or the other player aren't active anymore
 		if (i == we || g_Players[we].state != "active" || g_Players[i].state != "active")
 		{
 			// Hide the unused/unselectable options
 			for each (let a in ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
 				Engine.GetGUIObjectByName("diplomacyPlayer"+a+"["+(i-1)+"]").hidden = true;
 			Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]").hidden = true;
 			continue;
 		}
 
 		// Tribute
 		for each (let resource in ["food", "wood", "stone", "metal"])
 		{
 			let button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+resource[0].toUpperCase()+resource.substring(1)+"["+(i-1)+"]");
 			button.onpress = (function(player, resource, button){
 				// Implement something like how unit batch training works. Shift+click to send 500, shift+click+click to send 1000, etc.
 				// Also see input.js (searching for "INPUT_MASSTRIBUTING" should get all the relevant parts).
 				let multiplier = 1;
 				return function() {
 					let isBatchTrainPressed = Engine.HotkeyIsPressed("session.masstribute");
 					if (isBatchTrainPressed)
 					{
 						inputState = INPUT_MASSTRIBUTING;
 						multiplier += multiplier == 1 ? 4 : 5;
 					}
 					let amounts = {
 						"food": (resource == "food" ? 100 : 0) * multiplier,
 						"wood": (resource == "wood" ? 100 : 0) * multiplier,
 						"stone": (resource == "stone" ? 100 : 0) * multiplier,
 						"metal": (resource == "metal" ? 100 : 0) * multiplier,
 					};
 					button.tooltip = formatTributeTooltip(g_Players[player], resource, amounts[resource]);
 					// This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
 					// evil global variable hackery.
 					flushTributing = function() {
 						tributeResource({"player": player, "amounts": amounts});
 						multiplier = 1;
 						button.tooltip = formatTributeTooltip(g_Players[player], resource, 100);
 					};
 					if (!isBatchTrainPressed)
 						flushTributing();
 				};
 			})(i, resource, button);
 			button.hidden = false;
 			button.tooltip = formatTributeTooltip(g_Players[i], resource, 100);
 		}
 
 		// Attack Request
 		var simState = GetSimState();
 		let button = Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]");
 		button.hidden = simState.ceasefireActive || !(g_Players[i].isEnemy[we]);
 		button.tooltip = translate("Request your allies to attack this enemy");
 		button.onpress = (function(i, we){ return function() {
 			Engine.PostNetworkCommand({"type": "attack-request", "source": we, "target": i});
 		} })(i, we);
 
 		// Skip our own teams on teams locked
 		if (g_Players[we].teamsLocked && g_Players[we].team != -1 && g_Players[we].team == g_Players[i].team)
 			continue;
 
 		// Diplomacy settings
 		// Set up the buttons
 		for each (let setting in ["Ally", "Neutral", "Enemy"])
 		{
 			let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(i-1)+"]");
 
 			button.caption = g_Players[we]["is"+setting][i] ? translate("x") : "";
 			button.onpress = (function(e){ return function() { setDiplomacy(e); } })({"player": i, "to": setting.toLowerCase()});
 			button.hidden = simState.ceasefireActive;
 		}
 	}
 
 	Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
 }
 
 function closeDiplomacy()
 {
 	isDiplomacyOpen = false;
 	Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = true;
 }
 
 function toggleDiplomacy()
 {
 	if (isDiplomacyOpen)
 		closeDiplomacy();
 	else
 		openDiplomacy();
 }
 
 function openTrade()
 {
 	if (isDiplomacyOpen)
 		closeDiplomacy();
 	isTradeOpen = true;
 
 	var updateButtons = function()
 	{
 		for (var res in button)
 		{
 			button[res].label.caption = proba[res] + "%";
 			if (res == selec)
 			{
 				button[res].sel.hidden = false;
 				button[res].up.hidden = true;
 				button[res].dn.hidden = true;
 			}
 			else
 			{
 				button[res].sel.hidden = true;
 				button[res].up.hidden = (proba[res] == 100 || proba[selec] == 0);
 				button[res].dn.hidden = (proba[res] == 0 || proba[selec] == 100);
 			}
 		}
 	};
 
 	var proba = Engine.GuiInterfaceCall("GetTradingGoods");
 	var button = {};
 	var selec = RESOURCES[0];
 	for (var i = 0; i < RESOURCES.length; ++i)
 	{
 		var buttonResource = Engine.GetGUIObjectByName("tradeResource["+i+"]");
 		if (i > 0)
 		{
 			var size = Engine.GetGUIObjectByName("tradeResource["+(i-1)+"]").size;
 			var width = size.right - size.left;
 			size.left += width;
 			size.right += width;
 			Engine.GetGUIObjectByName("tradeResource["+i+"]").size = size;
 		}
 		var resource = RESOURCES[i];
 		proba[resource] = (proba[resource] ? proba[resource] : 0);
 		var buttonResource = Engine.GetGUIObjectByName("tradeResourceButton["+i+"]");
 		var icon = Engine.GetGUIObjectByName("tradeResourceIcon["+i+"]");
 		icon.sprite = "stretched:session/icons/resources/" + resource + ".png";
 		var label = Engine.GetGUIObjectByName("tradeResourceText["+i+"]");
 		var buttonUp = Engine.GetGUIObjectByName("tradeArrowUp["+i+"]");
 		var buttonDn = Engine.GetGUIObjectByName("tradeArrowDn["+i+"]");
 		var iconSel = Engine.GetGUIObjectByName("tradeResourceSelection["+i+"]");
 		button[resource] = { "up": buttonUp, "dn": buttonDn, "label": label, "sel": iconSel };
 
 		buttonResource.onpress = (function(resource){
 			return function() {
 				if (Engine.HotkeyIsPressed("session.fulltradeswap"))
 				{
 					for (var ress of RESOURCES)
 						proba[ress] = 0;
 					proba[resource] = 100;
 					Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				}
 				selec = resource;
 				updateButtons();
 			};
 		})(resource);
 
 		buttonUp.onpress = (function(resource){
 			return function() {
 				proba[resource] += Math.min(STEP, proba[selec]);
 				proba[selec]    -= Math.min(STEP, proba[selec]);
 				Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				updateButtons();
 			};
 		})(resource);
 
 		buttonDn.onpress = (function(resource){
 			return function() {
 				proba[selec]    += Math.min(STEP, proba[resource]);
 				proba[resource] -= Math.min(STEP, proba[resource]);
 				Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				updateButtons();
 			};
 		})(resource);
 	}
 	updateButtons();
 
 	var traderNumber = Engine.GuiInterfaceCall("GetTraderNumber");
 	var caption = "";
 	if (traderNumber.landTrader.total == 0)
 		caption = translate("There are no land traders.");
 	else
 	{
 		var inactive = traderNumber.landTrader.total - traderNumber.landTrader.trading - traderNumber.landTrader.garrisoned;
 		var inactiveString = "";
 		if (inactive > 0)
 			inactiveString = "[color=\"orange\"]" + sprintf(translatePlural("%(numberOfLandTraders)s inactive", "%(numberOfLandTraders)s inactive", inactive), { numberOfLandTraders: inactive }) + "[/color]";
 
 		if (traderNumber.landTrader.trading > 0)
 		{
 			var openingTradingString = sprintf(translatePlural("There is %(numberTrading)s land trader trading", "There are %(numberTrading)s land traders trading", traderNumber.landTrader.trading), { numberTrading: traderNumber.landTrader.trading });
 			if (traderNumber.landTrader.garrisoned > 0)
 			{
 				var garrisonedString = sprintf(translatePlural("%(numberGarrisoned)s garrisoned on a trading merchant ship", "%(numberGarrisoned)s garrisoned on a trading merchant ship", traderNumber.landTrader.garrisoned), { numberGarrisoned: traderNumber.landTrader.garrisoned });
 				if (inactive > 0)
 				{
 					caption = sprintf(translate("%(openingTradingString)s, %(garrisonedString)s, and %(inactiveString)s."), {
 						openingTradingString: openingTradingString,
 						garrisonedString: garrisonedString,
 						inactiveString: inactiveString
 					});
 				}
 				else
 				{
 					caption = sprintf(translate("%(openingTradingString)s, and %(garrisonedString)s."), {
 						openingTradingString: openingTradingString,
 						garrisonedString: garrisonedString
 					});
 				}
 			}
 			else
 			{
 				if (inactive > 0)
 				{
 					caption = sprintf(translate("%(openingTradingString)s, and %(inactiveString)s."), {
 						openingTradingString: openingTradingString,
 						inactiveString: inactiveString
 					});
 				}
 				else
 				{
 					caption = sprintf(translate("%(openingTradingString)s."), {
 						openingTradingString: openingTradingString,
 					});
 				}
 			}
 		}
 		else
 		{
 			if (traderNumber.landTrader.garrisoned > 0)
 			{
 				var openingGarrisonedString = sprintf(translatePlural("There is %(numberGarrisoned)s land trader garrisoned on a trading merchant ship", "There are %(numberGarrisoned)s land traders garrisoned on a trading merchant ship", traderNumber.landTrader.garrisoned), { numberGarrisoned: traderNumber.landTrader.garrisoned });
 				if (inactive > 0)
 				{
 					caption = sprintf(translate("%(openingGarrisonedString)s, and %(inactiveString)s."), {
 						openingGarrisonedString: openingGarrisonedString,
 						inactiveString: inactiveString
 					});
 				}
 				else
 				{
 					caption = sprintf(translate("%(openingGarrisonedString)s."), {
 						openingGarrisonedString: openingGarrisonedString
 					});
 				}
 			}
 			else
 			{
 				if (inactive > 0)
 				{
 					inactiveString = "[color=\"orange\"]" + sprintf(translatePlural("%(numberOfLandTraders)s land trader inactive", "%(numberOfLandTraders)s land traders inactive", inactive), { numberOfLandTraders: inactive }) + "[/color]";
 					caption = sprintf(translatePlural("There is %(inactiveString)s.", "There are %(inactiveString)s.", inactive), {
 						inactiveString: inactiveString
 					});
 				}
 				// The “else” here is already handled by “if (traderNumber.landTrader.total == 0)” above.
 			}
 		}
 	}
 	Engine.GetGUIObjectByName("landTraders").caption = caption;
 
 	caption = "";
 	if (traderNumber.shipTrader.total == 0)
 		caption = translate("There are no merchant ships.");
 	else
 	{
 		var inactive = traderNumber.shipTrader.total - traderNumber.shipTrader.trading;
 		var inactiveString = "";
 		if (inactive > 0)
 			inactiveString = "[color=\"orange\"]" + sprintf(translatePlural("%(numberOfShipTraders)s inactive", "%(numberOfShipTraders)s inactive", inactive), { numberOfShipTraders: inactive }) + "[/color]";
 
 		if (traderNumber.shipTrader.trading > 0)
 		{
 			var openingTradingString = sprintf(translatePlural("There is %(numberTrading)s merchant ship trading", "There are %(numberTrading)s merchant ships trading", traderNumber.shipTrader.trading), { numberTrading: traderNumber.shipTrader.trading });
 			if (inactive > 0)
 			{
 				caption = sprintf(translate("%(openingTradingString)s, and %(inactiveString)s."), {
 					openingTradingString: openingTradingString,
 					inactiveString: inactiveString
 				});
 			}
 			else
 			{
 				caption = sprintf(translate("%(openingTradingString)s."), {
 					openingTradingString: openingTradingString,
 				});
 			}
 		}
 		else
 		{
 			if (inactive > 0)
 			{
 				inactiveString = "[color=\"orange\"]" + sprintf(translatePlural("%(numberOfShipTraders)s merchant ship inactive", "%(numberOfShipTraders)s merchant ships inactive", inactive), { numberOfShipTraders: inactive }) + "[/color]";
 				caption = sprintf(translatePlural("There is %(inactiveString)s.", "There are %(inactiveString)s.", inactive), {
 					inactiveString: inactiveString
 				});
 			}
 			// The “else” here is already handled by “if (traderNumber.shipTrader.total == 0)” above.
 		}
 	}
 	Engine.GetGUIObjectByName("shipTraders").caption = caption;
 
 	Engine.GetGUIObjectByName("tradeDialogPanel").hidden = false;
 }
 
 function closeTrade()
 {
 	isTradeOpen = false;
 	Engine.GetGUIObjectByName("tradeDialogPanel").hidden = true;
 }
 
 function toggleTrade()
 {
 	if (isTradeOpen)
 		closeTrade();
 	else
 		openTrade();
 }
 
 function toggleGameSpeed()
 {
 	var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
 	gameSpeed.hidden = !gameSpeed.hidden;
 }
 
+function openGameSummary()
+{
+	closeMenu();
+	closeOpenDialogs();
+	pauseGame();
+
+	var extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
+
+	Engine.PushGuiPage("page_summary.xml", {
+		"timeElapsed" : extendedSimState.timeElapsed,
+		"playerStates": extendedSimState.players,
+		"players": g_Players,
+		"mapSettings": Engine.GetMapSettings(),
+		"isInGame": true,
+		"gameResult": translate("Current Scores"),
+		"callback": "resumeGame"
+	});
+}
+
 function openStrucTree()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
-	var data = { // TODO add info about researched techs and unlocked entities
+
+	// TODO add info about researched techs and unlocked entities
+	Engine.PushGuiPage("page_structree.xml", {
 		"civ" : g_Players[Engine.GetPlayerID()].civ,
 		"callback": "resumeGame",
-	};
-	Engine.PushGuiPage("page_structree.xml", data);
+	});
 }
 
 /**
  * Pause the game in single player mode.
  */
 function pauseGame()
 {
 	if (g_IsNetworked)
 		return;
 
 	Engine.GetGUIObjectByName("pauseButtonText").caption = RESUME;
 	Engine.GetGUIObjectByName("pauseOverlay").hidden = false;
 	Engine.SetPaused(true);
 }
 
 function resumeGame()
 {
 	Engine.GetGUIObjectByName("pauseButtonText").caption = PAUSE;
 	Engine.GetGUIObjectByName("pauseOverlay").hidden = true;
 	Engine.SetPaused(false);
 }
 
 function togglePause()
 {
 	if (!Engine.GetGUIObjectByName("pauseButton").enabled)
 		return;
 
 	closeMenu();
 	closeOpenDialogs();
 
 	var pauseOverlay = Engine.GetGUIObjectByName("pauseOverlay");
 
 	if (pauseOverlay.hidden)
 	{
 		Engine.GetGUIObjectByName("pauseButtonText").caption = RESUME;
 		Engine.SetPaused(true);
 	}
 	else
 	{
 		Engine.SetPaused(false);
 		Engine.GetGUIObjectByName("pauseButtonText").caption = PAUSE;
 	}
 
 	pauseOverlay.hidden = !pauseOverlay.hidden;
 }
 
 function openManual()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	Engine.PushGuiPage("page_manual.xml", {"page": "manual/intro", "title":translate("Manual"), "url":"http://trac.wildfiregames.com/wiki/0adManual", "callback": "resumeGame"});
 }
 
 function toggleDeveloperOverlay()
 {
 	// The developer overlay is disabled in ranked games
 	if (Engine.HasXmppClient() && Engine.IsRankedGame())
 		return;
 
 	var devCommands = Engine.GetGUIObjectByName("devCommands");
 	if (devCommands.hidden)
 		submitChatDirectly(translate("The Developer Overlay was opened."));
 	else
 		submitChatDirectly(translate("The Developer Overlay was closed."));
 	// Toggle the overlay
 	devCommands.hidden = !devCommands.hidden;
 }
 
 function closeOpenDialogs()
 {
 	closeMenu();
 	closeChat();
 	closeDiplomacy();
 	closeTrade();
 }
 
 function formatTributeTooltip(player, resource, amount)
 {
 	let playerColor = rgbToGuiColor(player.color);
 	return sprintf(translate("Tribute %(resourceAmount)s %(resourceType)s to %(playerName)s. Shift-click to tribute %(greaterAmount)s."), {
 		resourceAmount: amount,
 		resourceType: getLocalizedResourceName(resource, "withinSentence"),
 		playerName: "[color=\"" + playerColor + "\"]" + player.name + "[/color]",
 		greaterAmount: (amount < 500 ? 500 : amount + 500)
 	});
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_summary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_summary.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_summary.xml	(revision 17423)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object>
+	<object type="button"
+	name="summaryScreenButton"
+	size="100%-290 4 100%-262 32"
+	style="iconButton"
+	tooltip_style="sessionToolTip"
+	>
+		<translatableAttribute id="tooltip">Summary Screen</translatableAttribute>
+		<object size="5 5 100%-5 100%-5" type="image" sprite="stretched:session/icons/summary.png" ghost="true"/>
+		<action on="Press">
+			openGameSummary();
+		</action>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_summary.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/summary/summary.xml	(revision 17422)
+++ ps/trunk/binaries/data/mods/public/gui/summary/summary.xml	(revision 17423)
@@ -1,180 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 ==========================================
 - POST-GAME SUMMARY SCREEN -
 ==========================================
 -->
 
 <objects>
 	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_utility.js"/>
 	<script file="gui/common/settings.js"/>
 
 	<!-- After settings.js, which defines g_Settings and g_MaxPlayers. -->
 	<script file="gui/summary/counters.js"/>
 	<script file="gui/summary/layout.js"/>
 	<script file="gui/summary/summary.js"/>
 
 	<object type="image"
 		style="ModernWindow"
 		size="0 0 100% 100%"
 	>
 		<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
 			<translatableAttribute id="caption">Summary</translatableAttribute>
 		</object>
 
 		<object size="20 26 100%-20 92">
 
 			<object name="summaryText"
 				type="text"
 				size="50 16 100%-50 100%-16"
 				font="sans-bold-18"
 				textcolor="255 255 255"
 				text_align="left"
 				text_valign="center"
 			/>
 
 			<object name="timeElapsed"
 				type="text"
 				size="50 16 100%-50 100%-16"
 				font="sans-bold-18"
 				textcolor="255 255 255"
 				text_align="right"
 				text_valign="center"
 			/>
 
 			<object name="mapName"
 				type="text"
 				size="50 16 100%-50 100%-16"
 				font="sans-bold-18"
 				textcolor="255 255 255"
 				text_align="center"
 				text_valign="center"
 			/>
 
 		</object>
 
 		<object name="tabDividerLeft" type="image" sprite="TabSpacer" size="172 120 174 122"/>
 		<object name="tabDividerRight" type="image" sprite="TabSpacer" size="328 120 330 122"/>
 
 		<object name="scorePanelButton" type="button" sprite="ForegroundTab" size="20 92 136 120">
 			<action on="Press">selectPanel(0);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Score</translatableAttribute>
 			</object>
 		</object>
 
 		<object name="buildingsPanelButton" type="button" sprite="BackgroundTab" size="142 92 260 120">
 			<action on="Press">selectPanel(1);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Buildings</translatableAttribute>
 			</object>
 		</object>
 
 		<object name="unitsPanelButton" type="button" sprite="BackgroundTab" size="266 92 384 120">
 			<action on="Press">selectPanel(2);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Units</translatableAttribute>
 			</object>
 		</object>
 
 		<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="390 92 508 120">
 			<action on="Press">selectPanel(3);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Resources</translatableAttribute>
 			</object>
 		</object>
 
 		<object name="marketPanelButton" type="button" sprite="BackgroundTab" size="514 92 632 120">
 			<action on="Press">selectPanel(4);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Market</translatableAttribute>
 			</object>
 		</object>
 
 		<object name="miscPanelButton" type="button" sprite="BackgroundTab" size="638 92 756 120">
 			<action on="Press">selectPanel(5);</action>
 			<object type="text" style="ModernLabelText" ghost="true">
 				<translatableAttribute id="caption">Miscellaneous</translatableAttribute>
 			</object>
 		</object>
 
 		<object name="generalPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-54">
 			<object size="0 0 100% 100%-50">
 				<object name="playerNameHeading" type="text" style="ModernLeftTabLabelText">
 					<translatableAttribute id="caption">Player name</translatableAttribute>
 				</object>
 				<repeat var="x" count="8">
 					<object name="titleHeading[x]" type="text" style="ModernTabLabelText">
 					</object>
 				</repeat>
 				<repeat var="x" count="8">
 					<object name="Heading[x]" type="text" style="ModernTabLabelText">
 					</object>
 				</repeat>
 			</object>
 
 			<repeat count="4" var="i">
 				<object type="image" name="teamBoxt[i]" size="0 65 100% 100%-50" hidden="true">
 					<object type="text" name="teamNameHeadingt[i]" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 					<object size="0 30 100% 100%">
 						<repeat count="8" var="n">
 							<object type="image" name="playerBoxt[i][n]" size="10 0 10 30" hidden="true">
 								<object name="playerColorBoxt[i][n]" type="image" size="10 4 30 24"/>
 								<object name="playerNamet[i][n]" type="text"  size="40 2 208 100%" style="ModernLeftLabelText" />
 								<object name="civIcont[i][n]" type="image" size="208 0 240 32"/>
 								<repeat var="x" count="8">
 									<object name="valueDataTeam[i][n][x]" type="text" style="ModernTabLabelText">
 									</object>
 								</repeat>
 							</object>
 						</repeat>
 					</object>
 					<object name="teamHeadingt[i]" type="text" style="ModernLeftTabLabelText"/>
 					<repeat var="x" count="8">
 						<object name="valueDataTeam[i][x]" type="text" style="ModernTabLabelText">
 						</object>
 					</repeat>
 				</object>
 			</repeat>
 
 			<object type="image" name="noTeamsBox" size="0 65 100% 100%-50" hidden="true">
 				<repeat count="8">
 					<object type="image" name="playerBox[n]" size="10 0 10 30" hidden="true">
 						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
 							<object name="playerColorBox[n]" type="image" size="2 2 22 22"/>
 						</object>
 						<object name="playerName[n]" type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon[n]" type="image" size="208 0 240 32"/>
 						<repeat var="x" count="8">
 							<object name="valueData[n][x]" type="text" style="ModernTabLabelText">
 							</object>
 						</repeat>
 					</object>
 				</repeat>
 			</object>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="100%-160 100%-48 100%-20 100%-20">
 			<translatableAttribute id="caption">Continue</translatableAttribute>
 			<action on="Press"><![CDATA[
-				if (g_GameData.isReplay)
+				if (g_GameData.isInGame)
+				{
+					Engine.PopGuiPageCB(0);
+				}
+				else if (g_GameData.isReplay)
 				{
 					Engine.SwitchGuiPage("page_replaymenu.xml");
 				}
 				else if (!Engine.HasXmppClient())
 				{
 					Engine.SwitchGuiPage("page_pregame.xml");
 				}
 				else
 				{
 					Engine.LobbySetPlayerPresence("available");
 					Engine.SwitchGuiPage("page_lobby.xml");
 				}
 				]]>
 			</action>
 		</object>
 	</object>
 </objects>