Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 40 insertions, 69 deletions

diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index 7343859..61802f9 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -15,27 +15,27 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 		
-		"item_ypos"		"60"
-		"item_ydelta"	"80"
-		"item_backpack_offcenter_x"		"-288"
-		"item_backpack_xdelta"			"4"
-		"item_backpack_ydelta"			"3"
+		"item_ypos"					"60"
+		"item_ydelta"				"80"
+		"item_backpack_offcenter_x"	"-288"
+		"item_backpack_xdelta"		"4"
+		"item_backpack_ydelta"		"3"
 
 		"modelpanels_selection_kv"
 		{
-			"wide"			"94"
-			"tall"			"70"
-			"model_xpos"	"2"
-			"model_wide"	"90"
-			"model_tall"	"50"
-			"model_center_x" "1"
-			"text_ypos"		"0"
-			"text_forcesize" "2"
-			"text_center"	"0"
-			"text_yoffset"	"2"
-			"inset_eq_y"	"55"
+			"wide"				"94"
+			"tall"				"70"
+			"model_xpos"		"2"
+			"model_wide"		"90"
+			"model_tall"		"50"
+			"model_center_x" 	"1"
+			"text_ypos"			"0"
+			"text_forcesize"	"2"
+			"text_center"		"0"
+			"text_yoffset"		"2"
+			"inset_eq_y"		"55"
 			"deferred_description"	"1"
 			"deferred_icon"			"1"
 		}
@@ -48,7 +48,7 @@
 			"tall"			"42"
 			"visible"		"0"
 			"bgcolor_override"		"Transparent"
-			"noitem_textcolor"		"117 107 94 255"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"1"
 			
@@ -146,6 +146,7 @@
 	{
 		"ControlName"	"TextEntry"
 		"fieldName"		"NameFilterTextEntry"
+		"font"			"HudFontSmallest"
 		"xpos"			"c+205"
 		"ypos"			"30"
 		"zpos"			"2"
@@ -162,7 +163,6 @@
 		"fgcolor_override"	"TanLight"
 		"bgcolor_override"	"15 15 15 255"
 		"paintbackgroundtype" "2"
-		"font"		"HudFontSmallest"
 	}
 	
 	"TopLine"
@@ -230,7 +230,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
-		"fgcolor_override" "200 80 60 255"
+		"fgcolor_override" "LightRed"
 	}
 	
 	"CancelButton"
@@ -262,10 +262,10 @@
 		"ControlName"	"CheckButton"
 		"fieldName"		"OnlyAllowUniqueQuality"
 		"labelText"		"#OnlyAllowUniqueQuality"
-		"Font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallestBold"
 		"textAlignment"	"east"
-		"xpos"			"c-306"
-		"ypos"			"340"
+		"xpos"			"c-291"
+		"ypos"			"320"
 		"zpos"			"1"
 		"wide"			"290"
 		"tall"			"25"
@@ -275,7 +275,7 @@
 		"enabled"		"1"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
+	}
 	
 	"ShowBackpack"
 	{
@@ -300,24 +300,15 @@
 		"Command"		"show_backpack"
 		"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"			"NoBorder"
-		"border_armed"				"NoBorder"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 	"ShowSelection"
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"ShowSelection"
-		"xpos"			"c100"
-		"ypos"			"340"
+		"xpos"			"c-288"
+		"ypos"			"290"
 		"zpos"			"20"
 		"wide"			"200"
 		"tall"			"25"
@@ -335,13 +326,15 @@
 		"Command"		"show_selection"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 	
 	"PrevPageButton"
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
-		"xpos"			"c195"
+		"xpos"			"c205"
 		"ypos"			"290"
 		"zpos"			"1"
 		"wide"			"20"
@@ -359,17 +352,6 @@
 		"Command"		"prevpage"
 		"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"			"NoBorder"
-		"border_armed"				"NoBorder"
 	}		
 	
 	"CurPageLabel"
@@ -379,7 +361,7 @@
 		"font"			"HudFontSmallBold"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
-		"xpos"			"c220"
+		"xpos"			"c230"
 		"ypos"			"290"
 		"zpos"			"1"
 		"wide"			"40"
@@ -388,14 +370,14 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 	
 	"NextPageButton"
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"NextPageButton"
-		"xpos"			"c265"
+		"xpos"			"c275"
 		"ypos"			"290"
 		"zpos"			"1"
 		"wide"			"20"
@@ -413,17 +395,6 @@
 		"Command"		"nextpage"
 		"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"			"NoBorder"
-		"border_armed"				"NoBorder"
 	}		
 	
 	"mouseoveritempanel"
@@ -436,17 +407,17 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"1"
+		"paintborder"			"1"
 		
 		"text_ypos"			"20"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-
+		
 		"attriblabel"
 		{
 			"font"			"ItemFontAttribLarge"
@@ -461,8 +432,8 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
-    }
+	}
 }
\ No newline at end of file