20180326 - Console Button and Item Popup Fix

- Added a console button to the main menu, by popular request (gear icon
to the right of the rayshud title)
- Fixed an issue where hovering over an item in inventory with a
rotating 3D model would break all other item info panels when viewing
them in backpack or slot select screen

8 files changed, 144 insertions, 134 deletions

diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index 9b67d95..68b24c5 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -365,7 +365,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"QuestLogButtonNew"
-		"xpos"			"126"
+		"xpos"			"106"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -708,7 +708,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CreateServerButton"
-		"xpos"			"145"
+		"xpos"			"125"
 		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
@@ -771,7 +771,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportBugButton"
-		"xpos"			"164"
+		"xpos"			"144"
 		"ypos"			"59"
 		"zpos"			"12"
 		"wide"			"20"
@@ -834,7 +834,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"AchievementsButton"
-		"xpos"			"184"
+		"xpos"			"164"
 		"ypos"			"59"
 		"zpos"			"12"
 		"wide"			"20"
@@ -897,7 +897,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"WatchStreamButton"
-		"xpos"			"203"
+		"xpos"			"183"
 		"ypos"			"60"
 		"zpos"			"12"
 		"wide"			"20"
@@ -936,7 +936,7 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"vo/null.mp3"
 			"actionsignallevel" "2"
-				
+		
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"paintbackground"	"0"
@@ -984,13 +984,13 @@
 		"navDown"		"SettingsButton"
 		"navLeft"		"WatchStreamButton"
 	}
-
-	"CallVoteButton"
+	
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"CallVoteButton"
-		"xpos"			"245"
-		"ypos"			"58"
+		"fieldname"		"ConsoleButton"
+		"xpos"			"205"
+		"ypos"			"57"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -1018,7 +1018,69 @@
 			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"border_default"	""
+			"border_armed"		""
+			"paintbackground"	"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"			"4"
+				"ypos"			"7"
+				"zpos"			"1"
+				"wide"			"12"
+				"tall"			"13"
+				"visible"		"1"
+				"enabled"		"1"
+				"image"			"glyph_create"
+				"scaleImage"	"1"
+			}
+		}
+	}
+	
+	"ReportPlayerButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"225"
+		"ypos"			"57"
+		"zpos"			"12"
+		"wide"			"20"
+		"tall"			"25"
+		"visible"		"1"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"textinsetx"	"100"
+			"use_proportional_insets" "1"
+			"font"			"HudFontSmallBold"
+			"textAlignment"	"west"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
 			"border_default"	""
 			"border_armed"		""
 			"paintbackground"	"0"
@@ -1047,11 +1109,11 @@
 		}
 	}
 
-	"MutePlayersButton"
+	"CallVoteButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"MutePlayersButton"
-		"xpos"			"265"
+		"fieldname"		"CallVoteButton"
+		"xpos"			"245"
 		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1080,7 +1142,7 @@
 			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
+
 			"border_default"	""
 			"border_armed"		""
 			"paintbackground"	"0"
@@ -1109,12 +1171,12 @@
 		}
 	}
 
-	"ReportPlayerButton"
+	"MutePlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"225"
-		"ypos"			"57"
+		"fieldname"		"MutePlayersButton"
+		"xpos"			"265"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -1708,7 +1770,7 @@
 		"ControlName"	"CExLabel"
 		"fieldname"		"VersionNumber"
 		"font"			"Cerbetica14"
-		"labelText"		"v2017.12.18"
+		"labelText"		"v2018.03.26"
 		"xpos"			"r55"
 		"ypos"			"r13"
 		"wide"			"80"
diff --git a/resource/ui/TFAdvancedOptionsDialog.res b/resource/ui/TFAdvancedOptionsDialog.res
index 5904b7f..3bcc9eb 100644
--- a/resource/ui/TFAdvancedOptionsDialog.res
+++ b/resource/ui/TFAdvancedOptionsDialog.res
@@ -13,12 +13,12 @@
 		"visible"		"1"

 		"enabled"		"1"

 		"tabPosition"		"0"

+		"bgcolor_override"		"25 25 25 255"

 		"paintbackgroundtype"	"0"

 		"settitlebarvisible"	"0"

 		"paintborder"			"1"

 		"paintbackground"		"1"

 		"border"				"NoBorder"

-		"bgcolor_override"		"25 25 25 255"

 		

 		"control_w"			"500"

 		"control_h"			"25"

diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index 54f9a45..9787a50 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -256,24 +256,6 @@
 		"PaintBackgroundType"	"0"
 		"paintborder"	"0"
 		
-		"BackColor"
-    	{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
-			"bgcolor_override"	"30 30 30 255"
-    	}
-		
 		"text_ypos"			"20"
 		"text_center"		"1"
 		"model_hide"		"0"
diff --git a/resource/ui/econ/BackpackPanel.res b/resource/ui/econ/BackpackPanel.res
index 5f59630..a993043 100644
--- a/resource/ui/econ/BackpackPanel.res
+++ b/resource/ui/econ/BackpackPanel.res
@@ -130,11 +130,13 @@
 				"font" "FontStorePrice"
 				"textAlignment" "east"
 				"xpos" "rs1"
+				"ypos"	"0"
 				"zpos" "15"
 				"wide" "25"
 				"tall" "12"
 				"textinsetx" "8"
-				"autoResize" "1"
+				"autoResize"	"0"
+				"skip_autoresize"	"1"
 				"pinCorner" "0"
 				"visible" "0"
 				"enabled" "1"
@@ -234,6 +236,7 @@
 		"selectionTextColor_override" "235 226 202 255"
 		"defaultSelectionBG2Color_override" "0 0 0 0"
 	}	
+
 	"ShowBaseItemsCheckbox"
 	{
 		"ControlName"	"CheckButton"
@@ -347,43 +350,25 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		
-		"BackColor"
-    	{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"			"0"
-			"autoResize"		"0"
-			"PaintBackgroundType""1"
-			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
-			
-			"attriblabel"
-			{
-				"font"			"ItemFontAttribLarge"
-				"xpos"			"0"
-				"ypos"			"30"
-				"zpos"			"101"
-				"wide"			"140"
-				"tall"			"60"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%attriblist%"
-				"textAlignment"	"center"
-				"fgcolor"		"117 107 94 255"
-				"centerwrap"	"1"
-			}
-    	}
-	}
+
+		"attriblabel"
+		{
+			"font"			"ItemFontAttribLarge"
+			"xpos"			"0"
+			"ypos"			"30"
+			"zpos"			"101"
+			"wide"			"140"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%attriblist%"
+			"textAlignment"	"center"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"1"
+		}
+    }
 	
 	"mousedragitempanel"
 	{
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index bfdbd6a..dc14c8b 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -8,6 +8,8 @@
 		"text_xpos_collection"	"0"
 		"text_ypos"			"15"
 		"text_forcesize" "0"
+		"text_xpos"		"15"
+		"text_wide"		"270"
 		//"model_xpos_collection"	"77"
 		//"model_ypos_collection"	"20"
 		//"model_wide_collection"	"156"
@@ -134,8 +136,6 @@
 			"fgcolor"		"200 80 60 255"
 			"bgcolor_override"		"0 0 0 255"
 			"PaintBackgroundType"	"2"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
 		}
 		
 		"paint_icon"
@@ -160,7 +160,7 @@
 			"xpos"			"4"
 			"ypos"			"4"
 			"zpos"			"2"
-			"wide"			"18"
+			"wide"			"10"
 			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -170,8 +170,7 @@
 			"textAlignment"	"center"
 			"fgcolor"		"200 80 60 255"
 			"bgcolor_override"		"0 0 0 255"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
+			"PaintBackgroundType"	"2"
 		}
 
 		"serieslabel"
@@ -182,7 +181,7 @@
 			"xpos"			"4"
 			"ypos"			"4"
 			"zpos"			"2"
-			"wide"			"18"
+			"wide"			"14"
 			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -192,8 +191,7 @@
 			"textAlignment"	"center"
 			"fgcolor"		"200 180 60 255"
 			"bgcolor_override"		"0 40 30 255"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
+			"PaintBackgroundType"	"2"
 		}
 		
 		"matcheslabel"
@@ -204,7 +202,7 @@
 			"xpos"			"4"
 			"ypos"			"4"
 			"zpos"			"2"
-			"wide"			"24"
+			"wide"			"20"
 			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -212,7 +210,6 @@
 			"enabled"		"1"
 			"labelText"		""
 			"textAlignment"	"center"
-			"border"		"NoBorder"
 			"fgcolor"		"200 180 60 255"
 			"bgcolor_override"		"0 40 30 255"
 			"PaintBackgroundType"	"2"
@@ -227,13 +224,12 @@
 			"zpos"			"2"
 			"autoResize"	"0"
 			"pinCorner"		"0"
-			"wide"			"20"
-			"border"		"NoBorder"
+			"wide"			"16"
 			"tall"			"16"
 			"visible"		"0"
 			"enabled"		"1"
 			"scaleImage"	"1"
-			}
+		}
 
 		"is_strange_icon"
 		{
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index 6bbd69f..7d7aa04 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -9,10 +9,10 @@
 		"ypos"					"105"
 		"wide"					"400"
 		"tall"					"240"
-		"settitlebarvisible"	"0"
+		"bgcolor_override"		"30 30 30 255"
 		"paintbackgroundtype"	"2"
+		"settitlebarvisible"	"0"
 		"paintbackground"		"1"
-		"bgcolor_override"		"30 30 30 255"
 		"border"				"CyanBorder"
 	}
 
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index cfa4696..bb29ad4 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -30,11 +30,15 @@
 			"model_xpos"	"2"
 			"model_wide"	"90"
 			"model_tall"	"50"
+			"model_center_x" "1"
 			"text_ypos"		"0"
 			"text_forcesize" "2"
 			"text_center"	"0"
 			"text_yoffset"	"2"
 			"inset_eq_y"	"55"
+
+			"deferred_description"	"1"
+			"deferred_icon"			"1"
 		}
 		"modelpanels_kv"
 		{
@@ -59,6 +63,8 @@
 			
 			"inset_eq_x"	"4"
 			"inset_eq_y"	"2"
+
+			"deferred_description"	"1"
 			
 			"itemmodelpanel"
 			{
@@ -433,48 +439,31 @@
 		"visible"		"0"
 		"bgcolor_override"		"0 0 0 0"
 		"noitem_textcolor"		"117 107 94 255"
-		"PaintBackgroundType"	"0"
-		"paintborder"	"0"
-			"BackColor"
-    	{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"			"0"
-			"autoResize"		"0"
-			"PaintBackgroundType""1"
-			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
-			
-			"attriblabel"
-			{
-				"font"			"ItemFontAttribLarge"
-				"xpos"			"0"
-				"ypos"			"30"
-				"zpos"			"101"
-				"wide"			"140"
-				"tall"			"60"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%attriblist%"
-				"textAlignment"	"center"
-				"fgcolor"		"117 107 94 255"
-				"centerwrap"	"1"
-			}
-    	}
+		"PaintBackgroundType"	"2"
+		"paintborder"	"1"
 		
 		"text_ypos"			"20"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-	}
+
+		"attriblabel"
+		{
+			"font"			"ItemFontAttribLarge"
+			"xpos"			"0"
+			"ypos"			"30"
+			"zpos"			"2"
+			"wide"			"140"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%attriblist%"
+			"textAlignment"	"center"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"1"
+		}
+    }
 }
\ No newline at end of file
diff --git a/resource/ui/loadoutpresetpanel.res b/resource/ui/loadoutpresetpanel.res
index 8c54bc3..93bc313 100644
--- a/resource/ui/loadoutpresetpanel.res
+++ b/resource/ui/loadoutpresetpanel.res
@@ -24,10 +24,6 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"centerwrap"	"1"
-			"paintbackground"	"1"
-			"border_default"			"NoBorder"
-			"border_armed"				"NoBorder"
-			"border_depressed"			"NoBorder"
 		}
 	}
 }
\ No newline at end of file