Fixed items not having a quality color; fixed collection items displaying incorrectly; fixed background on mouseover

2 files changed, 414 insertions, 19 deletions

diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index a7d5d21..cc7e956 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -73,8 +73,8 @@
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"1"
-			"wide"			"8"
-			"tall"			"70"
+			"wide"			"12"
+			"tall"			"16"
 			"autoResize"	"0"
 			"visible"		"0"
 			"enabled"		"1"
@@ -282,23 +282,41 @@
 		"resize_to_text"	"1"
 		"padding_height"	"15"
 		
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"0"
-			"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"
-		}
+		"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"
+			}
+    	}
 	}
 	
 	"PassiveAttribsLabel"
@@ -560,6 +578,9 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
+		"image_drawcolor"	"TanLight"
+		"image_armedcolor"	"Button Color"
+		
 		"SubImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -597,6 +618,9 @@
 		"Command"		"tauntloadout"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+		
+		"image_drawcolor"	"TanLight"
+		"image_armedcolor"	"Button Color"
 
 		"SubImage"
 		{
diff --git a/resource/ui/econ/itemmodelpanelcollectionitem.res b/resource/ui/econ/itemmodelpanelcollectionitem.res
new file mode 100644
index 0000000..b02adb3
--- /dev/null
+++ b/resource/ui/econ/itemmodelpanelcollectionitem.res
@@ -0,0 +1,371 @@
+"Resource/UI/ItemModelPanelCollectionItem.res"
+{
+	"mouseoveritempanel"
+	{
+		"fieldName"			"mouseoveritempanel"
+		"collection_wide"		"360"
+		"collection_list_xpos"	"200"
+		"is_mouseover"		"1"
+		"text_xpos_collection"	"15"
+		"text_ypos"			"15"
+		"model_xpos"	"3"
+		"model_ypos"	"3"
+		"model_wide"	"195"
+		"model_tall"	"130"
+		"text_forcesize" "2"
+	}
+	
+	"LoadingSpinner"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"LoadingSpinner"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"1"		
+		"wide"			"f0"
+		"tall"			"f0"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+		"paintborder"	"0"
+		"image"			"animated/tf2_logo_hourglass"
+		"scaleImage"	"1"
+	}
+
+	"MainContentsContainer"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"MainContentsContainer"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"bgcolor_override"		"35 35 35 255"
+		
+		"itemmodelpanel"
+		{
+			"ControlName"		"CEmbeddedItemModelPanel"
+			"fieldName"		"itemmodelpanel"
+	
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"1"		
+			"wide"			"140"
+			"tall"			"100"
+			"autoResize"		"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"useparentbg"		"1"
+			"proportionaltoparent" "1"
+		
+			"inset_eq_x"	"2"
+			"inset_eq_y"	"2"
+
+			"disable_manipulation"	"1"
+
+			"force_use_model"		"1"
+			"use_item_rendertarget" "0"
+			"allow_rot"				"0"
+			"use_pedestal"			"1"
+			"use_particle"			"1"
+			"fov"					"75"
+
+			"model_rotate_yaw_speed"	"50"
+		
+			"model"
+			{
+				"force_pos"	"1"
+
+				"angles_x" "7"
+				"angles_y" "130"
+				"angles_z" "0"
+				"origin_x" "175"
+				"origin_y" "0"
+				"origin_z" "0"
+				"frame_origin_x"	"0"
+				"frame_origin_y"	"0"
+				"frame_origin_z"	"0"
+				"spotlight" "1"
+				"modelname"		""
+			}
+		}
+	
+		"namelabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"namelabel"
+			"font"			"ItemFontNameLarge"
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"2"
+			"wide"			"100"
+			"tall"			"30"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%itemname%"
+			"textAlignment"	"west"
+			"fgcolor"		"235 226 202 255"
+			"centerwrap"	"1"
+		}
+		
+		"attriblabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"attriblabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"0"
+			"ypos"			"30"
+			"zpos"			"2"
+			"wide"			"100"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%attriblist%"
+			"textAlignment"	"west"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"0"
+		}
+
+		"collectionnamelabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"collectionnamelabel"
+			"font"			"ItemFontNameLarge"
+			"xpos"			"100"
+			"ypos"			"30"
+			"zpos"			"2"
+			"wide"			"100"
+			"tall"			"30"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%collectionname%"
+			"textAlignment"	"west"
+			"fgcolor"		"235 226 202 255"
+			"centerwrap"	"0"
+		}
+	
+		"collectionlistlabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"collectionlistlabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"100"
+			"ypos"			"60"
+			"zpos"			"2"
+			"wide"			"100"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%collectionlist%"
+			"textAlignment"	"west"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"0"
+		}
+			
+		"collectionhighlight"
+		{
+			"ControlName"	"EditablePanel"
+			"fieldName"		"collectionhighlight"
+			"xpos"			"208"
+			"ypos"			"42"
+			"zpos"			"1"
+			"wide"			"145"
+			"tall"			"9"
+			"visible"		"1"
+			"PaintBackgroundType"	"2"
+			"bgcolor_override"		"215 206 182 255"
+		}
+		
+		"equippedlabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"equippedlabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"37"
+			"ypos"			"28"
+			"zpos"			"2"
+			"wide"			"35"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"#ItemPanelEquipped"
+			"textAlignment"	"center"
+			"fgcolor"		"200 80 60 255"
+			"bgcolor_override"		"0 0 0 255"
+			"PaintBackgroundType"	"2"
+		}
+	
+		"paint_icon"
+		{
+			"ControlName"	"CItemMaterialCustomizationIconPanel"
+			"fieldName"		"paint_icon"
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"2"
+			"wide"			"16"
+			"tall"			"16"
+			"visible"		"0"
+			"enabled"		"1"
+
+		}
+
+		"quantitylabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"quantitylabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"wide"			"10"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"labelText"		""
+			"textAlignment"	"center"
+			"fgcolor"		"200 80 60 255"
+			"bgcolor_override"		"0 0 0 255"
+			"PaintBackgroundType"	"2"
+		}
+
+		"serieslabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"serieslabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"wide"			"14"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"labelText"		""
+			"textAlignment"	"center"
+			"fgcolor"		"200 180 60 255"
+			"bgcolor_override"		"0 40 30 255"
+			"PaintBackgroundType"	"2"
+		}
+
+		"matcheslabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"matcheslabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"wide"			"20"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"labelText"		""
+			"textAlignment"	"center"
+			"fgcolor"		"200 180 60 255"
+			"bgcolor_override"		"0 40 30 255"
+			"PaintBackgroundType"	"2"
+		}
+
+		"vision_restriction_icon"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"vision_restriction_icon"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"wide"			"16"
+			"tall"			"16"
+			"visible"		"0"
+			"enabled"		"1"
+			"scaleImage"	"1"
+		}
+		"is_strange_icon"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"is_strange_icon"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"wide"			"16"
+			"tall"			"16"
+			"visible"		"0"
+			"enabled"		"1"
+			"scaleImage"	"1"
+		}
+		"is_unusual_icon"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"is_unusual_icon"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"wide"			"16"
+			"tall"			"16"
+			"visible"		"0"
+			"enabled"		"1"
+			"scaleImage"	"1"
+		}
+		
+		"contained_item_panel"
+		{
+			"ControlName"	"CItemModelPanel"
+			"xpos"			"32"
+			"ypos"			"20"
+			"zpos"			"4"
+			"wide"			"18"
+			"tall"			"18"
+			"visible"		"0"
+			"bgcolor_override"		"0 0 0 200"
+			"noitem_textcolor"		"117 107 94 255"
+			"PaintBackgroundType"	"2"
+			"paintborder"	"0"
+			"useparentbg"	"0"
+		
+			"enabled"		"1"
+		
+			"model_xpos"	"1"
+			"model_ypos"	"1"
+			"model_wide"	"16"
+			"model_tall"	"16"
+			"text_ypos"		"60"
+			"text_center"	"1"
+			"model_only"	"1"
+		
+			"inset_eq_x"	"2"
+			"inset_eq_y"	"2"
+		
+			"itemmodelpanel"
+			{
+				"use_item_rendertarget" "0"
+				"allow_rot"				"0"
+			}
+		
+			"use_item_sounds"	"1"
+		}
+	}
+}