summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-03 21:28:50 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-03 21:28:50 +0300
commitbbc361c48389875a8a67d138bc05aad30070b916 (patch)
tree8d2fcdf36e953b54904357b0a14a76bb469c2337
parent54a54eb5317650fc3306d200517bcc48bb7f1d9c (diff)
downloadmanaplus-bbc361c48389875a8a67d138bc05aad30070b916.tar.gz
manaplus-bbc361c48389875a8a67d138bc05aad30070b916.tar.bz2
manaplus-bbc361c48389875a8a67d138bc05aad30070b916.tar.xz
manaplus-bbc361c48389875a8a67d138bc05aad30070b916.zip
add UPDATE color into progress bar colors.
New progress color: UPDATE. also removed DEFAULT progress color.
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.xml2
-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.h4
-rw-r--r--src/gui/widgets/progressbar.cpp6
-rw-r--r--src/gui/widgets/progressbar.h4
-rw-r--r--src/gui/windows/updaterwindow.cpp2
14 files changed, 19 insertions, 19 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index d9a2f46c7..a5a8faa0e 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -100,7 +100,6 @@
<color id="TABLE_BACKGROUND" color="#ffffff" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -108,4 +107,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index ff89683c8..b89548679 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -101,7 +101,6 @@
<color id="BROWN" color="#ffffff" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -109,4 +108,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index e464a3231..b96472dac 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -100,7 +100,6 @@
<color id="BROWN" color="#8e4c17" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -108,4 +107,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 59395e504..38d2df416 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -101,7 +101,6 @@
<color id="BROWN" color="#8e4c17" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -109,4 +108,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index c113e5d21..50a297a55 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -335,7 +335,6 @@
<color id="TABLE_BACKGROUND" color="#bfbfbf" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#b80000" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -343,4 +342,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index f38d761b3..8a21f9f34 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -101,7 +101,6 @@
<color id="BROWN" color="#8e4c17" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -109,4 +108,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 08b2d0450..72b355317 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -101,7 +101,6 @@
<color id="BROWN" color="#8e4c17" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -109,4 +108,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors> \ No newline at end of file
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 688d634f5..8f86df563 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -100,7 +100,6 @@
<color id="BROWN" color="#05FF2E" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -108,4 +107,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors> \ No newline at end of file
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 95dbca358..54a19172e 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -101,7 +101,6 @@
<color id="BROWN" color="#8e4c17" />
</palette>
- <progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
<progressbar id="NO_MP" color="#646464" />
@@ -109,4 +108,5 @@
<progressbar id="INVY_SLOTS" color="#e1c819" />
<progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" />
<progressbar id="JOB" color="#e187cb" />
+ <progressbar id="UPDATE" color="#969696" />
</colors>
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 95e35f2aa..fa5ec0e04 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -1031,14 +1031,14 @@ static int readProgressType(const std::string &type)
{
static const std::string colors[] =
{
- "DEFAULT",
"HP",
"MP",
"NO_MP",
"EXP",
"INVY_SLOTS",
"WEIGHT",
- "JOB"
+ "JOB",
+ "UPDATE"
};
if (type.empty())
diff --git a/src/gui/theme.h b/src/gui/theme.h
index bbc6ae06f..31dc0ee60 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -398,14 +398,14 @@ class Theme final : public Palette, public ConfigListener
enum ProgressPalette
{
- PROG_DEFAULT = 0,
- PROG_HP,
+ PROG_HP = 0,
PROG_MP,
PROG_NO_MP,
PROG_EXP,
PROG_INVY_SLOTS,
PROG_WEIGHT,
PROG_JOB,
+ PROG_UPDATE,
THEME_PROG_END
};
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index de30feeef..51faed2ae 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -37,19 +37,19 @@ float ProgressBar::mAlpha = 1.0;
ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
const int width, const int height,
- const int color):
+ const int backColor):
gcn::Widget(),
Widget2(widget),
gcn::WidgetListener(),
mSkin(nullptr),
mProgress(progress),
mProgressToGo(progress),
- mColor(Theme::getProgressColor(color >= 0 ? color : 0, mProgress)),
+ mColor(Theme::getProgressColor(backColor >= 0 ? backColor : 0, mProgress)),
mColorToGo(mColor),
mOutlineColor(getThemeColor(Theme::OUTLINE)),
mText(),
mVertexes(new ImageCollection),
- mProgressPalette(color),
+ mProgressPalette(backColor),
mPadding(2),
mFillPadding(3),
mSmoothProgress(true),
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index fa05e7bd3..160d3f4a2 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -50,8 +50,8 @@ class ProgressBar final : public gcn::Widget,
* Constructor, initializes the progress with the given value.
*/
ProgressBar(const Widget2 *const widget, float progress,
- const int width = 40, const int height = 7,
- const int color = -1);
+ const int width, const int height,
+ const int backColor);
A_DELETE_COPY(ProgressBar)
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index d381e11c2..9c9a3adab 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -179,7 +179,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
mCancelButton(new Button(this, _("Cancel"), "cancel", this)),
// TRANSLATORS: updater window button
mPlayButton(new Button(this, _("Play"), "play", this)),
- mProgressBar(new ProgressBar(this, 0.0, 310, 0)),
+ mProgressBar(new ProgressBar(this, 0.0, 310, 0, Theme::PROG_UPDATE)),
mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
"browserbox.xml")),
mScrollArea(new ScrollArea(mBrowserBox, true, "update_background.xml")),
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-28 03:37:29 +0000