summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-09 15:11:31 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-09 15:11:31 +0300
commit2e5188851e2267a4e5e84170a7e0d55678972c7b (patch)
tree391c8b3277b3214f2706b85962e7d5a093c40f00
parente6848c0aa8b1447c5e19bd1923f3fbd2866e635b (diff)
downloadmanaplus-2e5188851e2267a4e5e84170a7e0d55678972c7b.tar.gz
manaplus-2e5188851e2267a4e5e84170a7e0d55678972c7b.tar.bz2
manaplus-2e5188851e2267a4e5e84170a7e0d55678972c7b.tar.xz
manaplus-2e5188851e2267a4e5e84170a7e0d55678972c7b.zip
add background color for money bar.
New progress color: MONEY.
-rw-r--r--data/graphics/gui/colors.xml1
-rw-r--r--data/themes/blacknblack/colors.xml1
-rw-r--r--data/themes/blackwood/colors.xml1
-rw-r--r--data/themes/enchilado/colors.xml1
-rw-r--r--data/themes/jewelry/colors.xml1
-rw-r--r--data/themes/mana/colors.xml1
-rw-r--r--data/themes/pink/colors.xml3
-rw-r--r--data/themes/unity/colors.xml3
-rw-r--r--data/themes/wood/colors.xml1
-rw-r--r--src/gui/theme.cpp3
-rw-r--r--src/gui/theme.h1
-rw-r--r--src/gui/windows/ministatuswindow.cpp2
12 files changed, 15 insertions, 4 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index be850d515..c9a113e92 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -121,4 +121,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 21728f3b2..37f163493 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -122,4 +122,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index e6f36f0ba..f7965c7ba 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -121,4 +121,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 43ce45ac6..b0693b056 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -122,4 +122,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index ecc02ddb0..f25a83130 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -382,4 +382,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 23e60978a..230f02fcd 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -122,4 +122,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index dca5cd5ae..91f7e4517 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -122,4 +122,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
-</colors> \ No newline at end of file
+ <progressbar id="MONEY" color="#e1c819" />
+</colors>
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 416565730..d37b4d82d 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -121,4 +121,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
-</colors> \ No newline at end of file
+ <progressbar id="MONEY" color="#e1c819" />
+</colors>
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index a19d4c7fb..9d6bb31e3 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -122,4 +122,5 @@
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
<progressbar id="UPDATE" color="#969696" />
+ <progressbar id="MONEY" color="#e1c819" />
</colors>
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index c69335a07..0d974209d 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -1051,7 +1051,8 @@ static int readProgressType(const std::string &type)
"INVY_SLOTS",
"WEIGHT",
"JOB",
- "UPDATE"
+ "UPDATE",
+ "MONEY",
};
if (type.empty())
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 155ff6b6a..99b74c512 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -419,6 +419,7 @@ class Theme final : public Palette, public ConfigListener
PROG_WEIGHT,
PROG_JOB,
PROG_UPDATE,
+ PROG_MONEY,
THEME_PROG_END
};
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 4cc913eb9..d7ab27718 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -82,7 +82,7 @@ MiniStatusWindow::MiniStatusWindow() :
Theme::SLOTS_BAR, Theme::PROG_INVY_SLOTS,
// TRANSLATORS: status bar name
"inventory slots bar", _("inventory slots bar"))),
- mMoneyBar(createBar(0, 130, 0, Theme::SLOTS_BAR, Theme::PROG_INVY_SLOTS,
+ mMoneyBar(createBar(0, 130, 0, Theme::SLOTS_BAR, Theme::PROG_MONEY,
// TRANSLATORS: status bar name
"money bar", _("money bar"))),
mArrowsBar(createBar(0, 50, 0, Theme::SLOTS_BAR, Theme::PROG_INVY_SLOTS,