ay

Almond.pro

@@ -31,6 +31,7 @@ SOURCES += \
         Color.cpp \
         CubicSpline.cpp \
         Gradient.cpp \
+        GradientWidget.cpp \
         MandelVideoGenerator.cpp \
         MandelWidget.cpp \
         VideoStream.cpp \
@@ -45,6 +46,7 @@ HEADERS += \
         Color.h \
         CubicSpline.h \
         Gradient.h \
+        GradientWidget.h \
         MandelVideoGenerator.h \
         MandelWidget.h \
         VideoStream.h \

Almond.ui

@@ -51,7 +51,7 @@
           <item row="0" column="0" colspan="2">
            <widget class="QPushButton" name="chooseGradient">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -84,6 +84,9 @@
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
@@ -118,6 +121,9 @@
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::MinimumExpanding</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>

GradientWidget.cpp

@@ -0,0 +1,6 @@
+#include "GradientWidget.h"
+
+GradientWidget::GradientWidget(QWidget *parent) : QWidget(parent)
+{
+
+}

GradientWidget.h

@@ -0,0 +1,16 @@
+#ifndef GRADIENTWIDGET_H
+#define GRADIENTWIDGET_H
+
+#include <QWidget>
+
+class GradientWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit GradientWidget(QWidget *parent = nullptr);
+
+signals:
+
+};
+
+#endif // GRADIENTWIDGET_H

gradientchoosedialog.cpp

@@ -2,16 +2,8 @@
 
 #include <QFile>
 #include <QResource>
-#include <QDir>
-
-
-//resource hacks
-static const std::string clouds_xml = "";
-
-std::map<std::string, std::string> GradientChooseDialog::presets {
-    { "clouds", clouds_xml }
-};
 
+#include <QColorDialog>
 
 GradientChooseDialog::GradientChooseDialog()
 {

gradientchoosedialog.h

@@ -14,7 +14,6 @@ class GradientChooseDialog : public QDialog
 private:
     Ui::GradientChooser gcd;
     std::unique_ptr<Gradient> chosenGradient = nullptr;
-    static std::map<std::string, std::string> presets;
 public:
     GradientChooseDialog();
 private slots:

gradients/default.xml

@@ -1,15 +1,15 @@
 <gradient repeat="true">
     <color r="0" g="0" b="0" p="0" />
-    <color r="125" g="50" b="15" p="20" />
-    <color r="250" g="70" b="24" p="40" />
-    <color r="200" g="230" b="30" p="80" />
-    <color r="70" g="223" b="30" p="105" />
-    <color r="40" g="190" b="240" p="140" />
-    <color r="120" g="60" b="160" p="230" />
-    <color r="14" g="20" b="180" p="300" />
-    <color r="240" g="240" b="240" p="418" />
-    <color r="243" g="20" b="20" p="558" />
-    <color r="254" g="169" b="63" p="714" />
-    <color r="8" g="50" b="8" p="885" />
-    <color r="0" g="0" b="0" p="950" />
+    <color r="125" g="50" b="15" p="15" />
+    <color r="250" g="70" b="24" p="30" />
+    <color r="200" g="230" b="30" p="60" />
+    <color r="70" g="223" b="30" p="95" />
+    <color r="40" g="190" b="240" p="130" />
+    <color r="120" g="60" b="160" p="190" />
+    <color r="14" g="20" b="180" p="250" />
+    <color r="240" g="240" b="240" p="320" />
+    <color r="243" g="20" b="20" p="400" />
+    <color r="254" g="169" b="63" p="500" />
+    <color r="8" g="50" b="8" p="600" />
+    <color r="0" g="0" b="0" p="700" />
 </gradient>