From 2a55452922ef2c4b582ebfa58b827cb8666de298 Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Fri, 19 May 2017 21:08:05 +0200
Subject: [PATCH] Add a cool color picker to the project

---
 Qt-Color-Widgets         |  1 +
 config/uicoloreditor.cpp |  5 +++++
 config/uicoloreditor.h   | 16 ++++++++++++++++
 controller.cpp           |  2 +-
 flameshot.pro            |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 160000 Qt-Color-Widgets
 create mode 100644 config/uicoloreditor.cpp
 create mode 100644 config/uicoloreditor.h

diff --git a/Qt-Color-Widgets b/Qt-Color-Widgets
new file mode 160000
index 00000000..eb6da62d
--- /dev/null
+++ b/Qt-Color-Widgets
@@ -0,0 +1 @@
+Subproject commit eb6da62d65c75f40437ed4964a8d4a18850f4d7f
diff --git a/config/uicoloreditor.cpp b/config/uicoloreditor.cpp
new file mode 100644
index 00000000..76ffab0b
--- /dev/null
+++ b/config/uicoloreditor.cpp
@@ -0,0 +1,5 @@
+#include "uicoloreditor.h"
+
+UIcolorEditor::UIcolorEditor(QWidget *parent) : QWidget(parent) {
+
+}
diff --git a/config/uicoloreditor.h b/config/uicoloreditor.h
new file mode 100644
index 00000000..52a5062c
--- /dev/null
+++ b/config/uicoloreditor.h
@@ -0,0 +1,16 @@
+#ifndef UICOLOREDITOR_H
+#define UICOLOREDITOR_H
+
+#include <QWidget>
+
+class UIcolorEditor : public QWidget {
+    Q_OBJECT
+public:
+    explicit UIcolorEditor(QWidget *parent = 0);
+
+signals:
+
+public slots:
+};
+
+#endif // UICOLOREDITOR_H
diff --git a/controller.cpp b/controller.cpp
index 96e3bd4b..bbade028 100644
--- a/controller.cpp
+++ b/controller.cpp
@@ -18,7 +18,7 @@
 #include "controller.h"
 #include "capture/capturewidget.h"
 #include "infowindow.h"
-#include "configwindow.h"
+#include "config/configwindow.h"
 #include "capture/button.h"
 #include <QAction>
 #include <QApplication>
diff --git a/flameshot.pro b/flameshot.pro
index 4159984d..71f36322 100644
--- a/flameshot.pro
+++ b/flameshot.pro
@@ -28,6 +28,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 include(singleapplication/singleapplication.pri)
+include(Qt-Color-Widgets//color_widgets.pri)
 
 DEFINES += QAPPLICATION_CLASS=QApplication