From 0669b8b097f21957ed72ae1304064743130710d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Dec 2013 17:35:47 +0300 Subject: Add text colors for status (yellow) bar. New theme colors: STATUS_BAR, STATUS_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 +- 12 files changed, 28 insertions(+), 2 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index fdb3f62d3..8e0be59f9 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -115,6 +115,8 @@ + + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index b8efd59e0..b17430495 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -105,6 +105,8 @@ + + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 3bccdde8a..63949b862 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -104,6 +104,8 @@ + + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index fd98e0066..62add1204 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -105,6 +105,8 @@ + + diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index c37ca7a39..35de6eab0 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -102,6 +102,8 @@ + + @@ -281,6 +283,8 @@ + + @@ -384,6 +388,8 @@ + + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index d6b755bc8..20dd5aa86 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -105,6 +105,8 @@ + + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 70e1be1f8..061788253 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -105,6 +105,8 @@ + + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index ff0d6a943..911bfe9f2 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -104,6 +104,8 @@ + + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index ef4196616..85ccc9d09 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -105,6 +105,8 @@ + + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 3f1064d1a..281f5b37f 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -966,7 +966,9 @@ static int readColorType(const std::string &type) "MONEY_BAR", "MONEY_BAR_OUTLINE", "ARROWS_BAR", - "ARROWS_BAR_OUTLINE" + "ARROWS_BAR_OUTLINE", + "STATUS_BAR", + "STATUS_BAR_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 95e8f84bc..9e022dfcb 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -410,6 +410,8 @@ class Theme final : public Palette, public ConfigListener MONEY_BAR_OUTLINE, ARROWS_BAR, ARROWS_BAR_OUTLINE, + STATUS_BAR, + STATUS_BAR_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 2de6621f4..fb1805f22 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_STATUS, + ? 250 : 165), 0, Theme::STATUS_BAR, Theme::PROG_STATUS, // TRANSLATORS: status bar name "status bar", _("status bar"))), mTextPopup(new TextPopup), -- cgit v1.2.3-70-g09d2