From 704d0f95111f5aabbdbf4f2ba8b7f184b13af18b Mon Sep 17 00:00:00 2001
From: JoshuaJB <joshuajb@wildfiregames.com>
Date: Wed, 13 Aug 2014 18:56:07 +0000
Subject: [PATCH] Add config settings for FPS, realtime, and gametime overlays.

This was SVN commit r15634.
---
 binaries/data/config/default.cfg                  | 4 ++++
 binaries/data/mods/public/gui/common/global.xml   | 6 ++++--
 binaries/data/mods/public/gui/options/options.js  | 3 +++
 binaries/data/mods/public/gui/session/session.js  | 4 ----
 binaries/data/mods/public/gui/session/session.xml | 9 +++++++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index f84f5c6721..024be40da3 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -369,3 +369,7 @@ lobby.xpartamupp = "wfgbot17"             ; Name of the server-side xmpp client
 lobby.chattimestamp = false               ; Show time chat message was posted
 lobby.room = "arena17"                    ; Default MUC room to join
 lobby.history = 0                         ; Number of past messages to display on join
+
+; Overlay Preferances
+overlay.fps = "false"                     ; Show frames per second in top right corner
+overlay.realtime = "false"                ; Show current system time in top right corner
diff --git a/binaries/data/mods/public/gui/common/global.xml b/binaries/data/mods/public/gui/common/global.xml
index 40810fd73d..320808c0b6 100644
--- a/binaries/data/mods/public/gui/common/global.xml
+++ b/binaries/data/mods/public/gui/common/global.xml
@@ -30,10 +30,11 @@
 			z="199"
 		>
 			<action on="Tick">
+				this.hidden = Engine.ConfigDB_GetValue("user", "overlay.fps") == "false";
 				updateFPS();
 			</action>
 			<action on="Press">
-				this.hidden = !this.hidden;
+				Engine.ConfigDB_CreateValue("user", "overlay.realtime", !this.hidden);
 			</action>
 		</object>
 		
@@ -55,11 +56,12 @@
 			z="199"
 		>
 			<action on="Tick">
+				this.hidden = Engine.ConfigDB_GetValue("user", "overlay.realtime") == "false";
 				var d = new Date();
 				this.caption = d.toLocaleTimeString();
 			</action>
 			<action on="Press">
-				this.hidden = !this.hidden;
+				Engine.ConfigDB_CreateValue("user", "overlay.realtime", !this.hidden);
 			</action>
 		</object>
 
diff --git a/binaries/data/mods/public/gui/options/options.js b/binaries/data/mods/public/gui/options/options.js
index 6cc730e947..5bf1a81a1f 100644
--- a/binaries/data/mods/public/gui/options/options.js
+++ b/binaries/data/mods/public/gui/options/options.js
@@ -10,6 +10,9 @@ var options = {
 		[translate("Background Pause"), translate("Pause single player games when window loses focus"), {"config":"pauseonfocusloss"}, "boolean"],
 		[translate("Disable Welcome Screen"), translate("If you disable this screen completely, you may miss important announcements.\nYou can still launch it using the main menu."), {"config":"splashscreendisable"}, "boolean"],
 		[translate("Detailed Tooltips"), translate("Show detailed tooltips for trainable units in unit-producing buildings."), {"config":"showdetailedtooltips"}, "boolean"],
+		[translate("FPS Overlay"), translate("Show frames per second in top right corner."), {"config":"overlay.fps"}, "boolean"],
+		[translate("Realtime Overlay"), translate("Show current system time in top right corner."), {"config":"overlay.realtime"}, "boolean"],
+		[translate("Gametime Overlay"), translate("Show current simulation time in top right corner."), {"config":"gui.session.timeelapsedcounter"}, "boolean"],
 	],
 	"graphicsSetting":
 	[
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 417a78069b..e4ba66ddef 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -231,10 +231,6 @@ function init(initData, hotloadData)
 	}
 	global.music.setState(global.music.states.PEACE);
 	playRandomAmbient("temperate");
-
-	if (Engine.ConfigDB_GetValue("user", "gui.session.timeelapsedcounter") === "true")
-		Engine.GetGUIObjectByName("timeElapsedCounter").hidden = false;
-
 	onSimulationUpdate();
 
 	// Report the performance after 5 seconds (when we're still near
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index 7f4012d79a..4c9fb9fe70 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -149,9 +149,14 @@
 	<!-- ================================  ================================ -->
 	<!-- Time elapsed counter -->
 	<!-- ================================  ================================ -->
-	
+
 	<object size="100%-120 45 100%-10 65" type="text" name="timeElapsedCounter" style="SettingsText" hotkey="timeelapsedcounter.toggle" hidden="true">
-	    <action on="Press">this.hidden = !this.hidden;</action>
+			<action on="Tick">
+				this.hidden = Engine.ConfigDB_GetValue("user", "gui.session.timeelapsedcounter") == "false";
+			</action>
+			<action on="Press">
+				Engine.ConfigDB_CreateValue("user", "gui.session.timeelapsedcounter", !this.hidden);
+			</action>
 	</object>
 
 	<!-- ================================  ================================ -->