Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 77 insertions, 69 deletions

diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 3a20a22..05e4276 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -9,8 +9,8 @@
 		"zpos"			"1"
 		"wide"			"o1"
 		"tall"			"p0.75"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"image"			"item_carousel_bg"
 		"scaleImage"	"1"
 		"proportionaltoparent" "1"
@@ -18,28 +18,32 @@
 
 	"ItemName"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"ItemName"
-		"xpos"			"cs-0.5"
-		"ypos"			"6"
-		"zpos"			"5"
-		"wide"			"f0"
-		"tall"			"200"
-		"visible"		"1"
+		"ControlName"		"CItemModelPanel"
+		"fieldName"			"ItemName"
+		"xpos"				"100"
+		"ypos"				"6"
+		"zpos"				"5"
+		"wide"				"400"
+		"tall"				"60"
+		"visible"			"1"
+		"paintborder"		"0"
+		"mouseinputenabled"	"0"
+		"text_ypos"			"15"
+		"text_center"		"0"
+		"paint_icon_hide"	"1"
+		"model_hide"		"1"
+		"text_forcesize"	"0"
+		"name_only"			"1"
+		"proportionaltoparent"	"0"
 		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TanDark"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"mouseinputenabled"	"0"
-		"proportionaltoparent"	"1"
-
-		"text_ypos"		"15"
-		"text_center"	"0"
-		"paint_icon_hide" "1"
-		"model_hide"	"1"
-		"text_forcesize"	"4"
-		"name_only"		"1"
 
+		"consume_mode"
+		{
+			"xpos"			"cs-1.1"
+		}
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
@@ -52,8 +56,8 @@
 	"ModelInspectionPanel"
 	{
 		"fieldName"		"ModelInspectionPanel"
-		"xpos"			"cs-0.5"
-		"ypos"			"0"
+		"xpos"			"cs-0.7"
+		"ypos"			"20"
 		"zpos"			"5"
 		"wide"			"o1.5"
 		"tall"			"p0.8"
@@ -119,8 +123,8 @@
 	{
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"TeamNavPanel"
-		"xpos"				"cs-0.5"
-		"ypos"				"p.7-16"
+		"xpos"				"cs1.4"
+		"ypos"				"c-135"
 		"zpos"				"100"
 		"wide"				"60"
 		"tall"				"25"
@@ -136,6 +140,12 @@
 		"display_vertically"	"0"
 		"align"				"west"
 
+		"consume_mode"
+		{
+			"xpos"			"cs-0.5"
+			"ypos"			"r140"
+		}
+		
 		"ButtonSettings"
 		{
 			"wide"				"19"
@@ -213,10 +223,10 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PaintkitPreviewContainer"
-		"xpos"			"cs-0.5"
-		"ypos"			"p.7"
-		"wide"			"300"
-		"tall"			"100"
+		"xpos"			"cs0.3"
+		"ypos"			"p.2"
+		"wide"			"250"
+		"tall"			"200"
 		"zpos"			"100"
 		"visible"		"1"
 		"bgcolor_override"	"DarkerGrey"
@@ -237,7 +247,8 @@
 		}
 		"consume_mode"
 		{
-			"border"		"ReplayHighlightBorder"
+			"xpos"			"cs-0.5"
+			"ypos"			"r120"
 		}
 
 		"DebugButton"
@@ -295,10 +306,10 @@
 			"fieldName"			"ComboBoxValidPaintkits"
 			"Font"				"HudFontSmallest"
 			"wrap"				"0"
-			"xpos"				"rs1-10"
+			"xpos"				"80"
 			"ypos"				"10"
 			"zpos"				"100"
-			"wide"				"200"
+			"wide"				"165"
 			"tall"				"15"
 			"autoResize"		"0"
 			"pinCorner"			"0"
@@ -318,12 +329,12 @@
 				"visible"	"0"
 			}
 
-			"fgcolor_override"	"White"
+			"fgcolor_override"	"TanLight"
 			"bgcolor_override"	"Transparent"
-			"disabledFgColor_override" "White"
+			"disabledFgColor_override" "TanDark"
 			"disabledBgColor_override" "Transparent"
 			"selectionColor_override" "Transparent"
-			"selectionTextColor_override" "White"
+			"selectionTextColor_override" "TanLight"
 			"defaultSelectionBG2Color_override" "Transparent"
 		}
 
@@ -336,13 +347,13 @@
 			"textAlignment"	"west"
 			"xpos"			"8"
 			"ypos"			"10"
-			"wide"			"80"
+			"wide"			"70"
 			"tall"			"15"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"White"
+			"fgcolor_override"	"TanLight"
 
 			"fixed_paintkit"
 			{
@@ -356,7 +367,7 @@
 			"fieldName"			"ComboBoxValidItems"
 			"Font"				"HudFontSmallest"
 			"wrap"				"0"
-			"xpos"				"rs1-10"
+			"xpos"				"80"
 			"ypos"				"30"
 
 			"fixed_paintkit"
@@ -365,7 +376,7 @@
 			}
 
 			"zpos"				"100"
-			"wide"				"200"
+			"wide"				"165"
 			"tall"				"15"
 			"autoResize"		"0"
 			"pinCorner"			"0"
@@ -385,12 +396,12 @@
 				"visible"	"0"
 			}
 
-			"fgcolor_override"	"White"
+			"fgcolor_override"	"TanLight"
 			"bgcolor_override"	"Transparent"
 			"disabledFgColor_override" "TanDark"
 			"disabledBgColor_override" "Transparent"
 			"selectionColor_override" "Transparent"
-			"selectionTextColor_override" "White"
+			"selectionTextColor_override" "TanLight"
 			"defaultSelectionBG2Color_override" "Transparent"
 		}
 
@@ -409,7 +420,7 @@
 				"ypos"		"10"
 			}
 
-			"wide"			"80"
+			"wide"			"70"
 			"tall"			"15"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -432,8 +443,8 @@
 		{
 			"ControlName"	"Slider"
 			"fieldName"		"WearSlider"
-			"xpos"			"90"
-			"ypos"			"50"
+			"xpos"			"8"
+			"ypos"			"70"
 
 			"fixed_item"
 			{
@@ -441,7 +452,7 @@
 			}
 
 			"zpos"			"1"
-			"wide"			"204"
+			"wide"			"234"
 			"tall"			"30"
 			"numticks"		"4"
 			"rangemin"		"1"
@@ -477,7 +488,7 @@
 				"ypos"		"30"
 			}
 
-			"wide"			"80"
+			"wide"			"70"
 			"tall"			"15"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -500,9 +511,9 @@
 		{
 			"ControlName"	"Button"
 			"fieldName"		"NewSeedButton"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontMediumSmall"
 			"xpos"			"8"
-			"ypos"			"75"
+			"ypos"			"125"
 
 			"fixed_item"
 			{
@@ -515,8 +526,8 @@
 			}
 
 			"zpos"			"10"
-			"wide"			"70"
-			"tall"			"20"
+			"wide"			"234"
+			"tall"			"25"
 			"autoResize"	"0"
 			"visible"		"1"
 			"enabled"		"1"
@@ -532,10 +543,8 @@
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"command"	"random_seed"
 
-			"defaultFgColor_override"	"White"
-			"defaultBgColor_override"	"Black"
-			"selectedFgColor_override"	"Black"
-			"selectedBgColor_override"	"White"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"White"
 
 			"consume_mode"
 			{
@@ -547,8 +556,8 @@
 		{
 			"ControlName"	"TextEntry"
 			"fieldName"		"SeedTextEntry"
-			"xpos"			"90"
-			"ypos"			"75"
+			"xpos"			"8"
+			"ypos"			"95"
 
 			"fixed_item"
 			{
@@ -561,7 +570,7 @@
 			}
 
 			"zpos"			"10"
-			"wide"			"115"
+			"wide"			"234"
 			"tall"			"20"
 			"autoResize"	"0"
 			"visible"		"1"
@@ -570,11 +579,12 @@
 			"actionsignallevel" "2"
 			"default"		"1"
 			"NumericInputOnly"	"1"
-			"defaultFgColor_override"	"White"
-			"defaultBgColor_override"	"Black"
-			"selectedFgColor_override"	"Black"
-			"selectedBgColor_override"	"White"
 			"maxchars"		"18"
+			"textAlignment"	"center"
+			"defaultFgColor_override"	"DarkGrey"
+			"defaultBgColor_override"	"TanLight"
+			"selectedFgColor_override"	"DarkGrey"
+			"selectedBgColor_override"	"TanLight"
 
 			"consume_mode"
 			{
@@ -586,8 +596,8 @@
 		{
 			"ControlName"	"CExButton"
 			"fieldName"		"MarketButton"
-			"xpos"			"rs1-10"
-			"ypos"			"75"
+			"xpos"			"8"
+			"ypos"			"155"
 
 			"fixed_item"
 			{
@@ -600,10 +610,10 @@
 			}
 
 			"zpos"			"100"
-			"wide"			"75"
-			"tall"			"20"
+			"wide"			"234"
+			"tall"			"25"
 			"labelText"		"#TF_ItemAd_ViewOnMarket"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontMediumSmall"
 			"textinsetx"	"0"
 			"textAlignment"	"center"
 			"proportionaltoparent"	"1"
@@ -612,10 +622,8 @@
 			"actionsignallevel" 	"2"
 			"RoundedCorners"		"0"
 
-			"defaultFgColor_override"	"White"
-			"defaultBgColor_override"	"Black"
-			"selectedFgColor_override"	"Black"
-			"selectedBgColor_override"	"White"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"White"
 
 			"sound_armed"		"ui/item_info_mouseover.wav"
 			"sound_depressed"	"UI/buttonclick.wav"