Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 61 insertions, 45 deletions

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index fdaedfc..d3259c3 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -157,7 +157,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CaratLabel"
-		"font"				"HudFontMediumSmallSecondary"
+		"font"				"HudFontMediumSmall"
 		"labelText"			">>"
 		"textAlignment"		"west"
 		"xpos"				"c-290"
@@ -176,13 +176,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ClassLabel"
-		"font"				"HudFontMediumBold"
+		"font"				"HudFontMedium"
 		"labelText"			"#ClassBeingEquipped"
 		"textAlignment"		"west"
 		"xpos"				"c-270"
 		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"200"
+		"wide"				"350"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -211,7 +211,7 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"			"ShowRarityComboBox"
-		"font"				"HudFontSmallestBold"
+		"font"				"HudFontSmallest"
 		"wrap"				"0"
 		"xpos"				"c-58"
 		"ypos"				"38"
@@ -243,10 +243,10 @@
 		"ControlName"		"CheckButton"
 		"fieldName"			"ShowBaseItemsCheckbox"
 		"labelText"			"#ShowBaseItemsCheckBox"
-		"font"				"HudFontSmallestBold"
+		"font"				"HudFontSmallest"
 		"textAlignment"		"east"
-		"xpos"				"c-60"
-		"ypos"				"15"
+		"xpos"				"c-170"
+		"ypos"				"34"
 		"zpos"				"1"
 		"wide"				"120"
 		"tall"				"20"
@@ -264,13 +264,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NameFilterLabel"
-		"font"				"HudFontSmallestBold"
+		"font"				"HudFontSmallest"
 		"labelText"			"#Store_NameFilterLabel"
 		"textAlignment"		"west"
 		"xpos"				"c117"
-		"ypos"				"0"
+		"ypos"				"17"
 		"zpos"				"1"
-		"wide"				"90"
+		"wide"				"40"
 		"tall"				"15"
 		"autoResize"		"1"
 		"pinCorner"			"0"
@@ -283,10 +283,10 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"			"NameFilterTextEntry"
-		"xpos"				"c117"
-		"ypos"				"15"
-		"wide"				"168"
-		"tall"				"19"
+		"xpos"				"c155"
+		"ypos"				"17"
+		"wide"				"130"
+		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -295,8 +295,8 @@
 		"textHidden"		"0"
 		"editable"			"1"
 		"unicode"			"1"
-		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"DarkerGrey"
+		"fgcolor_override"	"DarkerGrey"
+		"bgcolor_override"	"TanLight"
 		"paintbackgroundtype" "2"
 		"font"				"HudFontSmallest"
 	}
@@ -305,7 +305,7 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"			"SortByComboBox"
-		"font"				"HudFontSmallestBold"
+		"font"				"HudFontSmallest"
 		"xpos"				"c117"
 		"ypos"				"37"
 		"zpos"				"1"
@@ -400,7 +400,7 @@
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
 		"xpos"			"c-288"
-		"ypos"			"40"
+		"ypos"			"37"
 		"zpos"			"1"
 		"wide"			"25"
 		"tall"			"15"
@@ -415,8 +415,15 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"prevpage"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		
+		"paintbackground"			"0"
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
+		
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"CurPageLabel"
@@ -427,10 +434,10 @@
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
 		"xpos"			"c-260"
-		"ypos"			"40"
+		"ypos"			"37"
 		"zpos"			"1"
 		"wide"			"53"
-		"tall"			"13"
+		"tall"			"15"
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -443,7 +450,7 @@
 		"ControlName"	"CExButton"
 		"fieldName"		"NextPageButton"
 		"xpos"			"c-204"
-		"ypos"			"40"
+		"ypos"			"37"
 		"zpos"			"1"
 		"wide"			"25"
 		"tall"			"15"
@@ -458,8 +465,15 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"nextpage"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		
+		"paintbackground"			"0"
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
+		
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"DragToNextPageButton"
@@ -477,11 +491,12 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		">"
-		"font"			"HudFontMediumBold"
+		"font"			"HudFontMedium"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		""
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -501,11 +516,12 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"<"
-		"font"			"HudFontMediumBold"
+		"font"			"HudFontMedium"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		""
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -515,7 +531,7 @@
 		"ControlName"	"CExButton"
 		"fieldName"		"CancelApplyToolButton"
 		"xpos"			"c117"
-		"ypos"			"37"
+		"ypos"			"38"
 		"zpos"			"1"
 		"wide"			"168"
 		"tall"			"15"
@@ -574,7 +590,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"#BackpackItemsExplanation_Title"
 			"textAlignment"	"north"
 			"xpos"			"20"
@@ -643,7 +659,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"%explanationnumber%"
 			"textAlignment"	"center"
 			"xpos"			"0"
@@ -673,7 +689,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -732,7 +748,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"#BackpackPagesExplanation_Title"
 			"textAlignment"	"north"
 			"xpos"			"20"
@@ -848,7 +864,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"%explanationnumber%"
 			"textAlignment"	"center"
 			"xpos"			"0"
@@ -878,7 +894,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -937,7 +953,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"#BackpackContextExplanation_Title"
 			"textAlignment"	"north"
 			"xpos"			"20"
@@ -1017,7 +1033,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1064,7 +1080,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1100,7 +1116,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"%explanationnumber%"
 			"textAlignment"	"center"
 			"xpos"			"0"
@@ -1143,7 +1159,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"#BackpackStockExplanation_Title"
 			"textAlignment"	"north"
 			"xpos"			"20"
@@ -1223,7 +1239,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1270,7 +1286,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1306,7 +1322,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"%explanationnumber%"
 			"textAlignment"	"center"
 			"xpos"			"0"
@@ -1348,7 +1364,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"#BackpackSortExplanation_Title"
 			"textAlignment"	"north"
 			"xpos"			"20"
@@ -1428,7 +1444,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1464,7 +1480,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmall"
 			"labelText"		"%explanationnumber%"
 			"textAlignment"	"center"
 			"xpos"			"0"