From e6848c0aa8b1447c5e19bd1923f3fbd2866e635b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 14:35:04 +0300 Subject: Add text colors for weight bar. New theme colors: WEIGHT_BAR, WEIGHT_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 | 2 ++ src/gui/theme.h | 2 ++ src/gui/windows/inventorywindow.cpp | 2 ++ src/gui/windows/ministatuswindow.cpp | 2 +- 13 files changed, 29 insertions(+), 1 deletion(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index b984cec3a..be850d515 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -109,6 +109,8 @@ + + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 70db41f5d..21728f3b2 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -99,6 +99,8 @@ + + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 2285d70a6..e6f36f0ba 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -98,6 +98,8 @@ + + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 7c2735d74..43ce45ac6 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -99,6 +99,8 @@ + + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index ef5f1312f..ecc02ddb0 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -96,6 +96,8 @@ + + @@ -269,6 +271,8 @@ + + @@ -366,6 +370,8 @@ + + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 1461a116a..23e60978a 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -99,6 +99,8 @@ + + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 0faa08f83..dca5cd5ae 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -99,6 +99,8 @@ + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index f5c9279b1..416565730 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -98,6 +98,8 @@ + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 346b82911..a19d4c7fb 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -99,6 +99,8 @@ + + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index aa0b87bcb..c69335a07 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -961,6 +961,8 @@ static int readColorType(const std::string &type) "NO_MP_BAR_OUTLINE" "XP_BAR", "XP_BAR_OUTLINE" + "WEIGHT_BAR", + "WEIGHT_BAR_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index bbcce646f..155ff6b6a 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -404,6 +404,8 @@ class Theme final : public Palette, public ConfigListener NO_MP_BAR_OUTLINE, XP_BAR, XP_BAR_OUTLINE, + WEIGHT_BAR, + WEIGHT_BAR_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index b9c89ad96..bdc0b342e 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -226,6 +226,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory): // TRANSLATORS: inventory button mEquipmentButton = new Button(this, _("Equipment"), "equipment", this); mWeightBar = new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_WEIGHT); + mWeightBar->setColor(Theme::getThemeColor(Theme::WEIGHT_BAR), + Theme::getThemeColor(Theme::WEIGHT_BAR_OUTLINE)); place(0, 0, mWeightBar, 4); mSlotsBarCell = &place(4, 0, mSlotsBar, 5); diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index be691b72e..4cc913eb9 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -75,7 +75,7 @@ MiniStatusWindow::MiniStatusWindow() : // TRANSLATORS: status bar name "xp bar", _("experience bar"))), mJobBar(nullptr), - mWeightBar(createBar(0, 140, 0, Theme::PROGRESS_BAR, Theme::PROG_WEIGHT, + mWeightBar(createBar(0, 140, 0, Theme::WEIGHT_BAR, Theme::PROG_WEIGHT, // TRANSLATORS: status bar name "weight bar", _("weight bar"))), mInvSlotsBar(createBar(0, 45, 0, -- cgit v1.2.3-70-g09d2