pencil2d · chchwy · May 17, 2018 · May 10, 2018 · May 13, 2018 · May 16, 2018
diff --git a/app/app.pro b/app/app.pro
@@ -58,7 +58,8 @@ HEADERS += \
     src/exportimagedialog.h \
     src/importimageseqdialog.h \
     src/spinslider.h \
-    src/doubleprogressdialog.h
+    src/doubleprogressdialog.h \
+    src/colorslider.h
 
 SOURCES += \
     src/main.cpp \
@@ -85,7 +86,8 @@ SOURCES += \
     src/exportimagedialog.cpp \
     src/importimageseqdialog.cpp \
     src/spinslider.cpp \
-    src/doubleprogressdialog.cpp
+    src/doubleprogressdialog.cpp \
+    src/colorslider.cpp
 
 FORMS += \
     ui/mainwindow2.ui \

diff --git a/app/data/app.qrc b/app/data/app.qrc
@@ -50,6 +50,7 @@
         <file>icons/new/svg/selection.svg</file>
         <file>icons/new/svg/smudge_detailed.svg</file>
         <file>icons/new/svg/trash_detailed.svg</file>
+        <file>icons/new/checkerboard_smaller</file>
     </qresource>
     <qresource prefix="/app">
         <file>icons/onion-blue.png</file>
@@ -62,5 +63,7 @@
         <file>icons/mirrorV.png</file>
         <file>icons/dialog-error.svg</file>
         <file>pencil2d_quick_guide.pdf</file>
+        <file>icons/new/svg/color-dialog.svg</file>
+        <file>icons/new/svg/more_options.svg</file>
     </qresource>
 </RCC>
diff --git a/app/data/icons/new/checkerboard_smaller b/app/data/icons/new/checkerboard_smaller
diff --git a/app/data/icons/new/svg/color-dialog.svg b/app/data/icons/new/svg/color-dialog.svg
diff --git a/app/data/icons/new/svg/more_options.svg b/app/data/icons/new/svg/more_options.svg
diff --git a/app/src/colorbox.cpp b/app/src/colorbox.cpp
@@ -18,32 +18,25 @@ GNU General Public License for more details.
 #include "colorwheel.h"
 #include "colorinspector.h"
 #include "colorbox.h"
+#include "pencildef.h"
 
 ColorBox::ColorBox( QWidget* parent ) : BaseDockWidget( parent )
 {
-    setWindowTitle(tr("Color Wheel", "Color Wheel's window title"));
+    setWindowTitle(tr("Color Box", "Color Box window title"));
 
     mColorWheel = new ColorWheel(this);
-    mColorInspector = new ColorInspector(this);
 
     QVBoxLayout* layout = new QVBoxLayout();
     layout->setContentsMargins(5, 5, 5, 5);
     layout->addWidget(mColorWheel);
-    layout->addWidget(mColorInspector);
     layout->setStretch(0, 1);
     layout->setStretch(1, 0);
     QWidget* mainWidget = new QWidget;
     mainWidget->setLayout(layout);
     setWidget(mainWidget);
 
     connect(mColorWheel, &ColorWheel::colorChanged, this, &ColorBox::onWheelMove);
-    connect(mColorInspector, &ColorInspector::colorChanged, this, &ColorBox::onSpinboxChange);
     connect(mColorWheel, &ColorWheel::colorSelected, this, &ColorBox::onWheelRelease);
-
-    QColor defaultColor;
-    defaultColor.setHsv(0, 0, 0);
-    mColorWheel->setColor(defaultColor);
-    mColorInspector->setColor(defaultColor);
 }
 
 ColorBox::~ColorBox()
@@ -56,43 +49,42 @@ void ColorBox::initUI()
 
 void ColorBox::updateUI()
 {
+    mColorLoaded = true;
 }
 
 QColor ColorBox::color()
 {
     return mColorWheel->color();
 }
 
-void ColorBox::setColor(const QColor& newColor)
+/**
+ * @brief ColorBox::loadColor
+ *
+ * This value is only to be used once
+ * for further color modifications, use setColor
+ */
+void ColorBox::loadColor(const QColor& color)
 {
-    if ( newColor.toHsv() != mColorWheel->color() )
-    {
-        mColorWheel->setColor(newColor);
-        mColorInspector->setColor(newColor);
-
-        emit colorChanged(newColor);
-    }
+    mColorLoaded = false;
+    mColorWheel->setColor(color);
 }
 
-void ColorBox::onSpinboxChange(const QColor& color)
+void ColorBox::setColor(const QColor& newColor)
 {
-    if ( mColorWheel->color() != color.toHsv() )
+    if (!mColorLoaded) { return; }
+
+    if ( newColor != mColorWheel->color() )
     {
-        mColorWheel->setColor(color);
-        emit colorChanged(color);
+        mColorWheel->setColor(newColor);
     }
 }
 
 void ColorBox::onWheelMove(const QColor& color)
 {
-    if ( mColorInspector->color() != color )
-    {
-        mColorInspector->setColor(color);
-    }
+    emit colorChanged(color);
 }
 
 void ColorBox::onWheelRelease(const QColor& color)
 {
-     mColorInspector->setColor(color);
      emit colorChanged(color);
 }
diff --git a/app/src/colorbox.h b/app/src/colorbox.h
@@ -19,8 +19,6 @@ GNU General Public License for more details.
 #include "basedockwidget.h"
 
 class ColorWheel;
-class ColorInspector;
-
 
 class ColorBox : public BaseDockWidget
 {
@@ -35,17 +33,19 @@ class ColorBox : public BaseDockWidget
 
     QColor color();
     void setColor(const QColor&);
+    void loadColor(const QColor&);
 
 Q_SIGNALS:
     void colorChanged(const QColor&);
 
 private:
-    void onSpinboxChange(const QColor&);
     void onWheelMove(const QColor&);
     void onWheelRelease(const QColor&);
 
     ColorWheel* mColorWheel = nullptr;
-    ColorInspector* mColorInspector = nullptr;
+
+    bool mColorLoaded = false;
+//    ColorInspector* mColorInspector = nullptr;
 };
 
 #endif // COLORBOX_H