summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-09 17:35:47 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-09 17:35:47 +0300
commit0669b8b097f21957ed72ae1304064743130710d9 (patch)
tree775d5275bcd3c1b53b90544bc2e4199e07b0d5d7
parent9e34f49d48d6e07edd307888230d4d3e4f8ecfb3 (diff)
downloadmanaverse-0669b8b097f21957ed72ae1304064743130710d9.tar.gz
manaverse-0669b8b097f21957ed72ae1304064743130710d9.tar.bz2
manaverse-0669b8b097f21957ed72ae1304064743130710d9.tar.xz
manaverse-0669b8b097f21957ed72ae1304064743130710d9.zip
Add text colors for status (yellow) bar.
New theme colors: STATUS_BAR, STATUS_BAR_OUTLINE
-rw-r--r--data/graphics/gui/colors.xml2
-rw-r--r--data/themes/blacknblack/colors.xml2
-rw-r--r--data/themes/blackwood/colors.xml2
-rw-r--r--data/themes/enchilado/colors.xml2
-rw-r--r--data/themes/jewelry/colors.xml6
-rw-r--r--data/themes/mana/colors.xml2
-rw-r--r--data/themes/pink/colors.xml2
-rw-r--r--data/themes/unity/colors.xml2
-rw-r--r--data/themes/wood/colors.xml2
-rw-r--r--src/gui/theme.cpp4
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/windows/ministatuswindow.cpp2
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
</palette>
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#555555" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#555555" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#555555" />
<color id="BLACK" color="#ffffff" />
<color id="RED" color="#ffffff" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
<color id="BLACK" color="#7a7972" />
<color id="RED" color="#ff0000" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
<color id="BLACK" color="#000000" />
<color id="RED" color="#ff0000" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
</palette>
<palette id="1">
@@ -281,6 +283,8 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
</palette>
<palette id="2">
@@ -384,6 +388,8 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
</palette>
<progressbar id="HP" color="#b80000" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
<color id="BLACK" color="#000000" />
<color id="RED" color="#ff0000" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
<color id="BLACK" color="#000000" />
<color id="RED" color="#ff0000" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
<color id="BLACK" color="#0E0E0E" />
<color id="RED" color="#FFA8A8" />
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 @@
<color id="MONEY_BAR_OUTLINE" color="#000000" />
<color id="ARROWS_BAR" color="#ffffff" />
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
+ <color id="STATUS_BAR" color="#ffffff" />
+ <color id="STATUS_BAR_OUTLINE" color="#000000" />
<color id="BLACK" color="#000000" />
<color id="RED" color="#ff0000" />
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),