Added in support for streams on the main menu, cleaned up other pop-up dialogs

1 files changed, 137 insertions, 39 deletions

diff --git a/minmode/resource/ui/MainMenuOverride.res b/minmode/resource/ui/MainMenuOverride.res
index fbdd4b5..a739aa8 100644
--- a/minmode/resource/ui/MainMenuOverride.res
+++ b/minmode/resource/ui/MainMenuOverride.res
@@ -255,7 +255,7 @@
 		"xpos"			"75"
 		"ypos"			"90"
 		"zpos"			"0"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -317,7 +317,7 @@
 		"fieldName"		"UsernameBG"
 		"xpos"			"75"
 		"ypos"			"118"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"42"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -366,7 +366,7 @@
 			"xpos" "120"
 			"ypos" "130"
 			"zpos"	"99"
-			"wide" "150"
+			"wide" "170"
 			"tall" "20"
 			"autoResize" "0"
 			"pinCorner" "0"
@@ -538,6 +538,102 @@
 			}				
 		}		
 	}
+	"WatchStreamButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"WatchStreamButton"
+		"xpos"			"275"
+		"ypos"			"90"
+		"zpos"			"1"
+		"wide"			"32"
+		"tall"			"32"
+		"autoResize"	"0"
+		"pinCorner"		"3"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		
+		"navUp"			"Notifications_Panel"
+		"navLeft"		"SettingsButton"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"-3"
+			"ypos"			"0"
+			"wide"			"24"
+			"zpos"			"5"
+			"tall"			"24"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labelText"		"R"
+			"font"			"Multimedia16"
+			"command"		"watch_stream"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+			
+			"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"
+			
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"cs-0.5"
+				"ypos"			"cs-0.5"
+				"zpos"			"1"
+				"wide"			"f0"
+				"tall"			"f0"
+				"visible"		"0"
+				"enabled"		"0"
+				"scaleImage"	"1"
+				"image"			"button_quests"
+
+				"proportionaltoparent"	"1"
+				"mouseinputenabled"	"0"
+				"keyboardinputenabled" "0"
+			}		
+		}
+	}
+
+	"StreamListPanel"
+	{
+		"ControlName"	"CTFStreamListPanel"
+		"fieldName"		"StreamListPanel"
+		"xpos"			"300"
+		"ypos"			"90"
+		"zpos"			"1"
+		"wide"			"300"
+		"tall"			"325"
+		"visible"		"0"
+		"PaintBackgroundType"	"0"
+		"paintbackground"	"2"
+		"bgcolor_override"	"25 25 25 230"
+		
+		"border"		"NoBorde"
+
+		"navDown"		"SettingsButton"		// when a sub element can't nav down it will pass through this
+		"navLeft"		"WatchStreamButton"	// when a sub element can't nav left it will pass through this
+	}
 	
 	"MOTD_ShowButtonPanel"
 	{
@@ -605,16 +701,16 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"MOTD_Panel"
-		"xpos"			"c0"
-		"ypos"			"63"
+		"xpos"			"300"
+		"ypos"			"90"
 		"zpos"			"1"
 		"wide"			"300"
 		"tall"			"360"
 		"visible"		"0"
 		"PaintBackgroundType"	"2"
 		"paintbackground"		"1"
-		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
+		"border"				"NoBorder"
+		"bgcolor_override"		"25 25 25 230"
 		
 		"MOTD_HeaderContainer"
 		{
@@ -630,7 +726,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"MOTD_HeaderLabel"
-				"font"			"CerbeticaBold24"
+				"font"			"HudFontSmallBold"
 				"textAlignment"	"center"
 				"labelText"		"%motdheader%"
 				"xpos"			"0"
@@ -642,6 +738,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"fgcolor_override"	"TanLight"
+				"bgcolor_override"	"25 25 25 255"
 			}
 		}
 		
@@ -958,6 +1055,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1385,7 +1483,7 @@
 		"xpos"			"75"
 		"ypos"			"234"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -1395,7 +1493,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -1447,7 +1545,7 @@
 		"xpos"			"75"
 		"ypos"			"288"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -1457,7 +1555,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -1577,7 +1675,7 @@
 		"xpos"			"75"
 		"ypos"			"270"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -1587,7 +1685,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -1639,7 +1737,7 @@
 		"xpos"			"75"
 		"ypos"			"252"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -1649,7 +1747,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -1897,7 +1995,7 @@
 			"use_proportional_insets" "1"
 			"font"			"Cerbetica14"
 			"textAlignment"	"east"
-			"labelText"		"v2016.3.17"
+			"labelText"		"v2016.3.24"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -1939,7 +2037,7 @@
 		"xpos"			"75"
 		"ypos"			"162"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -1949,7 +2047,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2002,7 +2100,7 @@
 		"xpos"			"75"
 		"ypos"			"180"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -2012,7 +2110,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2065,7 +2163,7 @@
 		"xpos"			"75"
 		"ypos"			"180"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -2075,7 +2173,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2128,7 +2226,7 @@
 		"xpos"			"75"
 		"ypos"			"198"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"enabled"		"1"
@@ -2140,7 +2238,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2179,7 +2277,7 @@
 		"xpos"			"75"
 		"ypos"			"216"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -2189,7 +2287,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2235,7 +2333,7 @@
 		}
 	}
 	
-	// USED FOR HUD RELOAD BUTTON, DOESN'T ACTUALLY CHANGE SERVERS
+	// USED FOR REPORT PLAYER BUTTON, DOESN'T ACTUALLY CHANGE SERVERS
 	// HUD USES NORMAL SERVER BUTTON TO CHANGE SERVERS WHILE IN GAME
 	// REFER TO GAMEMENU.RES FOR INFO ON THIS
 	
@@ -2246,7 +2344,7 @@
 		"xpos"			"75"
 		"ypos"			"234"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"0"
 		"PaintBackgroundType"	"0"
@@ -2256,7 +2354,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2378,7 +2476,7 @@
 		"xpos"			"75"
 		"ypos"			"162"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
 		"PaintBackgroundType"	"0"
@@ -2388,7 +2486,7 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"220"
 			"tall"			"18"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -2876,7 +2974,7 @@
 		"xpos"			"75"
 		"ypos"			"324"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"
@@ -2929,7 +3027,7 @@
 		"xpos"			"75"
 		"ypos"			"306"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"
@@ -2983,7 +3081,7 @@
 		"xpos"			"75"
 		"ypos"			"342"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"
@@ -3036,7 +3134,7 @@
 		"xpos"			"75"
 		"ypos"			"396"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"
@@ -3089,7 +3187,7 @@
 		"xpos"			"75"
 		"ypos"			"378"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"
@@ -3142,7 +3240,7 @@
 		"xpos"			"75"
 		"ypos"			"360"
 		"zpos"			"11"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"
@@ -3195,7 +3293,7 @@
 		"xpos"			"75"
 		"ypos"			"396"
 		"zpos"			"1"
-		"wide"			"200"
+		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
 		"visible"		"1"