refactor qml plugin

* Port to ecm_add_qml_module
* Use declarative type registration
* Update URI
* Remove redundant creation DayNight object in settings page

Author: luisbocanegra

package/contents/ui/DayNightCycleController.qml

@@ -50,9 +50,9 @@ Item {
         if (component.status === Component.Ready) {
             dayNightPlugin = component.createObject(root);
             dayNightPlugin.initialState = root.darkLightScheduleState;
-            dayNightPlugin.stateChanged.connect(() => {
-                if (root.darkLightScheduleState != dayNightPlugin.state) {
-                    root.darkLightScheduleState = dayNightPlugin.state;
+            dayNightPlugin.scheduleStateChanged.connect(() => {
+                if (root.darkLightScheduleState != dayNightPlugin.scheduleState) {
+                    root.darkLightScheduleState = dayNightPlugin.scheduleState;
                 }
             });
         } else {

package/contents/ui/DayNightCyclePlugin.qml

@@ -1,9 +1,9 @@
 import QtQuick
-import com.github.luisbocanegra.svwr.nighttime 1.0
+import com.github.luisbocanegra.svwr 1.0
 
 Item {
     readonly property alias phase: dayNight.phase
-    readonly property alias state: dayNight.state
+    readonly property alias scheduleState: dayNight.state
     property alias initialState: dayNight.initialState
     DayNight {
         id: dayNight

package/contents/ui/config.qml

@@ -85,7 +85,6 @@ ColumnLayout {
     property alias cfg_MuteMode: muteModeCombo.currentValue
     property int editingIndex: -1
     property var validDropExtensions: [".mp4", ".mpg", ".ogg", ".mov", ".webm", ".flv", ".mkv", ".avi", ".wmv", ".gif"]
-    property var dayNightPlugin: null
     property bool showCustomTimeControls: false
     property string cfg_DarkLightScheduleState
 
@@ -247,11 +246,6 @@ ColumnLayout {
     Component.onCompleted: {
         videosModel.initModel(cfg_VideoUrls);
         getAudioDevicesModel();
-        try {
-            dayNightPlugin = Qt.createQmlObject("import com.github.luisbocanegra.svwr.nighttime 1.0; DayNight {}", root);
-        } catch (e) {
-            console.warn("QML Plugin com.github.luisbocanegra.svwr.nighttime not found, will use fixed times");
-        }
     }
 
     Kirigami.FormLayout {
@@ -453,7 +447,7 @@ ColumnLayout {
             }
             Button {
                 visible: root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle
-                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime") && root.dayNightPlugin !== null
+                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime") && dayNightCycleController.dayNightPlugin !== null
                 text: i18ndc("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "@action:button Configure day-night cycle times", "Configure…")
                 icon.name: "configure"
                 onClicked: KCM.KCMLauncher.open("kcm_nighttime")
@@ -471,7 +465,7 @@ ColumnLayout {
         }
         Label {
             id: dayNightCyclePluginWarning
-            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle && root.dayNightPlugin === null
+            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle && dayNightCycleController.dayNightPlugin === null
             color: Kirigami.Theme.negativeTextColor
             text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "⚠ The C++ plugin is not available, this feature will not work. Switch to the Smart Video Wallpaper Reborn package for your distribution if available, or build the plugin from source. See <a href='%1'>install instructions</a>.", "https://github.com/luisbocanegra/plasma-smart-video-wallpaper-reborn#installing")
             wrapMode: Label.WordWrap

plugin/CMakeLists.txt

@@ -1,17 +1,29 @@
-set(PLUGIN_NAME "nighttimeplugin")
-set(LIB_NAME "nighttime")
-
-add_library(${PLUGIN_NAME} SHARED ${PLUGIN_NAME}.cpp ${LIB_NAME}.cpp)
-find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Qml Gui)
+include(ECMQmlModule)
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Qml)
 find_package(KNightTime ${PROJECT_DEP_VERSION} CONFIG REQUIRED)
 find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS KCMUtils)
 
-target_link_libraries(${PLUGIN_NAME}
+set(daynight_SRCS
+    daynight.cpp daynight.h
+)
+
+add_library(plasma_wallpaper_svw_static STATIC ${daynight_SRCS})
+set_property(TARGET plasma_wallpaper_svw_static PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+target_link_libraries(plasma_wallpaper_svw_static
     Qt6::Qml
-    Qt6::Gui
     KF6::KCMUtils
     KNightTime
 )
 
-install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/com/github/luisbocanegra/svwr/${LIB_NAME})
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/com/github/luisbocanegra/svwr/${LIB_NAME})
+ecm_add_qml_module(plasma_wallpaper_svw URI "com.github.luisbocanegra.svwr" VERSION 1.0 CLASS_NAME DayNight)
+
+qt_generate_foreign_qml_types(plasma_wallpaper_svw_static plasma_wallpaper_svw)
+
+target_sources(plasma_wallpaper_svw PRIVATE smartvideowallpaperplugin.cpp)
+
+target_link_libraries(plasma_wallpaper_svw PRIVATE
+    plasma_wallpaper_svw_static
+)
+
+ecm_finalize_qml_module(plasma_wallpaper_svw)

plugin/nighttime.cpp plugin/daynight.cppplugin/nighttime.cpp renamed to plugin/daynight.cpp

@@ -5,7 +5,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "nighttime.h"
+#include "daynight.h"
 
 DayNightPhase::DayNightPhase()
     : m_kind(Night)

plugin/nighttime.h plugin/daynight.hplugin/nighttime.h renamed to plugin/daynight.h

@@ -5,8 +5,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#ifndef NIGHTTIME_H
-#define NIGHTTIME_H
+#ifndef DAYNIGHT_H
+#define DAYNIGHT_H
 
 #pragma once
 #include <KDarkLightScheduleProvider>

plugin/nighttimeplugin.cpp

@@ -0,0 +1,11 @@
+#include <QQmlEngine>
+#include <QQmlExtensionPlugin>
+#include <qqmlextensionplugin.h>
+
+class DayNightPlugin : public QQmlEngineExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+};
+
+#include "smartvideowallpaperplugin.moc"