20171209 - Classic Main Menu to use new icons

- More formatting tweaks to the clientscheme and 4:3 files
- Fixed developmental issues with the main menu

4 files changed, 213 insertions, 84 deletions

diff --git a/resource/ui/ControlPointIcon.res b/resource/ui/ControlPointIcon.res
index a77f1b7..f42957d 100644
--- a/resource/ui/ControlPointIcon.res
+++ b/resource/ui/ControlPointIcon.res
@@ -35,7 +35,7 @@
 		"zpos"			"3"
 		"wide"			"7"
 		"tall"			"16"
-		"visible		""0"
+		"visible"		"0"
 		"enabled"		"1"
 		"image"			"capture_icon"
 		"scaleImage"	"1"
diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index f1ec97c..b580127 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -288,9 +288,9 @@
 	{
 		"ControlName"	"CPvPRankPanel"
 		"fieldName"		"RankModelPanel"
-		"xpos"			"130"
+		"xpos"			"150"
 		"ypos"			"cs-0.5-17"
-		"zpos"			"-51"
+		"zpos"			"5"
 		"wide"			"170"
 		"tall"			"1000"
 		"visible"		"1"
@@ -447,9 +447,9 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"Notifications_ShowButtonPanel"
-		"xpos"			"85"
-		"ypos"			"58"
-		"zpos"			"10"
+		"xpos"			"103"
+		"ypos"			"62"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"25"
 		"autoResize"	"0"
@@ -470,44 +470,7 @@
 			"enabled"		"0"
 			"image"			"glyph_achievements"
 			"scaleImage"	"1"
-			"drawcolor" "210 125 33 255"
-		}
-		
-		"Notifications_CountLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"Notifications_CountLabel"
-			"font"			"CerbeticaBold12"
-			"labelText"		"%noticount%"
-			"textAlignment"	"center"
-			"xpos"			"10"
-			"ypos"			"-4"
-			"zpos"			"4"
-			"wide"			"16"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override"	"Base Color"
-		}
-		"Notifications_CountLabelBG"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"Notifications_CountLabelBG"
-			"font"			"CerbeticaBold12"
-			"labelText"		"%noticount%"
-			"textAlignment"	"center"
-			"xpos"			"11"
-			"ypos"			"-3"
-			"zpos"			"4"
-			"wide"			"16"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override"	"TransparentBlack"
+			"drawcolor" 	"210 125 33 255"
 		}
 
 		"Notifications_ShowButtonPanel_SB"
@@ -517,8 +480,8 @@
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"24"
-			"tall"			"24"
+			"wide"			"15"
+			"tall"			"15"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
@@ -548,7 +511,7 @@
 			"depressedFgColor_override" "Button Color"
 			
 			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"Button Color"
+			"image_armedcolor"	"72 255 255 255"
 			
 			"SubImage"
 			{
@@ -557,10 +520,10 @@
 				"xpos"			"0"
 				"ypos"			"0"
 				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"0"
+				"wide"			"16"
+				"tall"			"16"
+				"visible"		"1"
+				"enabled"		"1"
 				"image"			"replay/thumbnails/buttons/alert"
 				"scaleImage"	"1"
 			}
@@ -696,11 +659,11 @@
 			"xpos"			"0"
 			"ypos"			"-1"
 			"zpos"			"1"
-			"wide"			"24"
-			"tall"			"24"
+			"wide"			"18"
+			"tall"			"18"
 			"visible"		"1"
 			"enabled"		"1"
-			"labelText"		"E"
+			"labelText"		""
 			"font"			""
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -732,7 +695,7 @@
 				"tall"			"0"
 				"visible"		"0"
 				"enabled"		"0"
-				"image"			"replay\thumbnails\buttons\motd"
+				"image"			"replay/thumbnails/buttons/motd"
 				"scaleImage"	"1"
 			}
 		}
@@ -946,9 +909,9 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"WatchStreamButton"
-		"xpos"			"207"
+		"xpos"			"203"
 		"ypos"			"60"
-		"zpos"			"1"
+		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
 		"autoResize"	"0"
@@ -964,37 +927,37 @@
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
-			"xpos"			"-3"
+			"xpos"			"0"
 			"ypos"			"0"
 			"wide"			"20"
 			"tall"			"20"
-			"zpos"			"5"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
+			"textinsetx"	"0"
 			"labelText"		""
+			"use_proportional_insets" "1"
 			"font"			""
 			"command"		"watch_stream"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-
 			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
+			"sound_released"	"vo/null.mp3"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
+				
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 			"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"
 
@@ -1028,10 +991,10 @@
 		"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
+		"border"		"NoBorder"
+		
+		"navDown"		"SettingsButton"
+		"navLeft"		"WatchStreamButton"
 	}
 
 	"CallVoteButton"
diff --git a/resource/ui/streamlistpanel.res b/resource/ui/streamlistpanel.res
index 2521ed2..dab8828 100644
--- a/resource/ui/streamlistpanel.res
+++ b/resource/ui/streamlistpanel.res
@@ -9,7 +9,7 @@
 		"wide"			"300"
 		"tall"			"22"
 		"visible"		"1"
-
+		
 		"HeaderLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -30,7 +30,7 @@
 			"bgcolor_override"	"25 25 25 255"
 		}
 	}
-
+	
 	"CloseButton"
 	{
 		"ControlName"	"CExImageButton"
@@ -51,21 +51,21 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-
+		
 		"navDown"			"MOTD_URLButton"
 		"navActivate"		"<QuickplayButton"
-
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"hide_streams"
+		"Command"			"hide_streams"
 		"paintbackground"	"0"
-
+		
 		//"defaultFgColor_override" "235 226 202 255"
 		//"armedFgColor_override" "46 43 42 255"
 		"defaultFgColor_override" "TanLight"
 		"armedFgColor_override" "Base Color"
 		"depressedFgColor_override" "TanLight"
-
+		
 		"image_drawcolor"	"235 226 202 255"
 		"image_armedcolor"	"200 80 60 255"
 		"SubImage"
@@ -83,7 +83,7 @@
 			"scaleImage"	"1"
 		}
 	}
-
+	
 	"TitleLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -101,7 +101,7 @@
 		"enabled"		"1"
 		"fgcolor"		"56 53 49 255"
 	}
-
+	
 	"Stream1"
 	{
 		"ControlName"	"CTFStreamPanel"
@@ -116,7 +116,7 @@
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
 	}
-
+	
 	"Stream2"
 	{
 		"ControlName"	"CTFStreamPanel"
@@ -131,7 +131,7 @@
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
 	}
-
+	
 	"Stream3"
 	{
 		"ControlName"	"CTFStreamPanel"
@@ -146,7 +146,7 @@
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
 	}
-
+	
 	"Stream4"
 	{
 		"ControlName"	"CTFStreamPanel"
@@ -161,7 +161,7 @@
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
 	}
-
+	
 	"Stream5"
 	{
 		"ControlName"	"CTFStreamPanel"
@@ -176,7 +176,7 @@
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
 	}
-
+	
 	"Stream_URLButton"
 	{
 		"ControlName"	"CExButton"
diff --git a/resource/ui/streampanel.res b/resource/ui/streampanel.res
new file mode 100644
index 0000000..da5ddcd
--- /dev/null
+++ b/resource/ui/streampanel.res
@@ -0,0 +1,166 @@
+"Resource/UI/StreamPanel.res"
+{
+	"BGRect"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGRect"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"proportionaltoparent"	"1"
+
+		"bgcolor_override"	"0 0 0 50"
+	}
+
+
+	"LoadingPanel"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"LoadingPanel"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"10"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"proportionaltoparent"	"1"
+
+		"SpinnerImage"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"PreviewImage"
+			"xpos"			"20"
+			"ypos"			"0"
+			"zpos"			"1"
+			"wide"			"50"
+			"tall"			"50"
+			"visible"		"1"
+			"enable"		"1"
+			"scaleImage"	"1"
+			"image"			"animated/tf2_logo_hourglass"
+
+			"proportionaltoparent"	"1"
+		}
+
+		"DescriptionLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DescriptionLabel"
+			"font"			"HudFontSmallestBold"
+			"labelText"		"#MMenu_Stream_Loading"
+			"textAlignment"	"west"
+			"xpos"			"90"
+			"ypos"			"0"
+			"wide"			"f0"
+			"tall"			"f0"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor"		"56 53 49 255"
+
+			"proportionaltoparent"	"1"
+		}
+	}
+
+
+	"PreviewImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PreviewImage"
+		"xpos"			"5"
+		"ypos"			"3"
+		"zpos"			"1"
+		"wide"			"80"
+		"tall"			"50"
+		"visible"		"1"
+		"enable"		"1"
+		"scaleImage"	"0"
+	}
+
+	"DisplayNameLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"DisplayNameLabel"
+		"font"			"HudFontSmallestBold"
+		"labelText"		"%display_name%"
+		"textAlignment"	"west"
+		"xpos"			"90"
+		"ypos"			"5"
+		"wide"			"205"
+		"tall"			"12"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"TanLight"
+	}
+
+	"TextDescriptionLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"TextDescriptionLabel"
+		"font"			"HudFontSmallest"
+		"labelText"		"%text_description%"
+		"textAlignment"	"north-west"
+		"xpos"			"90"
+		"ypos"			"18"
+		"wide"			"205"
+		"tall"			"12"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"TanLight"
+	}
+
+	"ViewerCountLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"ViewerCountLabel"
+		"font"			"HudFontSmallest"
+		"labelText"		"%viewer_count%"
+		"textAlignment"	"west"
+		"xpos"			"90"
+		"ypos"			"31"
+		"wide"			"205"
+		"tall"			"12"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"TanLight"
+	}
+
+	"Stream_URLButton"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"Stream_URLButton"
+		"xpos"			"5"
+		"ypos"			"0"
+		"zpos"			"100"
+		"wide"			"290"
+		"tall"			"50"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"labelText"		""
+		"visible"		"1"
+		"enabled"		"0"
+		"tabPosition"	"0"
+		"default"		"1"
+		"command"		"stream"
+
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+
+		"border_armed"		"TeamMenuBorder"
+			
+		"defaultFgColor_override" "0 0 0 0"
+		"defaultBgColor_override" "0 0 0 0"
+		"armedFgColor_override" "0 0 0 0"
+		"armedBgColor_override"	"0 0 0 0"
+	}
+}
\ No newline at end of file