REFACTOR:move setting* to relevant folder

app/CMakeLists.txt

@@ -14,9 +14,7 @@ set(lattedock-app_SRCS
     plasmathemeextended.cpp
     schemecolors.cpp
     screenpool.cpp
-    settingsdialog.cpp
     sortedactivitiesmodel.cpp
-    universalsettings.cpp
     waylandinterface.cpp
     windowinfowrap.cpp
     xwindowinterface.cpp
@@ -29,11 +27,13 @@ set(lattedock-app_SRCS
     dock/positioner.cpp
     dock/screenedgeghostwindow.cpp
     dock/visibilitymanager.cpp
-    layoutsDelegates/activitycmbboxdelegate.cpp
-    layoutsDelegates/checkboxdelegate.cpp
-    layoutsDelegates/colorcmbboxdelegate.cpp
-    layoutsDelegates/colorcmbboxitemdelegate.cpp
-    layoutsDelegates/layoutnamedelegate.cpp
+    settings/settingsdialog.cpp
+    settings/universalsettings.cpp
+    settings/delegates/activitycmbboxdelegate.cpp
+    settings/delegates/checkboxdelegate.cpp
+    settings/delegates/colorcmbboxdelegate.cpp
+    settings/delegates/colorcmbboxitemdelegate.cpp
+    settings/delegates/layoutnamedelegate.cpp
     main.cpp
 )
 

app/dock/dockconfigview.cpp

@@ -25,7 +25,7 @@
 #include "../abstractwindowinterface.h"
 #include "../dockcorona.h"
 #include "../layoutmanager.h"
-#include "../universalsettings.h"
+#include "../settings/universalsettings.h"
 
 #include <QFontMetrics>
 #include <QQuickItem>

app/dock/dockview.cpp

@@ -30,7 +30,7 @@
 #include "../layoutmanager.h"
 #include "../screenpool.h"
 #include "../plasmathemeextended.h"
-#include "../universalsettings.h"
+#include "../settings/universalsettings.h"
 #include "../../liblattedock/extras.h"
 
 #include <QAction>

app/dock/positioner.cpp

@@ -23,7 +23,7 @@
 #include "effects.h"
 #include "../dockcorona.h"
 #include "../screenpool.h"
-#include "../universalsettings.h"
+#include "../settings/universalsettings.h"
 #include "../../liblattedock/dock.h"
 
 #include <QDebug>

app/dock/screenedgeghostwindow.cpp

@@ -18,8 +18,8 @@
 */
 
 #include "screenedgeghostwindow.h"
-#include "../dockcorona.h"
 #include "dockview.h"
+#include "../dockcorona.h"
 
 #include <QDebug>
 #include <QSurfaceFormat>

app/dockcorona.cpp

@@ -28,11 +28,11 @@
 #include "layoutmanager.h"
 #include "plasmathemeextended.h"
 #include "screenpool.h"
-#include "universalsettings.h"
 #include "waylandinterface.h"
 #include "xwindowinterface.h"
 #include "dock/dockview.h"
 #include "packageplugins/shell/dockpackage.h"
+#include "settings/universalsettings.h"
 
 //dbus adaptor
 #include "lattedockadaptor.h"

app/globalshortcuts.cpp

@@ -21,8 +21,8 @@
 #include "dockcorona.h"
 #include "globalshortcuts.h"
 #include "layoutmanager.h"
-#include "universalsettings.h"
 #include "dock/dockview.h"
+#include "settings/universalsettings.h"
 
 #include <QAction>
 #include <QDebug>

app/importer.cpp

@@ -24,7 +24,7 @@
 #include "layoutmanager.h"
 #include "layout.h"
 #include "screenpool.h"
-#include "universalsettings.h"
+#include "settings/universalsettings.h"
 #include "../liblattedock/dock.h"
 
 #include <QFile>

app/layout.cpp

@@ -24,9 +24,9 @@
 #include "importer.h"
 #include "layoutmanager.h"
 #include "screenpool.h"
-#include "universalsettings.h"
 #include "dock/dockview.h"
 #include "dock/positioner.h"
+#include "settings/universalsettings.h"
 
 #include <QDir>
 #include <QFile>

app/layoutmanager.cpp

@@ -22,12 +22,12 @@
 
 #include "importer.h"
 #include "infoview.h"
-#include "settingsdialog.h"
 #include "launcherssignals.h"
 #include "layout.h"
 #include "screenpool.h"
-#include "universalsettings.h"
 #include "dock/dockview.h"
+#include "settings/settingsdialog.h"
+#include "settings/universalsettings.h"
 
 #include <QDir>
 #include <QFile>

app/layoutmanager.h

@@ -22,7 +22,7 @@
 #define LAYOUTMANAGER_H
 
 #include "launcherssignals.h"
-#include "settingsdialog.h"
+#include "settings/settingsdialog.h"
 
 #include <QAction>
 #include <QObject>

app/settings/settingsdialog.cpp

@@ -29,10 +29,10 @@
 #include "universalsettings.h"
 #include "ui_settingsdialog.h"
 #include "../liblattedock/dock.h"
-#include "layoutsDelegates/checkboxdelegate.h"
-#include "layoutsDelegates/colorcmbboxdelegate.h"
-#include "layoutsDelegates/activitycmbboxdelegate.h"
-#include "layoutsDelegates/layoutnamedelegate.h"
+#include "delegates/checkboxdelegate.h"
+#include "delegates/colorcmbboxdelegate.h"
+#include "delegates/activitycmbboxdelegate.h"
+#include "delegates/layoutnamedelegate.h"
 
 #include <QButtonGroup>
 #include <QColorDialog>