From 9e34f49d48d6e07edd307888230d4d3e4f8ecfb3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 17:22:06 +0300 Subject: add background color for status (yellow) bar. New progress color: STATUS. --- 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 | 1 + data/themes/unity/colors.xml | 1 + data/themes/wood/colors.xml | 1 + src/gui/theme.cpp | 5 +++-- src/gui/theme.h | 1 + src/gui/windows/ministatuswindow.cpp | 2 +- 12 files changed, 14 insertions(+), 3 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 216197dc5..fdb3f62d3 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -127,4 +127,5 @@ + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 15e753947..b8efd59e0 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -128,4 +128,5 @@ + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 5e422d59a..3bccdde8a 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -127,4 +127,5 @@ + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 0dcd1495e..fd98e0066 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -128,4 +128,5 @@ + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 07ad91f01..c37ca7a39 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -396,4 +396,5 @@ + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 4dfbb9a89..d6b755bc8 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -128,4 +128,5 @@ + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index a411620db..70e1be1f8 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -128,4 +128,5 @@ + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 0d6205759..ff0d6a943 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -127,4 +127,5 @@ + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index a546e593f..ef4196616 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -128,4 +128,5 @@ + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 816fdcaa5..3f1064d1a 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1046,7 +1046,7 @@ static Palette::GradientType readColorGradient(const std::string &grad) static int readProgressType(const std::string &type) { - static const std::string colors[] = + static const std::string colors[Theme::THEME_PROG_END] = { "HP", "MP", @@ -1057,7 +1057,8 @@ static int readProgressType(const std::string &type) "JOB", "UPDATE", "MONEY", - "ARROWS" + "ARROWS", + "STATUS" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 85062a3e7..95e8f84bc 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -425,6 +425,7 @@ class Theme final : public Palette, public ConfigListener PROG_UPDATE, PROG_MONEY, PROG_ARROWS, + PROG_STATUS, THEME_PROG_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index f21e53d42..2de6621f4 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -89,7 +89,7 @@ MiniStatusWindow::MiniStatusWindow() : // TRANSLATORS: status bar name "arrows bar", _("arrows bar"))), mStatusBar(createBar(100, (config.getIntValue("fontSize") > 16 - ? 250 : 165), 0, Theme::PROGRESS_BAR, Theme::PROG_EXP, + ? 250 : 165), 0, Theme::PROGRESS_BAR, Theme::PROG_STATUS, // TRANSLATORS: status bar name "status bar", _("status bar"))), mTextPopup(new TextPopup), -- cgit v1.2.3-60-g2f50