Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 70 insertions, 71 deletions

diff --git a/resource/ui/econ/ConfirmApplyGiftWrapDialog.res b/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
index c9b120d..10195b6 100644
--- a/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
+++ b/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
@@ -9,13 +9,12 @@
 		"ypos"				"c-200"
 		"wide"				"400"
 		"tall"				"240"
+		"bgcolor_override"	"DarkGrey"
+		"paintbackgroundtype" "0"
 		"settitlebarvisible" "0"
-		"paintborder"		"2"
-		"paintbackground"	"1"
 		"border"			"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
 	}
-
+	
 	"mouseoveritempanel"
 	{
 		"ControlName"		"CItemModelPanel"
@@ -26,8 +25,8 @@
 		"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"
 		"text_ypos"			"20"
@@ -35,7 +34,7 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-
+		
 		"attriblabel"
 		{
 			"font"			"ItemFontAttribLarge"
@@ -50,67 +49,67 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
-    }
-
+	}
+	
 	"TitleLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"Cerbetica22"
-		"labelText"			"dynamic"
-		"textAlignment"		"center"
-		"xpos"				"100"
-		"ypos"				"10"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"60"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
+		"ControlName"	"CExLabel"
+		"fieldName"		"TitleLabel"
+		"font"			"Cerbetica22"
+		"labelText"		"dynamic"
+		"textAlignment"	"center"
+		"xpos"			"100"
+		"ypos"			"10"
+		"zpos"			"0"
+		"wide"			"200"
+		"tall"			"60"
+		"autoResize"	"1"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"centerwrap"	"1"
 	}
-
+	
 	"ToolBG"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ToolBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_SelfMade"
+		"ControlName"	"CExLabel"
+		"fieldName"		"ToolBG"
+		"font"			"HudFontSmallBold"
+		"labelText"		""
+		"textAlignment"	"east"
+		"xpos"			"10"
+		"ypos"			"10"
+		"zpos"			"-1"
+		"wide"			"84"
+		"tall"			"64"
+		"autoResize"	"1"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"paintbackground" "0"
+		"border"		"BackpackItemBorder_SelfMade"
 	}
 	"tool_icon"
 	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"tool_icon"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"112 176 74 255"
-	}				
+		"ControlName"	"ScalableImagePanel"
+		"fieldName"		"tool_icon"
+		"xpos"			"10"
+		"ypos"			"10"
+		"zpos"			"2"
+		"wide"			"16"
+		"tall"			"16"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"backpack_jewel_modify_target_b_g"
+		"tileImage"		"0"
+		"tileVertically" "0"
+		"drawcolor"		"112 176 74 255"
+	}
 	"tool_modelpanel"
-	{		
+	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"tool_modelpanel"
 		"xpos"			"10"
@@ -119,8 +118,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -131,7 +130,7 @@
 		"text_center"	"1"
 		"name_only"		"1"
 		"paint_icon_hide" "1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
@@ -173,9 +172,9 @@
 		"tileImage"		"0"
 		"tileVertically" "0"
 		"drawcolor"		"71 98 145 255"
-	}	
+	}
 	"subject_modelpanel"
-	{		
+	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"subject_modelpanel"
 		"xpos"			"300"
@@ -184,8 +183,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -195,7 +194,7 @@
 		"text_ypos"		"100"
 		"text_center"	"1"
 		"name_only"		"1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
@@ -203,7 +202,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
-
+	
 	"ConfirmLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -222,7 +221,7 @@
 		"enabled"		"1"
 		"fgcolor_override" "Yellow"
 	}
-
+	
 	"ConfirmLabelStrange"
 	{
 		"ControlName"	"CExLabel"
@@ -241,7 +240,7 @@
 		"enabled"		"1"
 		"fgcolor_override" "Yellow"
 	}
-
+	
 	"CancelButton"
 	{
 		"ControlName"	"CExButton"
@@ -257,7 +256,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -268,7 +267,7 @@
 		"border_default"	"ButtonHover"
 		"border_armed"		"ButtonHover"
 	}
-
+	
 	"OkButton"
 	{
 		"ControlName"	"CExButton"
@@ -284,7 +283,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"