From 2e5188851e2267a4e5e84170a7e0d55678972c7b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 15:11:31 +0300 Subject: add background color for money bar. New progress color: MONEY. --- data/graphics/gui/colors.xml | 1 + data/themes/blacknblack/colors.xml | 1 + data/themes/blackwood/colors.xml | 1 + data/themes/enchilado/colors.xml | 1 + data/themes/jewelry/colors.xml | 1 + data/themes/mana/colors.xml | 1 + data/themes/pink/colors.xml | 3 ++- data/themes/unity/colors.xml | 3 ++- data/themes/wood/colors.xml | 1 + src/gui/theme.cpp | 3 ++- src/gui/theme.h | 1 + src/gui/windows/ministatuswindow.cpp | 2 +- 12 files changed, 15 insertions(+), 4 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index be850d515..c9a113e92 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -121,4 +121,5 @@ + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 21728f3b2..37f163493 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -122,4 +122,5 @@ + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index e6f36f0ba..f7965c7ba 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -121,4 +121,5 @@ + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 43ce45ac6..b0693b056 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -122,4 +122,5 @@ + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index ecc02ddb0..f25a83130 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -382,4 +382,5 @@ + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 23e60978a..230f02fcd 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -122,4 +122,5 @@ + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index dca5cd5ae..91f7e4517 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -122,4 +122,5 @@ - \ No newline at end of file + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 416565730..d37b4d82d 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -121,4 +121,5 @@ - \ No newline at end of file + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index a19d4c7fb..9d6bb31e3 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -122,4 +122,5 @@ + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index c69335a07..0d974209d 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1051,7 +1051,8 @@ static int readProgressType(const std::string &type) "INVY_SLOTS", "WEIGHT", "JOB", - "UPDATE" + "UPDATE", + "MONEY", }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 155ff6b6a..99b74c512 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -419,6 +419,7 @@ class Theme final : public Palette, public ConfigListener PROG_WEIGHT, PROG_JOB, PROG_UPDATE, + PROG_MONEY, THEME_PROG_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 4cc913eb9..d7ab27718 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_INVY_SLOTS, + mMoneyBar(createBar(0, 130, 0, Theme::SLOTS_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-60-g2f50