Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 55 insertions, 92 deletions

diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index c5924f9..cc15890 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -13,10 +13,10 @@
 		"tabPosition"		"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"25 25 25 255"
-		"infocus_bgcolor_override" 		"25 25 25 255"
-		"outoffocus_bgcolor_override"	"25 25 25 255"
-		"thumbnail_bgcolor"				"51 47 46 255"
+		"bgcolor_override"				"DarkGrey"
+		"infocus_bgcolor_override" 		"DarkGrey"
+		"outoffocus_bgcolor_override"	"DarkGrey"
+		"thumbnail_bgcolor"				"Grey"
 		"thumbnail_bgcolor_mouseover"	"156 146 128 255"
 		"thumbnail_bgcolor_selected"	"176 166 148 255"
 		"thumbnails_rows"		"4"
@@ -34,7 +34,7 @@
 			"tall"			"49"
 			"visible"		"0"
 			"bgcolor_override"		"0 0 0 255"
-			"noitem_textcolor"		"117 107 94 255"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"7"
@@ -54,7 +54,7 @@
 			}
 		}
 	}
-
+	
 	"CaratLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -73,7 +73,7 @@
 		"enabled"		"1"
 		"fgcolor_override" "200 128 255 255"
 	}
-
+	
 	"ArmoryLabel"
 	{
 		"ControlName"	"Label"
@@ -114,7 +114,7 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"			"FilterComboBox"
-		"Font"				"HudFontSmallestBold"
+		"font"				"HudFontSmallestBold"
 		"xpos"				"c-240"
 		"ypos"				"32"
 		"zpos"				"1"
@@ -130,14 +130,13 @@
 		"maxchars"			"-1"
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
-		
-		"fgcolor_override"					"235 226 202 255"
-		"bgcolor_override"					"51 47 46 255"
-		"disabledFgColor_override" 			"235 226 202 255"
-		"disabledBgColor_override" 			"51 47 46 255"
-		"selectionColor_override" 			"51 47 46 255"
-		"selectionTextColor_override" 		"235 226 202 255"
-		"defaultSelectionBG2Color_override" "51 47 46 255"
+		"fgcolor_override"					"TanLight"
+		"bgcolor_override"					"Grey"
+		"disabledFgColor_override"			"TanLight"
+		"disabledBgColor_override"			"Grey"
+		"selectionColor_override"			"Grey"
+		"selectionTextColor_override" 		"TanLight"
+		"defaultSelectionBG2Color_override"	"Grey"
 	}
 	
 	"DataPanel"
@@ -153,7 +152,7 @@
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 		"border"		"StorePreviewBorder"
-
+		
 		"Data_TextRichText"
 		{
 			"ControlName"	"CEconItemDetailsRichText"
@@ -171,9 +170,9 @@
 			"enabled"		"1"
 			"fgcolor"		"TanLight"
 			"wrap"			"1"
-			"highlight_color"	"Base Color"
+			"highlight_color"	"ColorCyan"
 			"itemset_color"		"216 244 9 255"
-			"link_color" 		"200 128 255 255"
+			"link_color"		"200 128 255 255"
 			"image_up_arrow"				"scroll_up_off"
 			"image_up_arrow_mouseover"		"scroll_up_on"
 			"image_down_arrow"				"scroll_down_off"
@@ -185,34 +184,34 @@
 	
 	"SelectedItemModelPanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"SelectedItemModelPanel"
-		"xpos"			"c25"
-		"ypos"			"40"
-		"zpos"			"1"
-		"wide"			"260"
-		"tall"			"135"
-		"visible"		"1"
+		"ControlName"		"CItemModelPanel"
+		"fieldName"			"SelectedItemModelPanel"
+		"xpos"				"c25"
+		"ypos"				"40"
+		"zpos"				"1"
+		"wide"				"260"
+		"tall"				"135"
+		"visible"			"1"
 		"bgcolor_override"		"Transparent"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"model_hide"	"1"
-		"text_center"	"1"
-		"resize_to_text" "1"
+		"paintborder"		"0"
+		"model_hide"		"1"
+		"text_center"		"1"
+		"resize_to_text" 	"1"
 		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"inventory_image_type" "1"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
-
+	
 	"SelectedItemImageModelPanel"
 	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"SelectedItemImageModelPanel"
-		"xpos"			"c-280"		// Slightly right of center, because the photo background is
+		"xpos"			"c-280"
 		"ypos"			"160"
 		"zpos"			"1"
 		"wide"			"290"
@@ -231,7 +230,7 @@
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"inventory_image_type" "1"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
@@ -247,9 +246,9 @@
 		"tall"			"180"
 		"visible"		"0"
 		"bgcolor_override"		"0 0 0 255"
-		"noitem_textcolor"		"117 107 94 255"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"1"
+		"paintborder"		"1"
 		
 		"text_ypos"			"20"
 		"text_center"		"1"
@@ -258,10 +257,10 @@
 		"padding_height"	"15"
 		"name_only"			"1"
 		
-		"model_ypos"	"40"
-		"model_xpos"	"50"
-		"model_wide"	"156"
-		"model_tall"	"100"
+		"model_ypos"		"40"
+		"model_xpos"		"50"
+		"model_wide"		"156"
+		"model_tall"		"100"
 		
 		"text_forcesize"	"1"
 		"is_mouseover"		"1"
@@ -296,14 +295,8 @@
 		"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"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"CurPageLabel"
@@ -322,7 +315,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 	
 	"NextPageButton"
@@ -347,14 +340,8 @@
 		"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"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"WikiButton"
@@ -380,14 +367,8 @@
 		"Command"		"wiki"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"CyanBorderThick"
-		"border_armed"				"CyanBorderThick"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"ViewSetButton"
@@ -413,14 +394,8 @@
 		"Command"		"viewset"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"CyanBorderThick"
-		"border_armed"				"CyanBorderThick"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"StoreButton"
@@ -438,21 +413,15 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#ArmoryButton_Store"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmallestBold"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"openstore"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"CyanBorderThick"
-		"border_armed"				"CyanBorderThick"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"ReloadSchemeButton"
@@ -467,7 +436,7 @@
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"tabPosition"	"0"
 		"labelText"		"RELOADSCHEME"
 		"font"			"HudFontSmallestBold"
@@ -478,13 +447,7 @@
 		"Command"		"reloadscheme"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"CyanBorderThick"
-		"border_armed"				"CyanBorderThick"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 }
\ No newline at end of file