From b90b75b19839d8141cc682fe4b97532e706b16bd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 15:47:26 +0300 Subject: Add text colors for money bar. New theme colors: MONEY_BAR, MONEY_BAR_OUTLINE --- data/graphics/gui/colors.xml | 2 ++ data/themes/blacknblack/colors.xml | 2 ++ data/themes/blackwood/colors.xml | 2 ++ data/themes/enchilado/colors.xml | 2 ++ data/themes/jewelry/colors.xml | 6 ++++++ data/themes/mana/colors.xml | 2 ++ data/themes/pink/colors.xml | 2 ++ data/themes/unity/colors.xml | 2 ++ data/themes/wood/colors.xml | 2 ++ src/gui/theme.cpp | 4 +++- src/gui/theme.h | 2 ++ src/gui/windows/ministatuswindow.cpp | 2 +- 12 files changed, 28 insertions(+), 2 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index c9a113e92..1d70fa434 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -111,6 +111,8 @@ + + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 37f163493..05f428a17 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -101,6 +101,8 @@ + + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index f7965c7ba..7168f1529 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -100,6 +100,8 @@ + + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index b0693b056..41b307632 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -101,6 +101,8 @@ + + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index f25a83130..2921e09d6 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -98,6 +98,8 @@ + + @@ -273,6 +275,8 @@ + + @@ -372,6 +376,8 @@ + + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 230f02fcd..a3b1b125a 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -101,6 +101,8 @@ + + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 91f7e4517..81f49149a 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -101,6 +101,8 @@ + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index d37b4d82d..7ee51cdf0 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -100,6 +100,8 @@ + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 9d6bb31e3..f4d59a61e 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -101,6 +101,8 @@ + + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 93321cee2..85d1e2116 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -962,7 +962,9 @@ static int readColorType(const std::string &type) "XP_BAR", "XP_BAR_OUTLINE", "WEIGHT_BAR", - "WEIGHT_BAR_OUTLINE" + "WEIGHT_BAR_OUTLINE", + "MONEY_BAR", + "MONEY_BAR_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 99b74c512..84f7d2bb5 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -406,6 +406,8 @@ class Theme final : public Palette, public ConfigListener XP_BAR_OUTLINE, WEIGHT_BAR, WEIGHT_BAR_OUTLINE, + MONEY_BAR, + MONEY_BAR_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index d7ab27718..51935bb4c 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -82,7 +82,7 @@ MiniStatusWindow::MiniStatusWindow() : Theme::SLOTS_BAR, Theme::PROG_INVY_SLOTS, // TRANSLATORS: status bar name "inventory slots bar", _("inventory slots bar"))), - mMoneyBar(createBar(0, 130, 0, Theme::SLOTS_BAR, Theme::PROG_MONEY, + mMoneyBar(createBar(0, 130, 0, Theme::MONEY_BAR, Theme::PROG_MONEY, // TRANSLATORS: status bar name "money bar", _("money bar"))), mArrowsBar(createBar(0, 50, 0, Theme::SLOTS_BAR, Theme::PROG_INVY_SLOTS, -- cgit v1.2.3-70-g09d2