From 7cccaaa192c2ed274b3aa9d26788479f6fbed611 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 13:35:16 +0300 Subject: Add text colors for hp bar. New theme colors: HP_BAR, HP_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 +- src/gui/windows/statuswindow.cpp | 2 ++ 13 files changed, 30 insertions(+), 2 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 3cf91bc5d..2e8cd6d5c 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -101,6 +101,8 @@ + + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 88cd13b4f..1dd0d8176 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -91,6 +91,8 @@ + + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 00ad3c41e..f744eef7d 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -90,6 +90,8 @@ + + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 43a52a4e2..a20f8c240 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -91,6 +91,8 @@ + + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index aaffe0525..0258326db 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -88,6 +88,8 @@ + + @@ -253,6 +255,8 @@ + + @@ -342,6 +346,8 @@ + + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index ba79829c6..6dbbb95f8 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -91,6 +91,8 @@ + + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index d86901085..851890e30 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -91,6 +91,8 @@ + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 2ba699379..8346794fc 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -90,6 +90,8 @@ + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 2a76648d1..e7e02e93d 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -91,6 +91,8 @@ + + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index cfbe26d03..274be10df 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -952,7 +952,9 @@ static int readColorType(const std::string &type) "STATUSBAR_OFF", "TABLE_BACKGROUND", "SLOTS_BAR", - "SLOTS_BAR_OUTLINE" + "SLOTS_BAR_OUTLINE", + "HP_BAR", + "HP_BAR_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 08d912430..58a194d63 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -396,6 +396,8 @@ class Theme final : public Palette, public ConfigListener TABLE_BACKGROUND, SLOTS_BAR, SLOTS_BAR_OUTLINE, + HP_BAR, + HP_BAR_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index d2ff6b0bb..0141354ee 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -62,7 +62,7 @@ MiniStatusWindow::MiniStatusWindow() : mIconSpacing(mSkin ? mSkin->getOption("iconSpacing", 2) : 2), mMaxX(0), // TRANSLATORS: status bar name - mHpBar(createBar(0, 100, 0, Theme::PROGRESS_BAR, Theme::PROG_HP, + mHpBar(createBar(0, 100, 0, Theme::HP_BAR, Theme::PROG_HP, "hp bar", _("health bar"))), mMpBar(Net::getGameHandler()->canUseMagicBar() ? createBar(0, 100, 0, Theme::PROGRESS_BAR, diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 5d90ad078..19d862443 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -191,6 +191,8 @@ StatusWindow::StatusWindow() : mHpBar = new ProgressBar(this, static_cast(PlayerInfo::getAttribute( PlayerInfo::HP)) / static_cast(max), 80, 0, Theme::PROG_HP); + mHpBar->setColor(Theme::getThemeColor(Theme::HP_BAR), + Theme::getThemeColor(Theme::HP_BAR_OUTLINE)); max = PlayerInfo::getAttribute(PlayerInfo::EXP_NEEDED); mXpBar = new ProgressBar(this, max ? -- cgit v1.2.3-60-g2f50