From 041f59f15ee4dee13086dc9baeaea5695468d2b7 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Thu, 7 Dec 2017 22:40:53 -0500
Subject: 20171207 - Updated Main Menu Icons

Instead of using fonts - icons for twitch, MOTD and the ConTracker have
been added.
---
 resource/ui/HudObjectiveFlagPanel.res | 10 ++++-
 resource/ui/MainMenuOverride.res      | 84 ++++++++++++++++-------------------
 2 files changed, 48 insertions(+), 46 deletions(-)

(limited to 'resource/ui')

diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res
index cf01477..de90e5b 100644
--- a/resource/ui/HudObjectiveFlagPanel.res
+++ b/resource/ui/HudObjectiveFlagPanel.res
@@ -6,6 +6,8 @@
 		"fieldName"			"ObjectiveStatusFlagPanel"
 		"xpos"				"0"
 		"ypos"				"0"
+		"xpos_minmode"		"9999"
+		"ypos_minmode"		"9999"
 		"zpos"				"1"
 		"wide"				"f0"
 		"tall"				"480"
@@ -22,7 +24,9 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"LeftSideBG"
 		"xpos"			"c-120"
-		"ypos"			"r20"	
+		"ypos"			"r20"
+		"xpos_minmode"	"9999"
+		"ypos_minmode"	"9999"
 		"zpos"			"-1"
 		"wide"			"120"
 		"tall"			"14"
@@ -50,6 +54,8 @@
 		"fieldName"		"RightSideBG"
 		"xpos"			"c0"
 		"ypos"			"r20"	[$WIN32]
+		"xpos_minmode"	"9999"
+		"ypos_minmode"	"9999"
 		"zpos"			"-1"
 		"wide"			"120"
 		"tall"			"14"
@@ -291,6 +297,8 @@
 		"fieldName"		"PlayingToBG"
 		"xpos"			"c-50"	[$WIN32]
 		"ypos"			"r50"	[$WIN32]
+		"xpos_minmode"	"9999"
+		"ypos_minmode"	"9999"
 		"zpos"			"3"
 		"wide"			"100"	[$WIN32]
 		"tall"			"20"	[$WIN32]
diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index a0b95a5..f1ec97c 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -377,9 +377,9 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"QuestLogButtonNew"
-		"xpos"			"123"
-		"ypos"			"58"
-		"zpos"			"10"
+		"xpos"			"126"
+		"ypos"			"62"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"25"
 		"autoResize"	"0"
@@ -387,23 +387,23 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-
+		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"-1"
-			"wide"			"24"
+			"xpos"			"-3"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
 			"zpos"			"5"
-			"tall"			"24"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		"F"
-			"font"			"Multimedia16"
+			"labelText"		""
+			"font"			""
 			"command"		"questlog"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -412,11 +412,13 @@
 
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+
 			"actionsignallevel" "2"
 			"proportionaltoparent"	"1"
+
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
+			
 			"defaultFgColor_override" "TanLight"
 			"armedFgColor_override" "Button Color"
 			"depressedFgColor_override" "Button Color"
@@ -428,19 +430,15 @@
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"cs-0.5"
-				"ypos"			"cs-0.5"
+				"xpos"			"2"
+				"ypos"			"0"
 				"zpos"			"1"
-				"wide"			"f0"
-				"tall"			"f0"
-				"visible"		"0"
-				"enabled"		"0"
+				"wide"			"16"
+				"tall"			"16"
+				"visible"		"1"
+				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"button_quests"
-
-				"proportionaltoparent"	"1"
-				"mouseinputenabled"	"0"
-				"keyboardinputenabled" "0"
+				"image"			"replay/thumbnails/buttons/contracts"
 			}
 		}
 	}
@@ -526,8 +524,8 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"font"			"Multimedia16"
-			"labelText"		"r"
+			"font"			""
+			"labelText"		""
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -563,7 +561,7 @@
 				"tall"			"20"
 				"visible"		"0"
 				"enabled"		"0"
-				"image"			"button_Alert"
+				"image"			"replay/thumbnails/buttons/alert"
 				"scaleImage"	"1"
 			}
 		}
@@ -703,7 +701,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"E"
-			"font"			"Multimedia16"
+			"font"			""
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -734,7 +732,7 @@
 				"tall"			"0"
 				"visible"		"0"
 				"enabled"		"0"
-				"image"			"button_MOTD"
+				"image"			"replay\thumbnails\buttons\motd"
 				"scaleImage"	"1"
 			}
 		}
@@ -949,10 +947,10 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"WatchStreamButton"
 		"xpos"			"207"
-		"ypos"			"57"
+		"ypos"			"60"
 		"zpos"			"1"
-		"wide"			"32"
-		"tall"			"32"
+		"wide"			"20"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -968,16 +966,16 @@
 			"fieldName"		"SubButton"
 			"xpos"			"-3"
 			"ypos"			"0"
-			"wide"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"zpos"			"5"
-			"tall"			"24"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		"R"
-			"font"			"Multimedia16"
+			"labelText"		""
+			"font"			""
 			"command"		"watch_stream"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1004,19 +1002,15 @@
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"cs-0.5"
-				"ypos"			"cs-0.5"
+				"xpos"			"2"
+				"ypos"			"0"
 				"zpos"			"1"
-				"wide"			"f0"
-				"tall"			"f0"
-				"visible"		"0"
-				"enabled"		"0"
+				"wide"			"20"
+				"tall"			"20"
+				"visible"		"1"
+				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"button_quests"
-
-				"proportionaltoparent"	"1"
-				"mouseinputenabled"	"0"
-				"keyboardinputenabled" "0"
+				"image"			"replay/thumbnails/twitch"
 			}
 		}
 	}
-- 
cgit v1.2.3