Split Palette into Theme and UserPalette

Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.

Also fixes comparing strings of different lengths insensitively.

Reviewed-by: Thorbjørn Lindeijer

1 files changed, 6 insertions, 7 deletions

diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index a6bb49d9..56bcb0a0 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -42,7 +42,7 @@ class ProgressBar : public gcn::Widget
          */
         ProgressBar(float progress = 0.0f,
                     int width = 40, int height = 7,
-                    const gcn::Color &color = gcn::Color(150, 150, 150));
+                    int color = -1);
 
         ~ProgressBar();
 
@@ -72,17 +72,15 @@ class ProgressBar : public gcn::Widget
         float getProgress() const { return mProgress; }
 
         /**
-         * Change the color of the progress bar.
+         * Change the ProgressPalette for this ProgressBar to follow or -1 to
+         * disable this and manage color manually.
          */
-        void setColor(const gcn::Color &color);
+        void setProgressPalette(int progressPalette);
 
         /**
          * Change the color of the progress bar.
-         *
-         * This is an overload provided for convenience.
          */
-        inline void setColor(int r, int g, int b)
-        { setColor(gcn::Color(r, g, b)); }
+        void setColor(const gcn::Color &color);
 
         /**
          * Returns the color of the progress bar.
@@ -124,6 +122,7 @@ class ProgressBar : public gcn::Widget
         float mProgress, mProgressToGo;
         bool mSmoothProgress;
 
+        int mProgressPalette; /** < Entry in ProgressPalette or -1 for none. */
         gcn::Color mColor;
         gcn::Color mColorToGo;
         bool mSmoothColorChange;