Updated the backpack and store pages

- Fixed various bugs and inconsistencies in the Item and Store pages.
- Updated the item options icons.

1 files changed, 30 insertions, 42 deletions

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index f5ff0a0..66d513e 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -160,29 +160,29 @@
 		"font"				"Cerbetica16"
 		"labelText"			">>"
 		"textAlignment"		"west"
-		"xpos"				"c-300"
-		"ypos"				"20"
+		"xpos"				"c-290"
+		"ypos"				"26"
 		"zpos"				"1"
 		"wide"				"20"
-		"tall"				"15"
+		"tall"				"16"
 		"autoResize"		"1"
 		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fgcolor_override"	"200 128 255 255"
+		"visible"			"0"
+		"enabled"			"0"
+		"fgcolor_override"	"ColorPurple"
 	}
 	
 	"ClassLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ClassLabel"
-		"font"				"HudFontMediumSmall"
+		"font"				"HudFontMediumBold"
 		"labelText"			"#ClassBeingEquipped"
 		"textAlignment"		"west"
 		"xpos"				"c-280"
-		"ypos"				"15"
+		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"250"
+		"wide"				"370"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -213,10 +213,10 @@
 		"fieldName"			"ShowRarityComboBox"
 		"font"				"HudFontSmallestBold"
 		"wrap"				"0"
-		"xpos"				"c-25"
-		"ypos"				"37"
+		"xpos"				"c-58"
+		"ypos"				"38"
 		"zpos"				"1"
-		"wide"				"150"
+		"wide"				"168"
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -228,7 +228,6 @@
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
 		"default"			"0"
-		"border"			"CyanBorder"
 		
 		"fgcolor_override"					"TanLight"
 		"bgcolor_override"					"Transparent"
@@ -246,8 +245,8 @@
 		"labelText"			"#ShowBaseItemsCheckBox"
 		"font"				"HudFontSmallestBold"
 		"textAlignment"		"east"
-		"xpos"				"c-29"
-		"ypos"				"15"
+		"xpos"				"c-165"
+		"ypos"				"36"
 		"zpos"				"1"
 		"wide"				"120"
 		"tall"				"20"
@@ -268,7 +267,7 @@
 		"font"				"HudFontSmallestBold"
 		"labelText"			"#Store_NameFilterLabel"
 		"textAlignment"		"west"
-		"xpos"				"c+137"
+		"xpos"				"c117"
 		"ypos"				"0"
 		"zpos"				"1"
 		"wide"				"90"
@@ -285,9 +284,9 @@
 		"ControlName"		"TextEntry"
 		"fieldName"			"NameFilterTextEntry"
 		"font"				"HudFontSmallest"
-		"xpos"				"c+137"
+		"xpos"				"c117"
 		"ypos"				"15"
-		"wide"				"150"
+		"wide"				"168"
 		"tall"				"19"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -309,16 +308,15 @@
 		"ControlName"		"ComboBox"
 		"fieldName"			"SortByComboBox"
 		"font"				"HudFontSmallestBold"
-		"xpos"				"c137"
+		"xpos"				"c117"
 		"ypos"				"37"
 		"zpos"				"1"
-		"wide"				"150"
+		"wide"				"168"
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"1"
 		"textHidden"		"0"
 		"editable"			"0"
 		"maxchars"			"-1"
@@ -348,7 +346,7 @@
 		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
-		"text_ypos"			"20"
+		"text_ypos"			"10"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
@@ -428,7 +426,7 @@
 		"depressedBgColor_override"	"25 25 25 255"
 		
 		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"ColorCyan"
 		"depressedFgColor_override" "TanDark"
 	}
 	
@@ -480,7 +478,7 @@
 		"depressedBgColor_override"	"25 25 25 255"
 		
 		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"ColorCyan"
 		"depressedFgColor_override" "TanDark"
 	}
 	
@@ -536,10 +534,10 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CancelApplyToolButton"
-		"xpos"			"c137"
+		"xpos"			"c117"
 		"ypos"			"37"
 		"zpos"			"1"
-		"wide"			"150"
+		"wide"			"168"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -555,17 +553,7 @@
 		"Command"		"canceltool"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-	
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanDark"
-		
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
+		"bgcolor_override"	"DarkerGrey"
 	}
 	
 	"ShowExplanationsButton"
@@ -767,11 +755,11 @@
 		"paintbackground" "0"
 		"border"		"MainMenuHighlightBorder"
 		"force_close"	"1"
-		"end_x"			"c-50"
+		"end_x"			"c-250"
 		"end_y"			"130"
 		"end_wide"		"300"
 		"end_tall"		"115"
-		"callout_inparents_x"	"c240"
+		"callout_inparents_x"	"c-250"
 		"callout_inparents_y"	"290"
 		"next_explanation"		"ContextExplanation"
 		
@@ -990,9 +978,9 @@
 		"end_x"			"c-150"
 		"end_y"			"80"
 		"end_wide"		"300"
-		"end_tall"		"205"
-		"callout_inparents_x"	"c-30"
-		"callout_inparents_y"	"323"
+		"end_tall"		"165"
+		"callout_inparents_x"	"c0"
+		"callout_inparents_y"	"c0"
 		"next_explanation"		"ArmoryExplanation"
 		
 		"TitleLabel"