Cleaned up a few files

6 files changed, 108 insertions, 70 deletions

diff --git a/resource/ui/econ/BackpackPanel.res b/resource/ui/econ/BackpackPanel.res
index 817a217..f1c9b86 100644
--- a/resource/ui/econ/BackpackPanel.res
+++ b/resource/ui/econ/BackpackPanel.res
@@ -116,9 +116,6 @@
 			
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
-
-			"deferred_description"	"1"
-			"deferred_icon"			"1"
 			
 			"itemmodelpanel"
 			{
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index fccd176..86fdb7b 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -4,7 +4,6 @@
 	"mouseoveritempanel"
 	{
 		"fieldName"				"mouseoveritempanel"
-		"collection_wide"		"500"
 		"collection_list_xpos"	"250"
 		"is_mouseover"			"1"
 		"text_xpos_collection"	"0"
diff --git a/resource/ui/econ/cyclingadcontainer.res b/resource/ui/econ/cyclingadcontainer.res
index eb4b5f8..9fa1c4d 100644
--- a/resource/ui/econ/cyclingadcontainer.res
+++ b/resource/ui/econ/cyclingadcontainer.res
@@ -1,16 +1,5 @@
 "Resource/UI/econ/CyclingAdContainer.res"
 {
-	"ButtonContainer"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ButtonContainer"
-		"xpos"		"0"
-		"ypos"		"0"
-		"zpos"		"2"
-		"wide"		"f0"
-		"tall"		"10"
-		"proportionaltoparent"	"1"
-	}
 
 	"PrevButton"
 	{
@@ -38,7 +27,13 @@
 		"actionsignallevel" "2"
 
 		"defaultBgColor_override"	"0 0 0 150"
-		"armedBgColor_override"		"0 0 0 200"
+		"armedBgColor_override"		"Orange"
+
+		"armedFgColor_override"		"TanLight"
+
+		"sound_armed"		"ui/item_info_mouseover.wav"
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
 	}
 
 	"NextButton"
@@ -67,7 +62,14 @@
 		"actionsignallevel" "2"
 
 		"defaultBgColor_override"	"0 0 0 150"
-		"armedBgColor_override"		"0 0 0 200"
+		"armedBgColor_override"		"Orange"
+
+
+		"armedFgColor_override"		"TanLight"
+
+		"sound_armed"		"ui/item_info_mouseover.wav"
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
 	}
 
 	"AdsContainer"
@@ -85,6 +87,20 @@
 		"proportionaltoparent"	"1"
 	}
 
+	"Frame"
+	{
+		"Controlname"	"EditablePanel"
+		"fieldName"		"Frame"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"f0"
+		"zpos"			"5"
+		"proportionaltoparent"	"1"
+		"border"		"InnerShadowBorder"
+		"mouseinputenabled"	"0"
+	}	
+
 	"FadeTransition"
 	{
 		"ControlName"			"EditablePanel"
@@ -100,7 +116,7 @@
 		"proportionaltoparent"	"1"
 		"mouseinputenabled"		"0"
 
-		"bgcolor_override"		"0 0 0 255"
+		"bgcolor_override"		"26 23 22 255"
 	}
 
 }
diff --git a/resource/ui/econ/itemmodelpanelcollectionitem.res b/resource/ui/econ/itemmodelpanelcollectionitem.res
index d087cd1..d7f8ee9 100644
--- a/resource/ui/econ/itemmodelpanelcollectionitem.res
+++ b/resource/ui/econ/itemmodelpanelcollectionitem.res
@@ -3,7 +3,6 @@
 	"mouseoveritempanel"
 	{
 		"fieldName"			"mouseoveritempanel"
-		"collection_wide"		"360"
 		"collection_list_xpos"	"200"
 		"is_mouseover"		"1"
 		"text_xpos_collection"	"15"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 32fbee9..4052019 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -539,7 +539,7 @@
 		
 		"render_texture"	"0"
 		"fov"			"40"
-		"allow_rot"		"0"
+		"allow_rot"		"1"
 
 		"paintbackground" "1"		
 		"paintbackgroundenabled" "1"
@@ -1263,6 +1263,51 @@
 			"scaleImage"	"1"
 		}				
 	}
+
+	"OptionsButton"
+	{
+		"ControlName"	"CExImageButton"
+		"fieldName"		"OptionsButton"
+		"xpos"			"c-63"
+		"ypos"			"c-123"
+		"zpos"			"20"
+		"wide"			"11"
+		"tall"			"11"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labeltext"		""
+		"font"			"HudFontSmallBold"
+		"textAlignment"	"center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"default"		"0"
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		"Command"		"options"
+		
+		"paintbackground"	"0"
+		
+		"image_drawcolor"	"118 107 94 200"
+		"image_armedcolor"	"246 247 213 255"
+		
+		"SubImage"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"SubImage"
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"1"
+			"wide"			"11"
+			"tall"			"11"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"glyph_options"
+			"scaleImage"	"1"
+		}				
+	}
 	
 	"TeamNavPanel"
 	{
@@ -1363,31 +1408,6 @@
 			}
 		}
 	}
-	
-	"PaintButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"PaintButton"
-		"xpos"			"c-158"
-		"ypos"			"c-140"
-		"zpos"			"20"
-		"wide"			"76"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#Store_Paint"
-		"font"			"HudFontSmallest"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"paint_toggle"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
 
 	"CycleTextLabel"
 	{
@@ -1406,28 +1426,7 @@
 		"enabled"		"1"
 		"wrap"			"1"
 		"centerwrap"	"1"
-	}		
-
-	"NextStyleButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"NextStyleButton"
-		"zpos"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#Store_NextStyle"
-		"font"			"HudFontSmallest"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"next_style"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}	
+	}
 
 	//---
 	// Hack - put these two labels off-screen, since we have cycle text to take the place of both of them
@@ -1580,7 +1579,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"#Store_AddToCart"
+		"labelText"		"%storeaddtocart%"
 		"font"			"HudFontSmallishBold"
 		"textAlignment"	"center"
 		"dulltext"		"0"
@@ -1593,5 +1592,33 @@
 		"defaultBgColor_override"	"76 107 34 255"
 		"ArmedBgColor_override"	"86 117 44 255"
 		"depressedBgColor_override" "66 97 24 255"
-	}	
+	}
+	
+	"mouseoveritempanel"
+	{
+		"fieldName"		"mouseoveritempanel"
+		"xpos"			"c-70"
+		"ypos"			"270"
+		"zpos"			"1001"
+		"wide"			"200"
+		"tall"			"150"
+		"visible"		"0"
+		"bgcolor_override"		"0 0 0 0"
+		"noitem_textcolor"		"117 107 94 255"
+		"PaintBackgroundType"	"2"
+		"paintborder"	"1"
+
+		"text_center_x"		"1"
+		"resize_to_text"	"1"
+		"padding_height"	"15"
+
+		"model_ypos"	"15"
+		"model_wide"	"150"
+		"model_tall"	"100"
+
+		"hide_collection_panel" "1"
+		"model_center_x"	"1"
+
+		"name_only"			"1"
+	}
 }
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index f5489cd..ce66aaf 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -221,7 +221,7 @@
 		
 		"itemmodelpanel"
 		{
-			"inventory_image_type" "3"
+			"inventory_image_type" "2"
 			"allow_rot"				"0"
 			"force_square_image"	"1"
 		}