diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index d690187c1..a7be8cb70 100644 --- a/app/CMakeLists.txt +++ b/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 ) diff --git a/app/dock/dockconfigview.cpp b/app/dock/dockconfigview.cpp index de5d68ff1..19c10a29d 100644 --- a/app/dock/dockconfigview.cpp +++ b/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 #include diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp index cc291ea8c..1f44861d8 100644 --- a/app/dock/dockview.cpp +++ b/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 diff --git a/app/dock/positioner.cpp b/app/dock/positioner.cpp index 05c5cc078..d775a4ffa 100644 --- a/app/dock/positioner.cpp +++ b/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 diff --git a/app/dock/screenedgeghostwindow.cpp b/app/dock/screenedgeghostwindow.cpp index b4f3d1c47..de4f466e3 100644 --- a/app/dock/screenedgeghostwindow.cpp +++ b/app/dock/screenedgeghostwindow.cpp @@ -18,8 +18,8 @@ */ #include "screenedgeghostwindow.h" -#include "../dockcorona.h" #include "dockview.h" +#include "../dockcorona.h" #include #include diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp index 960d3d134..56a981be2 100644 --- a/app/dockcorona.cpp +++ b/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" diff --git a/app/globalshortcuts.cpp b/app/globalshortcuts.cpp index f118865d7..19321577e 100644 --- a/app/globalshortcuts.cpp +++ b/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 #include diff --git a/app/importer.cpp b/app/importer.cpp index 9ea82d087..a5d1d11d0 100644 --- a/app/importer.cpp +++ b/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 diff --git a/app/layout.cpp b/app/layout.cpp index ba80426a5..46761cd34 100644 --- a/app/layout.cpp +++ b/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 #include diff --git a/app/layoutmanager.cpp b/app/layoutmanager.cpp index a633ef4a0..2f6da58ae 100644 --- a/app/layoutmanager.cpp +++ b/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 #include diff --git a/app/layoutmanager.h b/app/layoutmanager.h index 85d79ca81..5b0311d92 100644 --- a/app/layoutmanager.h +++ b/app/layoutmanager.h @@ -22,7 +22,7 @@ #define LAYOUTMANAGER_H #include "launcherssignals.h" -#include "settingsdialog.h" +#include "settings/settingsdialog.h" #include #include diff --git a/app/layoutsDelegates/activitycmbboxdelegate.cpp b/app/settings/delegates/activitycmbboxdelegate.cpp similarity index 100% rename from app/layoutsDelegates/activitycmbboxdelegate.cpp rename to app/settings/delegates/activitycmbboxdelegate.cpp diff --git a/app/layoutsDelegates/activitycmbboxdelegate.h b/app/settings/delegates/activitycmbboxdelegate.h similarity index 100% rename from app/layoutsDelegates/activitycmbboxdelegate.h rename to app/settings/delegates/activitycmbboxdelegate.h diff --git a/app/layoutsDelegates/checkboxdelegate.cpp b/app/settings/delegates/checkboxdelegate.cpp similarity index 100% rename from app/layoutsDelegates/checkboxdelegate.cpp rename to app/settings/delegates/checkboxdelegate.cpp diff --git a/app/layoutsDelegates/checkboxdelegate.h b/app/settings/delegates/checkboxdelegate.h similarity index 100% rename from app/layoutsDelegates/checkboxdelegate.h rename to app/settings/delegates/checkboxdelegate.h diff --git a/app/layoutsDelegates/colorcmbboxdelegate.cpp b/app/settings/delegates/colorcmbboxdelegate.cpp similarity index 100% rename from app/layoutsDelegates/colorcmbboxdelegate.cpp rename to app/settings/delegates/colorcmbboxdelegate.cpp diff --git a/app/layoutsDelegates/colorcmbboxdelegate.h b/app/settings/delegates/colorcmbboxdelegate.h similarity index 100% rename from app/layoutsDelegates/colorcmbboxdelegate.h rename to app/settings/delegates/colorcmbboxdelegate.h diff --git a/app/layoutsDelegates/colorcmbboxitemdelegate.cpp b/app/settings/delegates/colorcmbboxitemdelegate.cpp similarity index 100% rename from app/layoutsDelegates/colorcmbboxitemdelegate.cpp rename to app/settings/delegates/colorcmbboxitemdelegate.cpp diff --git a/app/layoutsDelegates/colorcmbboxitemdelegate.h b/app/settings/delegates/colorcmbboxitemdelegate.h similarity index 100% rename from app/layoutsDelegates/colorcmbboxitemdelegate.h rename to app/settings/delegates/colorcmbboxitemdelegate.h diff --git a/app/layoutsDelegates/layoutnamedelegate.cpp b/app/settings/delegates/layoutnamedelegate.cpp similarity index 100% rename from app/layoutsDelegates/layoutnamedelegate.cpp rename to app/settings/delegates/layoutnamedelegate.cpp diff --git a/app/layoutsDelegates/layoutnamedelegate.h b/app/settings/delegates/layoutnamedelegate.h similarity index 100% rename from app/layoutsDelegates/layoutnamedelegate.h rename to app/settings/delegates/layoutnamedelegate.h diff --git a/app/settingsdialog.cpp b/app/settings/settingsdialog.cpp similarity index 99% rename from app/settingsdialog.cpp rename to app/settings/settingsdialog.cpp index 648c7e3f5..f5d00e8e5 100644 --- a/app/settingsdialog.cpp +++ b/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 #include diff --git a/app/settingsdialog.h b/app/settings/settingsdialog.h similarity index 100% rename from app/settingsdialog.h rename to app/settings/settingsdialog.h diff --git a/app/settingsdialog.ui b/app/settings/settingsdialog.ui similarity index 100% rename from app/settingsdialog.ui rename to app/settings/settingsdialog.ui diff --git a/app/universalsettings.cpp b/app/settings/universalsettings.cpp similarity index 100% rename from app/universalsettings.cpp rename to app/settings/universalsettings.cpp diff --git a/app/universalsettings.h b/app/settings/universalsettings.h similarity index 100% rename from app/universalsettings.h rename to app/settings/universalsettings.h