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.cpp4
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/windows/ministatuswindow.cpp2
-rw-r--r--src/gui/windows/statuswindow.cpp2
13 files changed, 30 insertions, 2 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 8e0be59f9..ce4858ae7 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -117,6 +117,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 b17430495..e9e8280d2 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -107,6 +107,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#555555" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#555555" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 63949b862..915132f69 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -106,6 +106,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 62add1204..ec49de580 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -107,6 +107,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 35de6eab0..de61a3ee4 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -104,6 +104,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_BAR_OUTLINE" color="#000000" />
</palette>
<palette id="1">
@@ -285,6 +287,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_BAR_OUTLINE" color="#000000" />
</palette>
<palette id="2">
@@ -390,6 +394,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 20dd5aa86..4b8ca8ad2 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -107,6 +107,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 061788253..b92c8d03b 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -107,6 +107,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 911bfe9f2..38f1eafbe 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -106,6 +106,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 85ccc9d09..224eb6f65 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -107,6 +107,8 @@
<color id="ARROWS_BAR_OUTLINE" color="#000000" />
<color id="STATUS_BAR" color="#ffffff" />
<color id="STATUS_BAR_OUTLINE" color="#000000" />
+ <color id="JOB_BAR" color="#ffffff" />
+ <color id="JOB_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 281f5b37f..b7510dc9f 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -968,7 +968,9 @@ static int readColorType(const std::string &type)
"ARROWS_BAR",
"ARROWS_BAR_OUTLINE",
"STATUS_BAR",
- "STATUS_BAR_OUTLINE"
+ "STATUS_BAR_OUTLINE",
+ "JOB_BAR",
+ "JOB_BAR_OUTLINE"
};
if (type.empty())
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 9e022dfcb..049e7e04b 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -412,6 +412,8 @@ class Theme final : public Palette, public ConfigListener
ARROWS_BAR_OUTLINE,
STATUS_BAR,
STATUS_BAR_OUTLINE,
+ JOB_BAR,
+ JOB_BAR_OUTLINE,
THEME_COLORS_END
};
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index fb1805f22..412b1b730 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -112,7 +112,7 @@ MiniStatusWindow::MiniStatusWindow() :
if (job)
{
- mJobBar = createBar(0, 100, 0, Theme::PROGRESS_BAR, Theme::PROG_JOB,
+ mJobBar = createBar(0, 100, 0, Theme::JOB_BAR, Theme::PROG_JOB,
// TRANSLATORS: status bar name
"job bar", _("job bar"));
StatusWindow::updateJobBar(mJobBar);
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 2f3d5f1e0..e08483f5d 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -255,6 +255,8 @@ StatusWindow::StatusWindow() :
// TRANSLATORS: status window label
mJobLabel = new Label(this, _("Job:"));
mJobBar = new ProgressBar(this, 0.0F, 80, 0, Theme::PROG_JOB);
+ mJobBar->setColor(Theme::getThemeColor(Theme::JOB_BAR),
+ Theme::getThemeColor(Theme::JOB_BAR_OUTLINE));
place(3, 0, mJobLvlLabel, 3);
place(5, 2, mJobLabel).setPadding(3);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 11:52:57 +0000