040114 update

roninopf · Apr 2, 2014 · ec9b316 · ec9b316
1 parent 3b9c843
commit ec9b316
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 100 deletions.
diff --git a/resource/ui/dynamicrecipepanel.res b/resource/ui/dynamicrecipepanel.res
@@ -134,7 +134,7 @@
 			"xpos"			"0"
 			"ypos"			"35"
 			"zpos"			"1"
-			"wide"			"200"
+			"wide"			"f0"
 			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -152,7 +152,7 @@
 			"xpos"			"0"
 			"ypos"			"238"
 			"zpos"			"1"
-			"wide"			"200"
+			"wide"			"f0"
 			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -302,6 +302,27 @@
 			"wrap"			"1"
 		}
 
+		"UntradableCheckBox"
+		{
+			"ControlName"	"CheckButton"
+			"fieldName"		"UntradableCheckBox"
+			"labelText"		"#Dynamic_Recipe_Untradable_Checkbox"
+			"Font"			"HudFontSmallestBold"
+			"textAlignment"	"west"
+			"xpos"			"-4"
+			"ypos"			"2"
+			"zpos"			"1"
+			"wide"			"280"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"fgcolor"		"200 187 161 255"
+		}
+
 		"BackpackItems"
 		{
 			"ControlName"	"CExLabel"

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
@@ -32,6 +32,12 @@
 		"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"
 
 		"modelpanels_kv"
 		{
@@ -293,19 +299,20 @@
 		"xpos"			"c-70"
 		"ypos"			"270"
 		"zpos"			"100"
-		"wide"			"54"
-		"tall"			"42"
+		"wide"			"27"
+		"tall"			"21"
 		"visible"		"0"
 		"bgcolor_override"		"0 0 0 0"
 		"noitem_textcolor"		"117 107 94 255"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 
-		"model_ypos"	"5"
-		"model_tall"	"35"
-		"text_ypos"		"60"
+		"model_ypos"	"3"
+		"model_tall"	"18"
+		"text_ypos"		"30"
 		"text_center"	"1"
 		"name_only"		"1"
+		"model_only"	"1"
 
 		"itemmodelpanel"
 		{
@@ -314,72 +321,72 @@
 		}
 	}
 
-	"PrevPageButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"PrevPageButton"
-		"xpos"			"c195"
-		"ypos"			"290"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"<"
-		"font"			"HudFontSmallBold"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"prevpage"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}		
-
-	"CurPageLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallBold"
-		"labelText"		"%backpackpage%"
-		"textAlignment"	"center"
-		"xpos"			"c220"
-		"ypos"			"290"
-		"zpos"			"1"
-		"wide"			"40"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override" "200 80 60 255"
-	}
-
-	"NextPageButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"NextPageButton"
-		"xpos"			"c265"
-		"ypos"			"290"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		">"
-		"font"			"HudFontSmallBold"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"nextpage"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}		
+	//"PrevPageButton"
+	//{
+	//	"ControlName"	"CExButton"
+	//	"fieldName"		"PrevPageButton"
+	//	"xpos"			"c195"
+	//	"ypos"			"290"
+	//	"zpos"			"1"
+	//	"wide"			"20"
+	//	"tall"			"20"
+	//	"autoResize"	"0"
+	//	"pinCorner"		"0"
+	//	"visible"		"1"
+	//	"enabled"		"1"
+	//	"tabPosition"	"0"
+	//	"labelText"		"<"
+	//	"font"			"HudFontSmallBold"
+	//	"textAlignment"	"center"
+	//	"dulltext"		"0"
+	//	"brighttext"	"0"
+	//	"Command"		"prevpage"
+	//	"sound_depressed"	"UI/buttonclick.wav"
+	//	"sound_released"	"UI/buttonclickrelease.wav"
+	//}		
+	//
+	//"CurPageLabel"
+	//{
+	//	"ControlName"	"CExLabel"
+	//	"fieldName"		"CurPageLabel"
+	//	"font"			"HudFontSmallBold"
+	//	"labelText"		"%backpackpage%"
+	//	"textAlignment"	"center"
+	//	"xpos"			"c220"
+	//	"ypos"			"290"
+	//	"zpos"			"1"
+	//	"wide"			"40"
+	//	"tall"			"20"
+	//	"autoResize"	"1"
+	//	"pinCorner"		"0"
+	//	"visible"		"1"
+	//	"enabled"		"1"
+	//	"fgcolor_override" "200 80 60 255"
+	//}
+	//
+	//"NextPageButton"
+	//{
+	//	"ControlName"	"CExButton"
+	//	"fieldName"		"NextPageButton"
+	//	"xpos"			"c265"
+	//	"ypos"			"290"
+	//	"zpos"			"1"
+	//	"wide"			"20"
+	//	"tall"			"20"
+	//	"autoResize"	"0"
+	//	"pinCorner"		"0"
+	//	"visible"		"1"
+	//	"enabled"		"1"
+	//	"tabPosition"	"0"
+	//	"labelText"		">"
+	//	"font"			"HudFontSmallBold"
+	//	"textAlignment"	"center"
+	//	"dulltext"		"0"
+	//	"brighttext"	"0"
+	//	"Command"		"nextpage"
+	//	"sound_depressed"	"UI/buttonclick.wav"
+	//	"sound_released"	"UI/buttonclickrelease.wav"
+	//}		
 
 	"DragToNextPageButton"
 	{
@@ -503,30 +510,30 @@
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
 
-	"StyleButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"StyleButton"
-		"xpos"			"c50"
-		"ypos"			"290"
-		"zpos"			"20"
-		"wide"			"100"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"0"
-		"tabPosition"	"0"
-		"labelText"		"#Style"
-		"font"			"HudFontSmallBold"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"showstyles"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
+	//"StyleButton"
+	//{
+	//	"ControlName"	"CExButton"
+	//	"fieldName"		"StyleButton"
+	//	"xpos"			"c50"
+	//	"ypos"			"290"
+	//	"zpos"			"20"
+	//	"wide"			"100"
+	//	"tall"			"20"
+	//	"autoResize"	"0"
+	//	"pinCorner"		"0"
+	//	"visible"		"1"
+	//	"enabled"		"0"
+	//	"tabPosition"	"0"
+	//	"labelText"		"#Style"
+	//	"font"			"HudFontSmallBold"
+	//	"textAlignment"	"center"
+	//	"textinsetx"	"50"
+	//	"dulltext"		"0"
+	//	"brighttext"	"0"
+	//	"Command"		"showstyles"
+	//	"sound_depressed"	"UI/buttonclick.wav"
+	//	"sound_released"	"UI/buttonclickrelease.wav"
+	//}
 
 	"DetailsButton"
 	{

diff --git a/resource/ui/hudbowcharge.res b/resource/ui/hudbowcharge.res
@@ -5,7 +5,8 @@
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter"
 		"font"			"Default"
-		"xpos"			"0"
+		"xpos"			"10"
+		"xpos_minmode"	"0"
 		"ypos"			"0"
 		"zpos"			"2"
 		"wide"			"53"

diff --git a/resource/ui/quickplaydialog.res b/resource/ui/quickplaydialog.res
@@ -748,7 +748,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		"Show servers"
+			"labelText"		"#TF_Quickplay_ShowServers"
 			"font"			"HudFontSmallBold"
 			"textAlignment"	"center"
 			"textinsetx"	"50"
@@ -822,7 +822,7 @@
 			"ypos"			"345"
 			"zpos"			"1"
 			"wide"			"240"
-			"tall"			"25"
+			"tall"			"30"
 			"autoResize"	"1"
 			"pinCorner"		"0"
 			"visible"		"1"