Moved configuration to the same library as the decoration plugin

added kcmodule keyword
removed unnecessary code

windec/kdecoration2/CMakeLists.txt

@@ -1,5 +1,6 @@
 find_package(KDecoration2 REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS CoreAddons ConfigWidgets)
+find_package(Qt5 CONFIG REQUIRED COMPONENTS DBus )
 
 
 set(breezedecoration_SRCS
@@ -7,24 +8,34 @@ set(breezedecoration_SRCS
     breezebutton.cpp
     breezedecoration.cpp
     breezeimageprovider.cpp
+    config/breezeconfig.cpp
+    config/breezeconfigwidget.cpp
 )
 
 kconfig_add_kcfg_files(breezedecoration_SRCS breezesettings.kcfgc)
 
-add_library(breezedecoration MODULE ${breezedecoration_SRCS})
+set(breezedecoration_PART_FORMS
+   config/ui/breezeconfigurationui.ui
+)
+
+ki18n_wrap_ui(breezedecoration_PART_FORMS_HEADERS ${breezedecoration_PART_FORMS})
+
+add_library(breezedecoration MODULE
+    ${breezedecoration_SRCS}
+    ${breezedecoration_PART_FORMS_HEADERS})
 
 target_link_libraries(breezedecoration
     PUBLIC
         Qt5::Core
         Qt5::Gui
+        Qt5::DBus
     PRIVATE
         KDecoration2::KDecoration
         KF5::ConfigCore
         KF5::CoreAddons
         KF5::ConfigWidgets
         KF5::GuiAddons
+        KF5::I18n
 )
 
 install(TARGETS breezedecoration DESTINATION ${PLUGIN_INSTALL_DIR}/org.kde.kdecoration2)
-
-add_subdirectory(config)

windec/kdecoration2/breeze.json

@@ -7,6 +7,7 @@
         "org.kde.kdecoration2"
     ],
     "org.kde.kdecoration2": {
-        "blur": false
+        "blur": false,
+        "kcmodule": true
     }
 }

windec/kdecoration2/breezedecoration.cpp

@@ -21,6 +21,7 @@
 #include "breezedecoration.h"
 
 #include "breeze.h"
+#include "config/breezeconfig.h"
 
 #include "breezebutton.h"
 #include <KDecoration2/DecoratedClient>
@@ -41,6 +42,7 @@ K_PLUGIN_FACTORY_WITH_JSON(
     "breeze.json",
     registerPlugin<Breeze::Decoration>();
     registerPlugin<Breeze::Button>(QStringLiteral("button"));
+    registerPlugin<Breeze::ConfigurationModule>(QStringLiteral("kcmodule"));
 )
 
 namespace Breeze

windec/kdecoration2/config/breezeconfig.cpp

@@ -28,7 +28,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "breezeconfig.h"
-#include "../breezesettings.h"
+#include "breezesettings.h"
 
 #include <QTextStream>
 #include <QDBusConnection>
@@ -49,12 +49,6 @@ extern "C"
     { return ( new Breeze::Config( parent ) ); }
 }
 
-/** this is the new style/KF5 plugin declaration, used internally by KWin */
-K_PLUGIN_FACTORY_WITH_JSON(
-    BreezeConfigPlugin,
-    "config.json",
-    registerPlugin<Breeze::ConfigurationModule>(QStringLiteral("kcmodule"));
-)
 #include "breezeconfig.moc"
 
 namespace Breeze

windec/kdecoration2/config/breezeconfigwidget.h

@@ -26,7 +26,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "ui_breezeconfigurationui.h"
-#include "../breezesettings.h"
+#include "breezesettings.h"
 
 #include <QWidget>
 #include <QSharedPointer>

windec/kdecoration2/config/config.json

@@ -1,3 +0,0 @@
-{
-    "X-KDE-PluginInfo-Name": "org.kde.breeze"
-}