diff options
| author | Igor Nikitin <[email protected]> | 2020-04-12 13:34:22 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-12 13:34:22 -0400 |
| commit | 8e92d477d6ef4e7d70dcc9161c9727e537311b57 (patch) | |
| tree | 8db69e64fb458b2efb6f6bf65afc554c5808a2c4 /resource/ui/econ | |
| parent | 95efaef09d2e847ce2c685a6f43a34d1a3058dfd (diff) | |
| parent | fcd77895f3881d1d50db402f8dce0f73dfad5094 (diff) | |
Merge pull request #143 from raysfire/update
v2020.0412
Diffstat (limited to 'resource/ui/econ')
25 files changed, 178 insertions, 443 deletions
diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res index f5ff0a0..66d513e 100644 --- a/resource/ui/econ/backpackpanel.res +++ b/resource/ui/econ/backpackpanel.res @@ -160,29 +160,29 @@ "font" "Cerbetica16" "labelText" ">>" "textAlignment" "west" - "xpos" "c-300" - "ypos" "20" + "xpos" "c-290" + "ypos" "26" "zpos" "1" "wide" "20" - "tall" "15" + "tall" "16" "autoResize" "1" "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fgcolor_override" "200 128 255 255" + "visible" "0" + "enabled" "0" + "fgcolor_override" "ColorPurple" } "ClassLabel" { "ControlName" "CExLabel" "fieldName" "ClassLabel" - "font" "HudFontMediumSmall" + "font" "HudFontMediumBold" "labelText" "#ClassBeingEquipped" "textAlignment" "west" "xpos" "c-280" - "ypos" "15" + "ypos" "10" "zpos" "1" - "wide" "250" + "wide" "370" "tall" "25" "autoResize" "0" "pinCorner" "0" @@ -213,10 +213,10 @@ "fieldName" "ShowRarityComboBox" "font" "HudFontSmallestBold" "wrap" "0" - "xpos" "c-25" - "ypos" "37" + "xpos" "c-58" + "ypos" "38" "zpos" "1" - "wide" "150" + "wide" "168" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -228,7 +228,6 @@ "NumericInputOnly" "0" "unicode" "0" "default" "0" - "border" "CyanBorder" "fgcolor_override" "TanLight" "bgcolor_override" "Transparent" @@ -246,8 +245,8 @@ "labelText" "#ShowBaseItemsCheckBox" "font" "HudFontSmallestBold" "textAlignment" "east" - "xpos" "c-29" - "ypos" "15" + "xpos" "c-165" + "ypos" "36" "zpos" "1" "wide" "120" "tall" "20" @@ -268,7 +267,7 @@ "font" "HudFontSmallestBold" "labelText" "#Store_NameFilterLabel" "textAlignment" "west" - "xpos" "c+137" + "xpos" "c117" "ypos" "0" "zpos" "1" "wide" "90" @@ -285,9 +284,9 @@ "ControlName" "TextEntry" "fieldName" "NameFilterTextEntry" "font" "HudFontSmallest" - "xpos" "c+137" + "xpos" "c117" "ypos" "15" - "wide" "150" + "wide" "168" "tall" "19" "autoResize" "0" "pinCorner" "0" @@ -309,16 +308,15 @@ "ControlName" "ComboBox" "fieldName" "SortByComboBox" "font" "HudFontSmallestBold" - "xpos" "c137" + "xpos" "c117" "ypos" "37" "zpos" "1" - "wide" "150" + "wide" "168" "tall" "15" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" - "tabPosition" "1" "textHidden" "0" "editable" "0" "maxchars" "-1" @@ -348,7 +346,7 @@ "noitem_textcolor" "TextColor" "PaintBackgroundType" "2" "paintborder" "1" - "text_ypos" "20" + "text_ypos" "10" "text_center" "1" "model_hide" "1" "resize_to_text" "1" @@ -428,7 +426,7 @@ "depressedBgColor_override" "25 25 25 255" "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" "depressedFgColor_override" "TanDark" } @@ -480,7 +478,7 @@ "depressedBgColor_override" "25 25 25 255" "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" "depressedFgColor_override" "TanDark" } @@ -536,10 +534,10 @@ { "ControlName" "CExButton" "fieldName" "CancelApplyToolButton" - "xpos" "c137" + "xpos" "c117" "ypos" "37" "zpos" "1" - "wide" "150" + "wide" "168" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -555,17 +553,7 @@ "Command" "canceltool" "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" "ButtonHover" - "border_armed" "ButtonHover" + "bgcolor_override" "DarkerGrey" } "ShowExplanationsButton" @@ -767,11 +755,11 @@ "paintbackground" "0" "border" "MainMenuHighlightBorder" "force_close" "1" - "end_x" "c-50" + "end_x" "c-250" "end_y" "130" "end_wide" "300" "end_tall" "115" - "callout_inparents_x" "c240" + "callout_inparents_x" "c-250" "callout_inparents_y" "290" "next_explanation" "ContextExplanation" @@ -990,9 +978,9 @@ "end_x" "c-150" "end_y" "80" "end_wide" "300" - "end_tall" "205" - "callout_inparents_x" "c-30" - "callout_inparents_y" "323" + "end_tall" "165" + "callout_inparents_x" "c0" + "callout_inparents_y" "c0" "next_explanation" "ArmoryExplanation" "TitleLabel" diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res index a51c1c3..7ecb7d1 100644 --- a/resource/ui/econ/comboboxbackpackoverlaydialog.res +++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res @@ -120,8 +120,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -147,7 +145,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmapplydecodedialog.res b/resource/ui/econ/confirmapplydecodedialog.res index 34ae644..9bb5617 100644 --- a/resource/ui/econ/confirmapplydecodedialog.res +++ b/resource/ui/econ/confirmapplydecodedialog.res @@ -222,6 +222,25 @@ "fgcolor_override" "Yellow" } + "OptionalAppendLabel" + { + "ControlName" "CExLabel" + "fieldName" "OptionalAppendLabel" + "font" "FontRegular12" + "labelText" "%optional_append%" + "textAlignment" "center" + "xpos" "20" + "ypos" "120" + "zpos" "0" + "wide" "360" + "tall" "60" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor_override" "LightRed" + } + "CancelButton" { "ControlName" "CExButton" @@ -245,8 +264,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -272,7 +289,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmapplygiftwrapdialog.res b/resource/ui/econ/confirmapplygiftwrapdialog.res index b242f44..e8429ae 100644 --- a/resource/ui/econ/confirmapplygiftwrapdialog.res +++ b/resource/ui/econ/confirmapplygiftwrapdialog.res @@ -40,7 +40,7 @@ "font" "ItemFontAttribLarge" "xpos" "0" "ypos" "30" - "zpos" "101" + "zpos" "2" "wide" "140" "tall" "60" "autoResize" "0" @@ -92,22 +92,7 @@ "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" - } + "tool_modelpanel" { "ControlName" "CItemModelPanel" @@ -157,22 +142,7 @@ "paintbackground" "0" "border" "BackpackItemBorder_Vintage" } - "subject_icon" - { - "ControlName" "ScalableImagePanel" - "fieldName" "subject_icon" - "xpos" "300" - "ypos" "10" - "zpos" "2" - "wide" "16" - "tall" "16" - "visible" "1" - "enabled" "1" - "image" "backpack_jewel_modify_target_b_g" - "tileImage" "0" - "tileVertically" "0" - "drawcolor" "71 98 145 255" - } + "subject_modelpanel" { "ControlName" "CItemModelPanel" @@ -264,8 +234,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -291,7 +259,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmapplypaintcandialog.res b/resource/ui/econ/confirmapplypaintcandialog.res index c53a40b..bbb4bb3 100644 --- a/resource/ui/econ/confirmapplypaintcandialog.res +++ b/resource/ui/econ/confirmapplypaintcandialog.res @@ -92,22 +92,6 @@ "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" - } "tool_modelpanel" { "ControlName" "CItemModelPanel" @@ -157,22 +141,6 @@ "paintbackground" "0" "border" "BackpackItemBorder_Vintage" } - "subject_icon" - { - "ControlName" "ScalableImagePanel" - "fieldName" "subject_icon" - "xpos" "300" - "ypos" "10" - "zpos" "2" - "wide" "16" - "tall" "16" - "visible" "1" - "enabled" "1" - "image" "backpack_jewel_modify_target_b_g" - "tileImage" "0" - "tileVertically" "0" - "drawcolor" "71 98 145 255" - } "subject_modelpanel" { "ControlName" "CItemModelPanel" @@ -293,8 +261,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -320,7 +286,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res index 263561f..c6bef54 100644 --- a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res +++ b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res @@ -92,22 +92,6 @@ "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" - } "tool_modelpanel" { "ControlName" "CItemModelPanel" @@ -157,22 +141,6 @@ "paintbackground" "0" "border" "BackpackItemBorder_Vintage" } - "subject_icon" - { - "ControlName" "ScalableImagePanel" - "fieldName" "subject_icon" - "xpos" "300" - "ypos" "10" - "zpos" "2" - "wide" "16" - "tall" "16" - "visible" "1" - "enabled" "1" - "image" "backpack_jewel_modify_target_b_g" - "tileImage" "0" - "tileVertically" "0" - "drawcolor" "71 98 145 255" - } "subject_modelpanel" { "ControlName" "CItemModelPanel" @@ -244,8 +212,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -271,7 +237,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res index bc2f37f..960a19e 100644 --- a/resource/ui/econ/confirmapplystrangifierdialog.res +++ b/resource/ui/econ/confirmapplystrangifierdialog.res @@ -213,8 +213,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -240,7 +238,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res index 5b7f1b5..e4cda0f 100644 --- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res +++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res @@ -92,22 +92,6 @@ "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" - } "tool_modelpanel" { "ControlName" "CItemModelPanel" @@ -157,22 +141,6 @@ "paintbackground" "0" "border" "BackpackItemBorder_Vintage" } - "subject_icon" - { - "ControlName" "ScalableImagePanel" - "fieldName" "subject_icon" - "xpos" "300" - "ypos" "10" - "zpos" "2" - "wide" "16" - "tall" "16" - "visible" "1" - "enabled" "1" - "image" "backpack_jewel_modify_target_b_g" - "tileImage" "0" - "tileVertically" "0" - "drawcolor" "71 98 145 255" - } "subject_modelpanel" { "ControlName" "CItemModelPanel" @@ -324,8 +292,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -351,7 +317,5 @@ "Command" "apply" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmdialog.res b/resource/ui/econ/confirmdialog.res index 714c82b..b6c1e00 100644 --- a/resource/ui/econ/confirmdialog.res +++ b/resource/ui/econ/confirmdialog.res @@ -80,8 +80,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "ConfirmButton" @@ -108,7 +106,5 @@ "Command" "confirm" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmdialogabandonnopenalty.res b/resource/ui/econ/confirmdialogabandonnopenalty.res index 290b4ea..c82799a 100644 --- a/resource/ui/econ/confirmdialogabandonnopenalty.res +++ b/resource/ui/econ/confirmdialogabandonnopenalty.res @@ -17,7 +17,7 @@ "paintborder" "2" "paintbackground" "1" "border" "CyanBorderThick" - "bgcolor_override" "25 25 25 255" + "bgcolor_override" "DarkGrey" } "TitleLabel" @@ -96,8 +96,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "ConfirmButton" @@ -124,7 +122,5 @@ "Command" "confirm" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmdialogabandonpenalty.res b/resource/ui/econ/confirmdialogabandonpenalty.res index 1e1f987..b7129f0 100644 --- a/resource/ui/econ/confirmdialogabandonpenalty.res +++ b/resource/ui/econ/confirmdialogabandonpenalty.res @@ -17,7 +17,7 @@ "paintborder" "2" "paintbackground" "1" "border" "CyanBorderThick" - "bgcolor_override" "25 25 25 255" + "bgcolor_override" "DarkGrey" } "TitleLabel" @@ -96,8 +96,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "ConfirmButton" @@ -124,7 +122,5 @@ "Command" "confirm" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/confirmdialogabandonsafe.res b/resource/ui/econ/confirmdialogabandonsafe.res index e899450..1633d9f 100644 --- a/resource/ui/econ/confirmdialogabandonsafe.res +++ b/resource/ui/econ/confirmdialogabandonsafe.res @@ -17,7 +17,7 @@ "paintborder" "2" "paintbackground" "1" "border" "CyanBorderThick" - "bgcolor_override" "25 25 25 255" + "bgcolor_override" "DarkerGrey" } "TitleLabel" @@ -82,8 +82,6 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "ConfirmButton" @@ -110,7 +108,5 @@ "Command" "confirm" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res index 18cd85a..54aae0a 100644 --- a/resource/ui/econ/inspectionpanel.res +++ b/resource/ui/econ/inspectionpanel.res @@ -120,7 +120,7 @@ "ControlName" "CNavigationPanel" "fieldName" "TeamNavPanel" "xpos" "cs-0.5" - "ypos" "p.7-16" + "ypos" "55" "zpos" "100" "wide" "60" "tall" "25" @@ -218,7 +218,8 @@ "wide" "300" "tall" "100" "zpos" "100" - "border" "CyanBorder" + //"paintborder" "0" + "border" "NoBorder" "mouseinputenabled" "1" "proportionaltoparent" "1" "visible" "0" diff --git a/resource/ui/econ/inspectionpanel_cosmetic.res b/resource/ui/econ/inspectionpanel_cosmetic.res index ae227d7..f022b57 100644 --- a/resource/ui/econ/inspectionpanel_cosmetic.res +++ b/resource/ui/econ/inspectionpanel_cosmetic.res @@ -467,8 +467,6 @@ "command" "viewwikipage" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } } } diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res index f27d504..74f1a38 100644 --- a/resource/ui/econ/itempickuppanel.res +++ b/resource/ui/econ/itempickuppanel.res @@ -29,7 +29,7 @@ { "PaintBackgroundType" "0" "paintborder" "1" - "bgcolor_override" "Grey" + "bgcolor_override" "DarkGrey" "model_xpos" "0" "model_center_y" "1" @@ -84,11 +84,11 @@ "ControlName" "CExLabel" "fieldName" "ItemsFoundLabel" "font" "HudFontMediumBigBold" + "fgcolor" "TanLight" "labelText" "#NewItemsAcquired" "textAlignment" "center" - "fgcolor" "TanLight" "xpos" "0" - "ypos" "30" + "ypos" "40" "zpos" "1" "wide" "f0" "tall" "35" @@ -175,15 +175,6 @@ "Command" "nextitem" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255k" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "PrevButton" @@ -208,15 +199,6 @@ "Command" "previtem" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255k" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "CloseButton" @@ -242,15 +224,6 @@ "default" "1" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OpenLoadoutButton" @@ -275,15 +248,6 @@ "Command" "changeloadout" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "DiscardButton" @@ -309,11 +273,11 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "TextColor" - "armedBgColor_override" "145 73 59 255" - "depressedBgColor_override" "TextColor" + "defaultBgColor_override" "Transparent" + "armedBgColor_override" "Transparent" + "depressedBgColor_override" "Transparent" "image_drawcolor" "TanLight" - "image_armedcolor" "TanLight" + "image_armedcolor" "ColorCyan" "SubImage" { @@ -344,7 +308,9 @@ "tall" "50" "visible" "0" "PaintBackgroundType" "2" + "paintbackground" "1" "border" "NoBorder" + "bgcolor_override" "DarkerGrey" "TipLabel" { diff --git a/resource/ui/econ/notificationtoastcontainer.res b/resource/ui/econ/notificationtoastcontainer.res index 698eff6..b6d417b 100644 --- a/resource/ui/econ/notificationtoastcontainer.res +++ b/resource/ui/econ/notificationtoastcontainer.res @@ -12,7 +12,7 @@ "visible" "1" "enabled" "1" "bgcolor_override" "DarkGrey" - "border" "CyanBorder" + "border" "CyanBorderThick" } "HelpTextLabel" diff --git a/resource/ui/econ/questnotificationpanel_base.res b/resource/ui/econ/questnotificationpanel_base.res new file mode 100644 index 0000000..8a82662 --- /dev/null +++ b/resource/ui/econ/questnotificationpanel_base.res @@ -0,0 +1,66 @@ +"Resource/UI/QuestNotificationPanel_base.res" +{ + "QuestNotificationPanel" + { + "ControlName" "EditablePanel" + "fieldName" "QuestNotificationPanel" + "xpos" "0" + "ypos" "100" + "zpos" "2" + "wide" "f0" + "tall" "f0" + "visible" "0" + "proportionaltoparent" "1" + + "output_step" "50" + + "MainContainer" + { + "ControlName" "EditablePanel" + "fieldName" "MainContainer" + "xpos" "r0" + "ypos" "0" + "wide" "110" + "tall" "20" + "visible" "1" + "proportionaltoparent" "1" + + "border" "NoBorder" //QuestStatusBorder + "paintborder" "2" + + "ItemName" + { + "ControlName" "Label" + "fieldName" "ItemName" + "labeltext" "#QuestNotification_Incoming" + "xpos" "0" + "ypos" "cs-0.5" + "wide" "f0" + "tall" "18" + "zpos" "4" + "textinsetx" "5" + "fgcolor_override" "255 255 255 255" //235 226 202 255 + "font" "AchievementTracker_Name" + //"wrap" "1" + "TextAlignment" "east" + "proportionaltoparent" "1" + } + + "CharacterImage" + { + "ControlName" "CTFImagePanel" + "fieldName" "CharacterImage" + "xpos" "3" + "ypos" "cs-0.5" + "zpos" "0" + "wide" "o1" + "tall" "p0.8" + "visible" "1" + "enabled" "1" + "image" "animated/tf2_speaker_icon" + "scaleImage" "1" + "proportionaltoparent" "1" + } + } + } +} diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res index 05e3a28..ed63d11 100644 --- a/resource/ui/econ/store/v2/storehome_base.res +++ b/resource/ui/econ/store/v2/storehome_base.res @@ -52,7 +52,7 @@ "wide" "111" "tall" "62" "visible" "0" - "bgcolor_override" "25 25 25 255" + "bgcolor_override" "0 0 0 255" "noitem_textcolor" "TextColor" "PaintBackgroundType" "0" "paintborder" "0" @@ -106,7 +106,7 @@ "wide" "32" "tall" "25" "visible" "0" - "bgcolor_override" "ColorBlack" + "bgcolor_override" "0 0 0 255" "noitem_textcolor" "TextColor" "PaintBackgroundType" "0" "paintborder" "0" @@ -269,8 +269,8 @@ { "ControlName" "CExButton" "fieldName" "ReloadSchemeButton" - "xpos" "c-100" - "ypos" "330" + "xpos" "c-400" + "ypos" "350" "zpos" "25" "wide" "100" "tall" "15" @@ -313,7 +313,7 @@ { "wide" "100" "tall" "30" - "textinsety" "-5" + "textinsety" "0" "autoResize" "0" "pinCorner" "2" "visible" "1" @@ -327,7 +327,7 @@ "defaultBgColor_override" "25 25 25 255" "defaultFgColor_override" "124 114 99 255" "armedBgColor_override" "0 0 0 100" - "armedFgColor_override" "124 114 99 255" + "armedFgColor_override" "235 227 203 255" "selectedBgColor_override" "0 0 0 100" "selectedFgColor_override" "235 227 203 255" @@ -420,8 +420,8 @@ "font" "Cerbetica14" "labelText" "%freebackpackspace%" "textAlignment" "west" - "xpos" "c-237" - "ypos" "312" + "xpos" "c-230" + "ypos" "310" "zpos" "10" "wide" "160" "tall" "20" @@ -438,7 +438,7 @@ "font" "HudFontSmallBold" "labelText" "%storecart%" "textAlignment" "east" - "xpos" "c-238" + "xpos" "c-230" "ypos" "334" "zpos" "12" "wide" "56" @@ -450,21 +450,13 @@ "Command" "viewcart" "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" "ButtonHover" - "border_armed" "ButtonHover" } "CartImage" { "ControlName" "ImagePanel" "fieldName" "CartImage" - "xpos" "c-233" + "xpos" "c-225" "ypos" "336" "zpos" "13" "wide" "24" @@ -498,14 +490,6 @@ "Command" "startshopping" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "MarketPlaceButton" @@ -628,7 +612,7 @@ "ypos" "55" "zpos" "-5" "wide" "f0" - "tall" "255" + "tall" "f0" "autoResize" "0" "pinCorner" "0" "visible" "1" diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res index dae9486..9a3d8f9 100644 --- a/resource/ui/econ/store/v2/storepage.res +++ b/resource/ui/econ/store/v2/storepage.res @@ -325,7 +325,6 @@ "paintborder" "1" "textinsetx" "100" "border" "LoadoutItemPopupBorder" - "fgcolor" "243 234 216 255" } "PrevPageButton" @@ -350,7 +349,7 @@ "Command" "prevpage" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "TanDarker" + "defaultBgColor_override" "DarkerGrey" } "CurPageLabel" @@ -394,7 +393,7 @@ "Command" "nextpage" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "TanDarker" + "defaultBgColor_override" "DarkerGrey" } "PriceLabel" @@ -734,8 +733,6 @@ "font" "HudFontSmallBold" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "CartImage" @@ -780,7 +777,7 @@ "autoResize" "0" "pinCorner" "0" "visible" "0" - "enabled" "1" + "enabled" "0" "tabPosition" "0" "labelText" "RELOADSCHEME" "font" "HudFontSmallestBold" diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res index d0aa382..88c5623 100644 --- a/resource/ui/econ/store/v2/storepanel.res +++ b/resource/ui/econ/store/v2/storepanel.res @@ -171,14 +171,6 @@ "Command" "close" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "armory_panel" @@ -250,7 +242,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "Checkout (&E) >>" + "labelText" "#Store_Checkout" "font" "HudFontSmallBold" "textAlignment" "center" "dulltext" "0" @@ -259,13 +251,5 @@ "Command" "checkout" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res index fed93d6..3965863 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel.res @@ -93,7 +93,7 @@ "visible" "1" "enabled" "1" "paintbackground" "1" - "border" "CyanBorder" + "border" "CyanBorderThick" "bgcolor_override" "DarkGrey" "PaintBorder" "1" @@ -110,7 +110,7 @@ "visible" "1" "enabled" "1" "paintborder" "1" - "border" "CyanBorder" + "border" "NoBorder" "bgcolor_override" "Grey" } @@ -348,8 +348,6 @@ "command" "viewwikipage" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "TradableLabel" @@ -500,7 +498,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "render_texture" "0" + "render_texture" "0" "fov" "40" "allow_rot" "1" "paintbackground" "1" @@ -926,8 +924,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "<" - "font" "CerbeticaBold18" + "labelText" "&A" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -954,8 +952,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" ">" - "font" "CerbeticaBold18" + "labelText" "&D" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -1005,8 +1003,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "<" - "font" "CerbeticaBold18" + "labelText" "&A" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -1034,8 +1032,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" ">" - "font" "CerbeticaBold18" + "labelText" "&D" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -1388,7 +1386,7 @@ "armedFgColor_override" "Blank" "depressedFgColor_override" "Blank" "image_drawcolor" "White" - "image_armedcolor" "ColorRed" + "image_armedcolor" "255 0 0 255" "SubImage" { @@ -1420,7 +1418,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "Back" + "labelText" "#TF_BackCarat" "font" "CerbeticaBold14" "textAlignment" "center" "dulltext" "0" @@ -1429,9 +1427,6 @@ "Command" "close" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "fgcolor" "White" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "TryItOutButton" @@ -1447,7 +1442,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "Try It Out" + "labelText" "#Store_TryItOut" "font" "CerbeticaBold14" "textAlignment" "center" "dulltext" "0" @@ -1456,9 +1451,6 @@ "Command" "tryitout" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "fgcolor" "White" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "AddToCartButton" @@ -1483,9 +1475,6 @@ "Command" "addtocart" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "fgcolor" "White" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "mouseoveritempanel" diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res index 31add8b..4aa2e3d 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res @@ -45,7 +45,7 @@ "visible" "1" "enabled" "1" "paintbackground" "1" - "border" "CyanBorder" + "border" "CyanBorderThick" "bgcolor_override" "DarkGrey" "PaintBorder" "1" @@ -138,11 +138,11 @@ { "ControlName" "CExLabel" "fieldName" "ItemNameLabel" - "font" "CerbeticaBold16" + "font" "CerbeticaBold18" "labelText" "%selectiontitle%" "textAlignment" "center" "xpos" "c-130" - "ypos" "c-124" + "ypos" "c-130" "wide" "260" "tall" "33" "autoResize" "1" @@ -264,8 +264,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "<" - "font" "CerbeticaBold18" + "labelText" "&A" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -288,8 +288,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" ">" - "font" "CerbeticaBold18" + "labelText" "&D" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -335,8 +335,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "<" - "font" "CerbeticaBold18" + "labelText" "&A" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -359,8 +359,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" ">" - "font" "CerbeticaBold18" + "labelText" "&D" + "font" "MenuArrows" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -458,7 +458,7 @@ "autoResize" "1" "pinCorner" "0" "visible" "0" - "enabled" "0" + "enabled" "1" "wrap" "1" "centerwrap" "1" } @@ -477,7 +477,7 @@ "autoResize" "1" "pinCorner" "0" "visible" "0" - "enabled" "0" + "enabled" "1" "wrap" "1" "centerwrap" "1" } @@ -508,7 +508,7 @@ "paintbackground" "0" "image_drawcolor" "White" - "image_armedcolor" "ColorRed" + "image_armedcolor" "255 0 0 255" "SubImage" { @@ -549,8 +549,6 @@ "Command" "close" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "AddToCartButton" @@ -575,7 +573,5 @@ "Command" "addtocart" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res index b71b307..b331c4e 100644 --- a/resource/ui/econ/store/v2/storeviewcartpanel.res +++ b/resource/ui/econ/store/v2/storeviewcartpanel.res @@ -506,14 +506,6 @@ "Command" "close" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "CheckoutButton" @@ -539,13 +531,5 @@ "Command" "checkout" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file diff --git a/resource/ui/econ/strangecounttransferdialog.res b/resource/ui/econ/strangecounttransferdialog.res index c362dd8..48a8caf 100644 --- a/resource/ui/econ/strangecounttransferdialog.res +++ b/resource/ui/econ/strangecounttransferdialog.res @@ -191,8 +191,6 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "actionsignallevel" "2" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "OkButton" @@ -219,8 +217,6 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "actionsignallevel" "2" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } } }
\ No newline at end of file diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res index 4771c64..7aad2ca 100644 --- a/resource/ui/econ/tradingstartdialog.res +++ b/resource/ui/econ/tradingstartdialog.res @@ -9,7 +9,7 @@ "ypos" "80" "wide" "400" "tall" "300" - "bgcolor_override" "35 35 35 255" + "bgcolor_override" "DarkGrey" "paintbackgroundtype" "2" "settitlebarvisible" "" "border" "CyanBorderThick" @@ -42,15 +42,6 @@ "default" "1" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "avatar" @@ -168,15 +159,6 @@ "Command" "friends" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "subbutton1" { @@ -201,15 +183,6 @@ "Command" "server" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } "subbutton2" { @@ -234,15 +207,6 @@ "Command" "profile" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } } @@ -295,15 +259,6 @@ "wrap" "1" "centerwrap" "1" "fgcolor_override" "HudOffWhite" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } } @@ -503,15 +458,6 @@ "Command" "url_ok" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } } @@ -538,14 +484,5 @@ "Command" "cancel" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "1" - "defaultBgColor_override" "15 15 15 255" - "armedBgColor_override" "25 25 25 255" - "depressedBgColor_override" "25 25 25 255" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "TanLight" - "border_default" "ButtonHover" - "border_armed" "ButtonHover" } }
\ No newline at end of file |