Added product/company watermark to aid in taking official screenshots. Press W to toggle it.

This was SVN commit r1613.

binaries/data/config/system.cfg

@@ -94,7 +94,8 @@ font.misc = verdana16
 ; > SYSTEM SETTINGS
 hotkey.exit = Escape, "Ctrl+F4"					; Exit to desktop.
 hotkey.screenshot = PrtSc					; Take PNG screenshot.
-hotkey.wireframe = W						; Toggle wireframe mode.
+hotkey.screenshot.watermark = "W"				; Toggle product/company watermark for official screenshots.
+hotkey.wireframe = "Alt+W"					; Toggle wireframe mode.
 
 ; > CAMERA SETTINGS
 hotkey.camera.reset = "H"					; Reset camera rotation to default.

binaries/data/mods/official/gui/test/1_init.xml

@@ -72,6 +72,7 @@
 
         <script file="gui/test/functions_session.js"><![CDATA[
 		initCoord();
+		initGlobal();
                 initPreGame();
 		initAtlas();
                 initSession();

binaries/data/mods/official/gui/test/9_global.xml

@@ -111,4 +111,28 @@
 
         </object>
 
+	<!--
+	==========================================
+	- WATERMARK -
+	==========================================
+	-->
+
+	<object type="empty" name="watermark" hotkey="screenshot.watermark" size="0 0 100% 100%" z="200" ghost="true" hidden="true">
+		<action on="Press"><![CDATA[
+			GUIObjectToggle("watermark");
+		]]></action>
+		<object type="image" name="watermark_product_logo" sprite="watermark_product" hidden="false">
+			<action on="Load"><![CDATA[
+				setSizeArray("watermark_product_logo", globalCoord[GLOBAL_WATERMARK_PRODUCT_LOGO], left_screen, bottom_screen, left_screen, bottom_screen);
+				console.write(this.size);
+			]]></action>
+		</object>
+		<object type="image" name="watermark_company_logo" sprite="watermark_company" hidden="false">
+			<action on="Load"><![CDATA[
+				setSizeArray("watermark_company_logo", globalCoord[GLOBAL_WATERMARK_COMPANY_LOGO], right_screen, bottom_screen, right_screen, bottom_screen);
+				console.write(this.size);
+			]]></action>
+		</object>
+	</object>
+
 </objects>

binaries/data/mods/official/gui/test/functions_global.js

@@ -37,6 +37,35 @@
 TODO: Make button code work for any number of buttons without extending the code each time! ((arrays | nested variables) & calculating sizes)
 */
 
+// ====================================================================
+
+function initGlobal()
+{
+	// Initialise coordinate set for this page.
+	globalCoord = new Array();
+	globalCoord_Last = 0;
+
+	// Bottom-left product logo; used when taking official screenshots.
+	GLOBAL_WATERMARK_PRODUCT_LOGO 		= addSizeArrayWH(globalCoord, globalCoord_Last,
+		200,
+		98
+	); globalCoord_Last 			= addSizeArrayXY(globalCoord, globalCoord_Last,
+		0,
+		0
+	);
+
+	// Bottom-right company logo; used when taking official screenshots.
+	GLOBAL_WATERMARK_COMPANY_LOGO 		= addSizeArrayWH(globalCoord, globalCoord_Last,
+		207,
+		28
+	); globalCoord_Last 			= addSizeArrayXY(globalCoord, globalCoord_Last,
+		0,
+		0
+	);
+}
+
+// ====================================================================
+
 function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbMode, mbButtonCaptions, mbButtonsCode) {
 
         mbMainObj = getGUIObjectByName("mb_main");

binaries/data/mods/official/gui/test/sprite1.xml

@@ -211,6 +211,20 @@
                 <image texture="global/ui_gen_infinity_icon.png" size="0 0 100% 100%" texture_size="0 0 16 16" />
         </sprite>
 
+        <!--
+        ==========================================
+        SCREENSHOT WATERMARK
+        ==========================================
+        -->
+
+        <sprite name="watermark_product">
+                <image texture="global/ui_gen_watermark_0ad.png" texture_size="0 0 256 128" size="0 0 100% 100%" />
+        </sprite>
+
+        <sprite name="watermark_company">
+                <image texture="global/ui_gen_watermark_wfg.png" texture_size="0 0 256 32" size="0 0 100% 100%" />
+        </sprite>
+
         <!--
         ==========================================
         MESSAGE BOX