From 6fd15753424c44298410ca1a6c13eae5bfb80cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= <ole.andre.rodlie@gmail.com>
Date: Tue, 17 Sep 2024 17:23:48 +0200
Subject: [PATCH] Move 'Fill and Stroke' widget to UI lib

---
 src/app/CMakeLists.txt                           |  2 --
 src/app/GUI/mainwindow.cpp                       |  2 +-
 src/ui/CMakeLists.txt                            |  2 ++
 .../GUI => ui/widgets}/fillstrokesettings.cpp    |  0
 src/{app/GUI => ui/widgets}/fillstrokesettings.h | 16 +++++++---------
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename src/{app/GUI => ui/widgets}/fillstrokesettings.cpp (100%)
 rename src/{app/GUI => ui/widgets}/fillstrokesettings.h (95%)

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index f2491e033..4b037c3aa 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -195,7 +195,6 @@ set(
     GUI/graphboxeslist.cpp
     GUI/keysview.cpp
     GUI/mainwindow.cpp
-    GUI/fillstrokesettings.cpp
     GUI/toolbox.cpp
     GUI/extraactions.cpp
     GUI/effectactions.cpp
@@ -242,7 +241,6 @@ set(
     GUI/RenderWidgets/outputsettingsdisplaywidget.h
     GUI/animationdockwidget.h
     GUI/canvaswindow.h
-    GUI/fillstrokesettings.h
     GUI/keysview.h
     GUI/mainwindow.h
     GUI/window.h
diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
index 4a1a874c1..9bcb194db 100644
--- a/src/app/GUI/mainwindow.cpp
+++ b/src/app/GUI/mainwindow.cpp
@@ -52,7 +52,7 @@
 #include "GUI/RenderWidgets/renderwidget.h"
 #include "GUI/global.h"
 #include "filesourcescache.h"
-#include "fillstrokesettings.h"
+#include "widgets/fillstrokesettings.h"
 #include "widgets/editablecombobox.h"
 
 #include "Sound/soundcomposition.h"
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 1909d2c42..28d9b92e3 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -86,6 +86,7 @@ set(
     widgets/ecombobox.cpp
     widgets/editablecombobox.cpp
     widgets/fakemenubar.cpp
+    widgets/fillstrokesettings.cpp
     widgets/flowlayout.cpp
     widgets/fontswidget.cpp
     widgets/framespinbox.cpp
@@ -136,6 +137,7 @@ set(
     widgets/aboutwidget.h
     widgets/actionbutton.h
     widgets/alignwidget.h
+    widgets/fillstrokesettings.h
     widgets/framescrollbar.h
     widgets/assetswidget.h
     widgets/bookmarkedcolors.h
diff --git a/src/app/GUI/fillstrokesettings.cpp b/src/ui/widgets/fillstrokesettings.cpp
similarity index 100%
rename from src/app/GUI/fillstrokesettings.cpp
rename to src/ui/widgets/fillstrokesettings.cpp
diff --git a/src/app/GUI/fillstrokesettings.h b/src/ui/widgets/fillstrokesettings.h
similarity index 95%
rename from src/app/GUI/fillstrokesettings.h
rename to src/ui/widgets/fillstrokesettings.h
index 141c047ac..255b33921 100644
--- a/src/app/GUI/fillstrokesettings.h
+++ b/src/ui/widgets/fillstrokesettings.h
@@ -26,6 +26,8 @@
 #ifndef FILLSTROKESETTINGS_H
 #define FILLSTROKESETTINGS_H
 
+#include "ui_global.h"
+
 #include <QWidget>
 #include <QTabWidget>
 #include <QPushButton>
@@ -39,19 +41,15 @@
 
 #include "Animators/coloranimator.h"
 #include "Animators/paintsettingsanimator.h"
+#include "Private/document.h"
+#include "gradientwidgets/gradientwidget.h"
 #include "paintsettingsapplier.h"
 #include "Animators/brushsettingsanimator.h"
 #include "Paint/brushcontexedwrapper.h"
+#include "widgets/colorsettingswidget.h"
+#include "widgets/qrealanimatorvalueslider.h"
 
-class GradientWidget;
-class ColorSettingsWidget;
-class QrealAnimatorValueSlider;
-class ActionButton;
-class Segment1DEditor;
-class ColorSetting;
-class Document;
-
-class FillStrokeSettingsWidget : public QWidget
+class UI_EXPORT FillStrokeSettingsWidget : public QWidget
 {
     Q_OBJECT
     typedef qCubicSegment1DAnimator::Action SegAction;