Extend color config gui to support the new colors

The new color palette supports many more colors that the browserbox can
display. So a change to the color config gui was needed.

1 files changed, 166 insertions, 16 deletions

diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 6f1da525..7990e217 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -27,6 +27,7 @@
 #include <guichan/widgets/slider.hpp>
 
 #include "browserbox.h"
+#include "gui.h"
 #include "itemlinkhandler.h"
 #include "listbox.h"
 #include "palette.h"
@@ -56,8 +57,10 @@ Setup_Colors::Setup_Colors() :
     mScroll = new ScrollArea(mColorBox);
     mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
+    mTextPreview = new TextPreview(&rawmsg);
+
     mPreview = new BrowserBox(BrowserBox::AUTO_WRAP);
-    mPreview->setOpaque(false);
+    mPreview->setOpaque(true);
 
     // don't do anything with links
     mPreview->setLinkHandler(NULL);
@@ -67,6 +70,17 @@ Setup_Colors::Setup_Colors() :
     mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
                                  gcn::ScrollArea::SHOW_NEVER);
 
+    mGradTypeLabel = new gcn::Label(_("Type: "));
+
+    mGradTypeSlider = new Slider(0, 2);
+    mGradTypeSlider->setWidth(160);
+    mGradTypeSlider->setActionEventId("slider_grad");
+    mGradTypeSlider->setValue(0);
+    mGradTypeSlider->addActionListener(this);
+    mGradTypeSlider->setEnabled(false);
+
+    mGradTypeText = new gcn::Label();
+
     mRedLabel = new gcn::Label(_("Red: "));
 
     mRedText = new TextField;
@@ -74,12 +88,14 @@ Setup_Colors::Setup_Colors() :
     mRedText->setRange(0, 255);
     mRedText->setNumeric(true);
     mRedText->addListener(this);
+    mRedText->setEnabled(false);
 
     mRedSlider = new Slider(0, 255);
     mRedSlider->setWidth(160);
     mRedSlider->setValue(mRedText->getValue());
     mRedSlider->setActionEventId("slider_red");
     mRedSlider->addActionListener(this);
+    mRedSlider->setEnabled(false);
 
     mGreenLabel = new gcn::Label(_("Green: "));
 
@@ -88,12 +104,14 @@ Setup_Colors::Setup_Colors() :
     mGreenText->setRange(0, 255);
     mGreenText->setNumeric(true);
     mGreenText->addListener(this);
+    mGreenText->setEnabled(false);
 
     mGreenSlider = new Slider(0, 255);
     mGreenSlider->setWidth(160);
     mGreenSlider->setValue(mGreenText->getValue());
     mGreenSlider->setActionEventId("slider_green");
     mGreenSlider->addActionListener(this);
+    mGreenSlider->setEnabled(false);
 
     mBlueLabel = new gcn::Label(_("Blue: "));
 
@@ -102,12 +120,14 @@ Setup_Colors::Setup_Colors() :
     mBlueText->setRange(0, 255);
     mBlueText->setNumeric(true);
     mBlueText->addListener(this);
+    mBlueText->setEnabled(false);
 
     mBlueSlider = new Slider(0, 255);
     mBlueSlider->setWidth(160);
     mBlueSlider->setValue(mBlueText->getValue());
     mBlueSlider->setActionEventId("slider_blue");
     mBlueSlider->addActionListener(this);
+    mBlueSlider->setEnabled(false);
 
     setOpaque(false);
 
@@ -115,8 +135,11 @@ Setup_Colors::Setup_Colors() :
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
 
-    place(0, 0, mScroll, 4, 7).setPadding(2);
-    place(0, 7, mPreviewBox, 4).setPadding(2);
+    place(0, 0, mScroll, 4, 6).setPadding(2);
+    place(0, 6, mPreviewBox, 4).setPadding(2);
+    place(0, 7, mGradTypeLabel, 2);
+    place(2, 7, mGradTypeSlider);
+    place(3, 7, mGradTypeText);
     place(0, 8, mRedLabel, 2);
     place(2, 8, mRedSlider);
     place(3, 8, mRedText).setPadding(1);
@@ -132,8 +155,21 @@ Setup_Colors::Setup_Colors() :
 
 Setup_Colors::~Setup_Colors()
 {
-    delete mPreview;
-    delete mPreviewBox;
+    //delete mPreview;
+    if (mPreviewBox->getContent() == mPreview)
+    {
+        delete mTextPreview;
+    }
+    else
+    {
+        delete mPreview;
+    }
+    //    delete mTextPreview;
+//    delete mPreviewBox;
+
+/*    delete mGradTypeLabel;
+    delete mGradTypeSlider;
+    delete mGradTypeText;
 
     delete mRedLabel;
     delete mRedSlider;
@@ -148,7 +184,7 @@ Setup_Colors::~Setup_Colors()
     delete mBlueText;
 
     delete mColorBox;
-    delete mScroll;
+    delete mScroll;*/
 }
 
 void Setup_Colors::action(const gcn::ActionEvent &event)
@@ -158,20 +194,103 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
         mSelected = mColorBox->getSelected();
         Palette::ColorType type = guiPalette->getColorTypeAt(mSelected);
         const gcn::Color *col = &guiPalette->getColor(type);
+        Palette::GradientType grad = guiPalette->getGradientType(type);
 
         std::string msg;
+        char ch = guiPalette->getColorChar(type);
 
         mPreview->clearRows();
-        char ch = guiPalette->getColorChar(type);
-        if (ch == '<')
-            msg = toString("@@|") + rawmsg + "@@";
-        else
-            msg = "##" + toString(ch) + rawmsg;
-        mPreview->addRow(msg);
+        mPreviewBox->setContent(mTextPreview);
+        mTextPreview->setFont(gui->getFont());
+        mTextPreview->setTextColor(
+                &guiPalette->getColor(Palette::TEXT));
+        mTextPreview->setTextBGColor(NULL);
+        mTextPreview->setShadow(true);
+        mTextPreview->setOutline(true);
+
+        switch (type)
+        {
+            case Palette::TEXT:
+            case Palette::SHADOW:
+            case Palette::OUTLINE:
+                mTextPreview->setFont(gui->getFont());
+                mTextPreview->setOutline(true);
+                mTextPreview->setShadow(type == Palette::SHADOW);
+                mTextPreview->setOutline(type == Palette::OUTLINE);
+                break;
+            case Palette::BACKGROUND:
+            case Palette::HIGHLIGHT:
+            case Palette::SHOP_WARNING:
+                mTextPreview->setTextBGColor(col);
+                mTextPreview->setOutline(false);
+                mTextPreview->setShadow(false);
+                mPreview->addRow(rawmsg);
+                break;
+            case Palette::CHAT:
+            case Palette::GM:
+            case Palette::PLAYER:
+            case Palette::WHISPER:
+            case Palette::IS:
+            case Palette::PARTY:
+            case Palette::SERVER:
+            case Palette::LOGGER:
+            case Palette::HYPERLINK:
+                mPreviewBox->setContent(mPreview);
+                mPreview->clearRows();
+                //char ch = guiPalette->getColorCharAt(mSelected);
+                //std::string msg;
+
+                if (ch == '<')
+                {
+                    msg = toString("@@|") + rawmsg + "@@";
+                }
+                else
+                {
+                    msg = "##" + toString(ch) + rawmsg;
+                }
+                //std::cout << msg << std::endl;
+                mPreview->addRow(msg);
+                break;
+            case Palette::PARTICLE:
+            case Palette::EXP_INFO:
+            case Palette::PICKUP_INFO:
+            case Palette::HIT_PLAYER_MONSTER:
+            case Palette::HIT_MONSTER_PLAYER:
+            case Palette::HIT_CRITICAL:
+            case Palette::MISS:
+                mTextPreview->setShadow(false);
+            case Palette::BEING:
+            case Palette::PC:
+            case Palette::SELF:
+            case Palette::GM_NAME:
+            case Palette::NPC:
+            case Palette::MONSTER:
+                mTextPreview->setFont(boldFont);
+                mTextPreview->setTextColor(col);
+                break;
+        }
+
+        if (grad != Palette::STATIC)
+        { // If nonstatic color, don't display the current, but the committed
+          // color at the sliders
+            col = &guiPalette->getCommittedColor(type);
+        }
 
         setEntry(mRedSlider, mRedText, col->r);
         setEntry(mGreenSlider, mGreenText, col->g);
         setEntry(mBlueSlider, mBlueText, col->b);
+
+        mGradTypeSlider->setValue(grad);
+        updateGradType();
+        mGradTypeSlider->setEnabled(true);
+
+        return;
+    }
+
+    if (event.getId() == "slider_grad")
+    {
+        updateGradType();
+        updateColor();
         return;
     }
 
@@ -215,6 +334,7 @@ void Setup_Colors::cancel()
     guiPalette->rollback();
     Palette::ColorType type = guiPalette->getColorTypeAt(mSelected);
     const gcn::Color *col = &guiPalette->getColor(type);
+    mGradTypeSlider->setValue(guiPalette->getGradientType(type));
     setEntry(mRedSlider, mRedText, col->r);
     setEntry(mGreenSlider, mGreenText, col->g);
     setEntry(mBlueSlider, mBlueText, col->b);
@@ -242,6 +362,29 @@ void Setup_Colors::listen(const TextField *tf)
     }
 }
 
+void Setup_Colors::updateGradType() {
+    if (mSelected == -1)
+    {
+        return;
+    }
+
+    mSelected = mColorBox->getSelected();
+    Palette::ColorType type = guiPalette->getColorTypeAt(mSelected);
+    Palette::GradientType grad = guiPalette->getGradientType(type);
+
+    mGradTypeText->setCaption(
+            (grad == Palette::STATIC) ? _("Static") :
+            (grad == Palette::RAINBOW) ? _("Rainbow") : _("Spectrum"));
+
+    bool enable = (grad == Palette::STATIC);
+    mRedText->setEnabled(enable);
+    mRedSlider->setEnabled(enable);
+    mGreenText->setEnabled(enable);
+    mGreenSlider->setEnabled(enable);
+    mBlueText->setEnabled(enable);
+    mBlueSlider->setEnabled(enable);
+}
+
 void Setup_Colors::updateColor()
 {
     if (mSelected == -1)
@@ -250,8 +393,15 @@ void Setup_Colors::updateColor()
     }
 
     Palette::ColorType type = guiPalette->getColorTypeAt(mSelected);
-    guiPalette->setColor(type,
-            static_cast<int>(mRedSlider->getValue()),
-            static_cast<int>(mGreenSlider->getValue()),
-            static_cast<int>(mBlueSlider->getValue()));
+    Palette::GradientType grad =
+            static_cast<Palette::GradientType>(mGradTypeSlider->getValue());
+    guiPalette->setGradient(type, grad);
+
+    if (grad == Palette::STATIC)
+    {
+        guiPalette->setColor(type,
+                static_cast<int>(mRedSlider->getValue()),
+                static_cast<int>(mGreenSlider->getValue()),
+                static_cast<int>(mBlueSlider->getValue()));
+    }
 }