From 84d0d0e63d8e46187f81fdbd241062f942f5e54f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 19:30:29 +0300 Subject: Add text colors for job bar. New theme colors: JOB_BAR, JOB_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 8e0be59f9..ce4858ae7 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -117,6 +117,8 @@ + + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index b17430495..e9e8280d2 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -107,6 +107,8 @@ + + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 63949b862..915132f69 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -106,6 +106,8 @@ + + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 62add1204..ec49de580 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -107,6 +107,8 @@ + + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 35de6eab0..de61a3ee4 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -104,6 +104,8 @@ + + @@ -285,6 +287,8 @@ + + @@ -390,6 +394,8 @@ + + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 20dd5aa86..4b8ca8ad2 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -107,6 +107,8 @@ + + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 061788253..b92c8d03b 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -107,6 +107,8 @@ + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 911bfe9f2..38f1eafbe 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -106,6 +106,8 @@ + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 85ccc9d09..224eb6f65 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -107,6 +107,8 @@ + + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 281f5b37f..b7510dc9f 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -968,7 +968,9 @@ static int readColorType(const std::string &type) "ARROWS_BAR", "ARROWS_BAR_OUTLINE", "STATUS_BAR", - "STATUS_BAR_OUTLINE" + "STATUS_BAR_OUTLINE", + "JOB_BAR", + "JOB_BAR_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 9e022dfcb..049e7e04b 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -412,6 +412,8 @@ class Theme final : public Palette, public ConfigListener ARROWS_BAR_OUTLINE, STATUS_BAR, STATUS_BAR_OUTLINE, + JOB_BAR, + JOB_BAR_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index fb1805f22..412b1b730 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -112,7 +112,7 @@ MiniStatusWindow::MiniStatusWindow() : if (job) { - mJobBar = createBar(0, 100, 0, Theme::PROGRESS_BAR, Theme::PROG_JOB, + mJobBar = createBar(0, 100, 0, Theme::JOB_BAR, Theme::PROG_JOB, // TRANSLATORS: status bar name "job bar", _("job bar")); StatusWindow::updateJobBar(mJobBar); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 2f3d5f1e0..e08483f5d 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -255,6 +255,8 @@ StatusWindow::StatusWindow() : // TRANSLATORS: status window label mJobLabel = new Label(this, _("Job:")); mJobBar = new ProgressBar(this, 0.0F, 80, 0, Theme::PROG_JOB); + mJobBar->setColor(Theme::getThemeColor(Theme::JOB_BAR), + Theme::getThemeColor(Theme::JOB_BAR_OUTLINE)); place(3, 0, mJobLvlLabel, 3); place(5, 2, mJobLabel).setPadding(3); -- cgit v1.2.3-70-g09d2