summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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.cpp2
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/windows/inventorywindow.cpp2
-rw-r--r--src/gui/windows/ministatuswindow.cpp2
13 files changed, 29 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index b984cec3a..be850d515 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -109,6 +109,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 70db41f5d..21728f3b2 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -99,6 +99,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#555555" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#555555" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 2285d70a6..e6f36f0ba 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -98,6 +98,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 7c2735d74..43ce45ac6 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -99,6 +99,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 ef5f1312f..ecc02ddb0 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -96,6 +96,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_BAR_OUTLINE" color="#000000" />
</palette>
<palette id="1">
@@ -269,6 +271,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_BAR_OUTLINE" color="#000000" />
</palette>
<palette id="2">
@@ -366,6 +370,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 1461a116a..23e60978a 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -99,6 +99,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 0faa08f83..dca5cd5ae 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -99,6 +99,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 f5c9279b1..416565730 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -98,6 +98,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 346b82911..a19d4c7fb 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -99,6 +99,8 @@
<color id="NO_MP_BAR_OUTLINE" color="#000000" />
<color id="XP_BAR" color="#ffffff" />
<color id="XP_BAR_OUTLINE" color="#000000" />
+ <color id="WEIGHT_BAR" color="#ffffff" />
+ <color id="WEIGHT_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 aa0b87bcb..c69335a07 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -961,6 +961,8 @@ static int readColorType(const std::string &type)
"NO_MP_BAR_OUTLINE"
"XP_BAR",
"XP_BAR_OUTLINE"
+ "WEIGHT_BAR",
+ "WEIGHT_BAR_OUTLINE"
};
if (type.empty())
diff --git a/src/gui/theme.h b/src/gui/theme.h
index bbcce646f..155ff6b6a 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -404,6 +404,8 @@ class Theme final : public Palette, public ConfigListener
NO_MP_BAR_OUTLINE,
XP_BAR,
XP_BAR_OUTLINE,
+ WEIGHT_BAR,
+ WEIGHT_BAR_OUTLINE,
THEME_COLORS_END
};
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index b9c89ad96..bdc0b342e 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -226,6 +226,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
// TRANSLATORS: inventory button
mEquipmentButton = new Button(this, _("Equipment"), "equipment", this);
mWeightBar = new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_WEIGHT);
+ mWeightBar->setColor(Theme::getThemeColor(Theme::WEIGHT_BAR),
+ Theme::getThemeColor(Theme::WEIGHT_BAR_OUTLINE));
place(0, 0, mWeightBar, 4);
mSlotsBarCell = &place(4, 0, mSlotsBar, 5);
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index be691b72e..4cc913eb9 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -75,7 +75,7 @@ MiniStatusWindow::MiniStatusWindow() :
// TRANSLATORS: status bar name
"xp bar", _("experience bar"))),
mJobBar(nullptr),
- mWeightBar(createBar(0, 140, 0, Theme::PROGRESS_BAR, Theme::PROG_WEIGHT,
+ mWeightBar(createBar(0, 140, 0, Theme::WEIGHT_BAR, Theme::PROG_WEIGHT,
// TRANSLATORS: status bar name
"weight bar", _("weight bar"))),
mInvSlotsBar(createBar(0, 45, 0,
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-10 03:26:36 +0000