Merge pull request #160 from raysfire/dev

v2020.1230

1 files changed, 126 insertions, 205 deletions

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 67398f6..5443e10 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -2,70 +2,70 @@
 {
 	"backpack_panel"
 	{
-		"ControlName"		"Frame"
-		"fieldName"			"backpack_panel"
-		"xpos"				"0"
-		"ypos"				"0"
-		"wide"				"f0"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
+		"ControlName"			"Frame"
+		"fieldName"				"backpack_panel"
+		"xpos"					"0"
+		"ypos"					"0"
+		"wide"					"f0"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override" 	"DarkGrey"
 
-		"item_xpos_offcenter_a"	"-310"
-		"item_xpos_offcenter_b"	"165"
-		"item_ypos"				"60"
-		"item_ydelta"			"80"
-		"item_mod_wide"			"40"
+		"item_xpos_offcenter_a"			"-310"
+		"item_xpos_offcenter_b"			"165"
+		"item_ypos"						"60"
+		"item_ydelta"					"80"
+		"item_mod_wide"					"40"
 
-		"item_backpack_offcenter_x"	"-288"
-		"item_backpack_xdelta"		"4"
-		"item_backpack_ydelta"		"3"
+		"item_backpack_offcenter_x"		"-288"
+		"item_backpack_xdelta"			"4"
+		"item_backpack_ydelta"			"3"
 
-		"button_xpos_offcenter"		"175"
-		"button_ypos"				"85"
-		"button_ydelta"				"80"
-		"button_override_delete_xpos" "0"
+		"button_xpos_offcenter"			"175"
+		"button_ypos"					"85"
+		"button_ydelta"					"80"
+		"button_override_delete_xpos"	"0"
 
-		"page_button_y"			"288"
-		"page_button_x_delta"	"3"
-		"page_button_y_delta"	"3"
-		"page_button_per_row"	"20"
-		"page_button_height"	"13"
+		"page_button_y"					"288"
+		"page_button_x_delta"			"3"
+		"page_button_y_delta"			"3"
+		"page_button_per_row"			"20"
+		"page_button_height"			"13"
 
 		"pagebuttons_kv"
 		{
-			"ControlName"		"EditablePanel"
-			"wide"				"10"
-			"tall"				"10"
-			"visible"			"0"
-			"bgcolor_override"	"Transparent"
-			"noitem_textcolor"	"TextColor"
+			"ControlName"			"EditablePanel"
+			"wide"					"10"
+			"tall"					"10"
+			"visible"				"0"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"			"1"
 
 			"Button"
 			{
-				"fieldName"			"Button"
-				"ControlName"		"CExButton"
-				"wide"				"25"
-				"tall"				"13"
-				"visible"			"1"
-				"bgcolor_override"	"Transparent"
-				"noitem_textcolor"	"TextColor"
+				"fieldName"				"Button"
+				"ControlName"			"CExButton"
+				"wide"					"25"
+				"tall"					"13"
+				"visible"				"1"
+				"bgcolor_override"		"Transparent"
+				"noitem_textcolor"		"TextColor"
 				"PaintBackgroundType"	"2"
-				"paintborder"		"1"
-				"textAlignment"		"center"
-				"labelText"			"%page%"
-				"font"				"HudFontSmallest"
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
+				"paintborder"			"1"
+				"textAlignment"			"center"
+				"labelText"				"%page%"
+				"font"					"HudFontSmallest"
+				"sound_depressed"		"UI/buttonclick.wav"
+				"sound_released"		"UI/buttonclickrelease.wav"
 			}
 
 			"New"
@@ -95,27 +95,27 @@
 
 		"modelpanels_kv"
 		{
-			"ControlName"	"CItemModelPanel"
-			"xpos"			"c-70"
-			"ypos"			"270"
-			"wide"			"54"
-			"tall"			"42"
-			"visible"		"0"
+			"ControlName"			"CItemModelPanel"
+			"xpos"					"c-70"
+			"ypos"					"270"
+			"wide"					"54"
+			"tall"					"42"
+			"visible"				"0"
 			"bgcolor_override"		"Transparent"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"1"
+			"paintborder"			"1"
 
-			"model_xpos"	"2"
-			"model_ypos"	"5"
-			"model_wide"	"50"
-			"model_tall"	"35"
-			"text_ypos"		"60"
-			"text_center"	"1"
-			"name_only"		"1"
+			"model_xpos"			"2"
+			"model_ypos"			"5"
+			"model_wide"			"50"
+			"model_tall"			"35"
+			"text_ypos"				"60"
+			"text_center"			"1"
+			"name_only"				"1"
 
-			"inset_eq_x"	"2"
-			"inset_eq_y"	"2"
+			"inset_eq_x"			"2"
+			"inset_eq_y"			"2"
 
 			"itemmodelpanel"
 			{
@@ -126,27 +126,27 @@
 
 			"New"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"New"
-				"font"			"FontStorePrice"
-				"textAlignment"	"east"
-				"xpos"			"rs1"
-				"ypos"			"0"
-				"zpos"			"15"
-				"wide"			"25"
-				"tall"			"12"
-				"textinsetx"	"8"
-				"autoResize"	"0"
+				"ControlName"		"CExLabel"
+				"fieldName"			"New"
+				"font"				"FontStorePrice"
+				"textAlignment"		"east"
+				"xpos"				"rs1"
+				"ypos"				"0"
+				"zpos"				"15"
+				"wide"				"25"
+				"tall"				"12"
+				"textinsetx"		"8"
+				"autoResize"		"0"
 				"skip_autoresize"	"1"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"labelText"		"#Store_Price_New"
+				"pinCorner"			"0"
+				"visible"			"0"
+				"enabled"			"1"
+				"labelText"			"#Store_Price_New"
 				"mouseinputenabled" "0"
 				"paintbackground"	"0"
 				"proportionaltoparent"	"1"
-				"border"		"StoreNewBorder"
-				"fgcolor"		"10 10 10 255"
+				"border"			"StoreNewBorder"
+				"fgcolor"			"10 10 10 255"
 			}
 
 			"use_item_sounds"	"1"
@@ -182,7 +182,7 @@
 		"xpos"				"c-270"
 		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"370"
+		"wide"				"200"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -531,6 +531,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"canceltool"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"bgcolor_override"	"DarkerGrey"
@@ -621,37 +622,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PositionLabel"
@@ -795,37 +780,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1016,37 +985,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1238,37 +1191,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1459,37 +1396,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"