folio: Port to plasma_add_applet

Use plasma_add_applet to deploy as a module: https://invent.kde.org/plasma/libplasma/-/merge_requests/1116

containments/homescreens/folio/CMakeLists.txt

@@ -3,42 +3,84 @@
 
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.mobile.homescreen.folio\")
 
-set(homescreen_SRCS
+plasma_add_applet(org.kde.plasma.mobile.homescreen.folio
-    homescreen.cpp
+    QML_SOURCES
-    applicationlistmodel.cpp
+        qml/AppDrawer.qml
-    homescreenstate.cpp
+        qml/AppDrawerGrid.qml
-    windowlistener.cpp
+        qml/AppDrawerHeader.qml
-    favouritesmodel.cpp
+        qml/DelegateDragItem.qml
-    folioapplication.cpp
+        qml/FavouritesBar.qml
-    folioapplicationfolder.cpp
+        qml/FolderView.qml
-    foliodelegate.cpp
+        qml/FolderViewTitle.qml
-    foliosettings.cpp
+        qml/FolioHomeScreen.qml
-    foliowidget.cpp
+        qml/HomeScreenPage.qml
-    pagemodel.cpp
+        qml/HomeScreenPages.qml
-    pagelistmodel.cpp
+        qml/main.qml
-    delegatetoucharea.cpp
+        qml/PlaceholderDelegate.qml
-    dragstate.cpp
+        qml/WidgetDragItem.qml
-    widgetcontainer.cpp
+    CPP_SOURCES
-    widgetsmanager.cpp
+        applicationlistmodel.cpp
+        delegatetoucharea.cpp
+        dragstate.cpp
+        favouritesmodel.cpp
+        folioapplication.cpp
+        folioapplicationfolder.cpp
+        foliodelegate.cpp
+        foliosettings.cpp
+        foliowidget.cpp
+        homescreen.cpp
+        homescreenstate.cpp
+        pagelistmodel.cpp
+        pagemodel.cpp
+        widgetcontainer.cpp
+        widgetsmanager.cpp
+        windowlistener.cpp
 )
 
-add_library(org.kde.plasma.mobile.homescreen.folio MODULE ${homescreen_SRCS})
+ecm_target_qml_sources(org.kde.plasma.mobile.homescreen.folio SOURCES
-
+    qml/delegate/AbstractDelegate.qml
-target_link_libraries(org.kde.plasma.mobile.homescreen.folio
+    qml/delegate/AppDelegate.qml
-                      Qt::Gui
+    qml/delegate/AppFolderDelegate.qml
-                      Qt::Qml
+    qml/delegate/DelegateAppIcon.qml
-                      Qt::Quick
+    qml/delegate/DelegateFolderIcon.qml
-                      Plasma::Plasma
+    qml/delegate/DelegateIconLoader.qml
-                      Plasma::PlasmaQuick
+    qml/delegate/DelegateLabel.qml
-                      KF6::I18n
+    qml/delegate/DelegateShadow.qml
-                      KF6::Service
+    qml/delegate/KeyboardHighlight.qml
-                      KF6::KIOGui
+    qml/delegate/WidgetDelegate.qml
-                      KF6::Notifications
+    qml/delegate/WidgetDelegateConfig.qml
-                      Plasma::KWaylandClient
+    PATH delegate
-                      KF6::WindowSystem
-                      KF6::JobWidgets
 )
 
-install(TARGETS org.kde.plasma.mobile.homescreen.folio DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
+ecm_target_qml_sources(org.kde.plasma.mobile.homescreen.folio SOURCES
+    qml/private/ConfirmDeleteFolderDialogLoader.qml
+    qml/private/ContextMenuLoader.qml
+    qml/private/DarkenEffect.qml
+    qml/private/Orientation.qml
+    qml/private/WidgetHandlePosition.qml
+    qml/private/WidgetResizeHandle.qml
+    qml/private/WidgetResizeHandleFrame.qml
+    PATH private
+)
 
-plasma_install_package(package org.kde.plasma.mobile.homescreen.folio)
+ecm_target_qml_sources(org.kde.plasma.mobile.homescreen.folio SOURCES
+    qml/settings/AppletListViewer.qml
+    qml/settings/SettingsComponent.qml
+    qml/settings/SettingsWindow.qml
+    PATH settings
+)
+
+target_link_libraries(org.kde.plasma.mobile.homescreen.folio PRIVATE
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+    Plasma::Plasma
+    Plasma::PlasmaQuick
+    KF6::I18n
+    KF6::Service
+    KF6::KIOGui
+    KF6::Notifications
+    Plasma::KWaylandClient
+    KF6::WindowSystem
+    KF6::JobWidgets
+)

containments/homescreens/folio/applicationlistmodel.h

@@ -24,6 +24,8 @@ class FolioDelegate;
 class ApplicationListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {
@@ -59,6 +61,8 @@ protected:
 class ApplicationListSearchModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     ApplicationListSearchModel(HomeScreen *parent = nullptr, ApplicationListModel *model = nullptr);

containments/homescreens/folio/delegatetoucharea.h

@@ -16,6 +16,7 @@
 class DelegateTouchArea : public QQuickItem
 {
     Q_OBJECT
+    QML_ELEMENT
 
     Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged FINAL)
     Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged FINAL)

containments/homescreens/folio/dragstate.h

@@ -17,6 +17,9 @@ class HomeScreenState;
 class DelegateDragPosition : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(DelegateDragPosition::Location location READ location NOTIFY locationChanged)
     Q_PROPERTY(int page READ page NOTIFY pageChanged)
     Q_PROPERTY(int pageRow READ pageRow NOTIFY pageRowChanged)

containments/homescreens/folio/favouritesmodel.h

@@ -27,6 +27,8 @@ struct FavouritesDelegate {
 class FavouritesModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {

containments/homescreens/folio/folioapplication.h

@@ -26,6 +26,9 @@ class HomeScreen;
 class FolioApplication : public QObject, public std::enable_shared_from_this<FolioApplication>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(bool running READ running NOTIFY windowChanged)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)

containments/homescreens/folio/folioapplicationfolder.h

@@ -31,6 +31,9 @@ class FolioApplication;
 class FolioApplicationFolder : public QObject, public std::enable_shared_from_this<FolioApplicationFolder>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QList<FolioApplication *> appPreviews READ appPreviews NOTIFY applicationsChanged)
     Q_PROPERTY(ApplicationFolderModel *applications READ applications NOTIFY applicationsReset)

containments/homescreens/folio/foliodelegate.h

@@ -18,6 +18,9 @@ class FolioWidget;
 class FolioDelegate : public QObject, public std::enable_shared_from_this<FolioDelegate>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(FolioDelegate::Type type READ type CONSTANT)
     Q_PROPERTY(FolioApplication *application READ applicationRaw CONSTANT)
     Q_PROPERTY(FolioApplicationFolder *folder READ folderRaw CONSTANT)
@@ -64,9 +67,11 @@ protected:
 class FolioPageDelegate : public FolioDelegate
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int row READ row NOTIFY rowChanged)
     Q_PROPERTY(int column READ column NOTIFY columnChanged)
-    QML_UNCREATABLE("")
 
 public:
     typedef std::shared_ptr<FolioPageDelegate> Ptr;

containments/homescreens/folio/foliosettings.h

@@ -14,6 +14,9 @@ class HomeScreen;
 class FolioSettings : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int homeScreenRows READ homeScreenRows WRITE setHomeScreenRows NOTIFY homeScreenRowsChanged)
     Q_PROPERTY(int homeScreenColumns READ homeScreenColumns WRITE setHomeScreenColumns NOTIFY homeScreenColumnsChanged)
     Q_PROPERTY(bool showPagesAppLabels READ showPagesAppLabels WRITE setShowPagesAppLabels NOTIFY showPagesAppLabelsChanged)

containments/homescreens/folio/foliowidget.h

@@ -25,6 +25,9 @@ public:
 class FolioWidget : public QObject, public std::enable_shared_from_this<FolioWidget>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int id READ id NOTIFY idChanged)
     Q_PROPERTY(int gridWidth READ gridWidth NOTIFY gridWidthChanged)
     Q_PROPERTY(int gridHeight READ gridHeight NOTIFY gridHeightChanged)

containments/homescreens/folio/homescreen.cpp

@@ -11,6 +11,8 @@
 #include <QQmlExtensionPlugin>
 #include <QQuickItem>
 
+K_PLUGIN_CLASS_WITH_JSON(HomeScreen, "metadata.json")
+
 HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
     : Plasma::Containment{parent, data, args}
     , m_folioSettings{new FolioSettings{this}}
@@ -24,24 +26,6 @@ HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVari
     // HomeScreenState init() has dependencies on other objects
     m_homeScreenState->init();
 
-    const char *uri = "org.kde.private.mobile.homescreen.folio";
-    qmlRegisterUncreatableType<HomeScreen>(uri, 1, 0, "HomeScreen", "");
-    qmlRegisterUncreatableType<ApplicationListModel>(uri, 1, 0, "ApplicationListModel", "");
-    qmlRegisterUncreatableType<ApplicationListSearchModel>(uri, 1, 0, "ApplicationListSearchModel", "");
-    qmlRegisterUncreatableType<FavouritesModel>(uri, 1, 0, "FavouritesModel", "");
-    qmlRegisterUncreatableType<PageListModel>(uri, 1, 0, "PageListModel", "");
-    qmlRegisterUncreatableType<FolioSettings>(uri, 1, 0, "FolioSettings", "");
-    qmlRegisterUncreatableType<HomeScreenState>(uri, 1, 0, "HomeScreenState", "");
-    qmlRegisterUncreatableType<FolioApplication>(uri, 1, 0, "FolioApplication", "");
-    qmlRegisterUncreatableType<FolioApplicationFolder>(uri, 1, 0, "FolioApplicationFolder", "");
-    qmlRegisterUncreatableType<FolioWidget>(uri, 1, 0, "FolioWidget", "");
-    qmlRegisterUncreatableType<FolioDelegate>(uri, 1, 0, "FolioDelegate", "");
-    qmlRegisterUncreatableType<PageModel>(uri, 1, 0, "PageModel", "");
-    qmlRegisterUncreatableType<FolioPageDelegate>(uri, 1, 0, "FolioPageDelegate", "");
-    qmlRegisterType<DelegateTouchArea>(uri, 1, 0, "DelegateTouchArea");
-    qmlRegisterUncreatableType<DelegateDragPosition>(uri, 1, 0, "DelegateDragPosition", "");
-    qmlRegisterType<WidgetContainer>(uri, 1, 0, "WidgetContainer");
-
     setHasConfigurationInterface(true);
 
     connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &HomeScreen::showingDesktopChanged);
@@ -103,6 +87,4 @@ PageListModel *HomeScreen::pageListModel()
     return m_pageListModel;
 }
 
-K_PLUGIN_CLASS(HomeScreen)
-
 #include "homescreen.moc"

containments/homescreens/folio/homescreen.h

@@ -32,6 +32,8 @@ class ApplicationListSearchModel;
 class HomeScreen : public Plasma::Containment
 {
     Q_OBJECT
+    QML_ELEMENT
+
     Q_PROPERTY(FolioSettings *FolioSettings READ folioSettings CONSTANT)
     Q_PROPERTY(HomeScreenState *HomeScreenState READ homeScreenState CONSTANT)
     Q_PROPERTY(WidgetsManager *WidgetsManager READ widgetsManager CONSTANT)

containments/homescreens/folio/homescreenstate.h

@@ -24,6 +24,9 @@ class HomeScreen;
 class HomeScreenState : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(HomeScreenState::SwipeState swipeState READ swipeState NOTIFY swipeStateChanged)
     Q_PROPERTY(HomeScreenState::ViewState viewState READ viewState NOTIFY viewStateChanged)
     Q_PROPERTY(DragState *dragState READ dragState CONSTANT)

containments/homescreens/folio/metadata.json

@@ -1,5 +1,4 @@
 {
-    "KPackageStructure": "Plasma/Applet",
     "KPlugin": {
         "Authors": [
             {
@@ -83,7 +82,6 @@
         "Description[x-test]": "xxMobile homescreen with a focus on customizability.xx",
         "Description[zh_CN]": "高可定制性的手机主屏幕方案。",
         "Description[zh_TW]": "注重可自訂性的手機主畫面。",
-        "Id": "org.kde.plasma.mobile.homescreen.folio",
         "License": "GPLv2+",
         "Name": "Folio",
         "Name[ar]": "مطوية",

containments/homescreens/folio/pagelistmodel.h

@@ -17,6 +17,9 @@ class PageModel;
 class PageListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int length READ length NOTIFY lengthChanged)
 
 public:

containments/homescreens/folio/pagemodel.h

@@ -20,6 +20,8 @@ class FolioPageDelegate;
 class PageModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {

containments/homescreens/folio/qml/AppDrawer.qml

@@ -10,7 +10,7 @@ import org.kde.plasma.components 3.0 as PC3
 import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import 'private'
 

containments/homescreens/folio/qml/AppDrawerGrid.qml

@@ -11,7 +11,7 @@ import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.private.mobileshell.state as MobileShellState
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import "./delegate"
 

containments/homescreens/folio/qml/AppDrawerHeader.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.components 3.0 as PlasmaComponents
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import './delegate'
 
 Item {

containments/homescreens/folio/qml/DelegateDragItem.qml

@@ -5,7 +5,7 @@ import QtQuick
 import QtQuick.Layouts
 
 import org.kde.kirigami 2.20 as Kirigami
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 
 import "./delegate"

containments/homescreens/folio/qml/FavouritesBar.qml

@@ -7,7 +7,7 @@ import QtQuick.Layouts 1.1
 
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell.state as MobileShellState
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.kirigami 2.10 as Kirigami
 

containments/homescreens/folio/qml/FolderView.qml

@@ -9,7 +9,7 @@ import QtQuick.Controls as QQC2
 import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import "./private"
 import "./delegate"

containments/homescreens/folio/qml/FolderViewTitle.qml

@@ -9,7 +9,7 @@ import QtQuick.Controls as QQC2
 import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 MobileShell.BaseItem {
     id: root

containments/homescreens/folio/qml/FolioHomeScreen.qml

@@ -12,7 +12,7 @@ import org.kde.kirigami 2.20 as Kirigami
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import "./delegate"
 import "./settings"

containments/homescreens/folio/qml/HomeScreenPage.qml

@@ -9,7 +9,7 @@ import QtQuick.Effects
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell.state as MobileShellState
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigami as Kirigami
 
 import "./delegate"

containments/homescreens/folio/qml/HomeScreenPages.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.kirigami 2.10 as Kirigami
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 MouseArea {
     id: root

containments/homescreens/folio/qml/PlaceholderDelegate.qml

@@ -4,7 +4,7 @@
 import QtQuick
 import QtQuick.Layouts
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigami 2.10 as Kirigami
 
 import "./delegate"

containments/homescreens/folio/qml/WidgetDragItem.qml

@@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import './delegate'
 import './private'

containments/homescreens/folio/qml/delegate/AbstractDelegate.qml

@@ -11,7 +11,7 @@ import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.kquickcontrolsaddons 2.0
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
 import org.kde.plasma.private.mobileshell as MobileShell
 

containments/homescreens/folio/qml/delegate/AppDelegate.qml

@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell.state as MobileShellState
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.plasmoid

containments/homescreens/folio/qml/delegate/AppFolderDelegate.qml

@@ -6,7 +6,7 @@ import QtQuick.Layouts
 import QtQuick.Controls as Controls
 import QtQuick.Effects
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 AbstractDelegate {
     id: root

containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml

@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 Kirigami.Icon {
     id: root

containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml

@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 
 Item {

containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml

@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 
 Loader {

containments/homescreens/folio/qml/delegate/DelegateLabel.qml

@@ -7,7 +7,7 @@ import QtQuick.Layouts
 import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 PC3.Label {
     id: label

containments/homescreens/folio/qml/delegate/WidgetDelegate.qml

@@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../private'
 

containments/homescreens/folio/qml/delegate/WidgetDelegateConfig.qml

@@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../private'
 

containments/homescreens/folio/qml/main.qml

@@ -14,10 +14,11 @@ import org.kde.plasma.components 3.0 as PlasmaComponents
 
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.private.mobileshell.state as MobileShellState
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
 import org.kde.plasma.private.mobileshell.windowplugin as WindowPlugin
 import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
 
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
+
 import "./private"
 
 ContainmentItem {
@@ -155,7 +156,7 @@ ContainmentItem {
         contentItem: Item {
 
             // homescreen component
-            HomeScreen {
+            FolioHomeScreen {
                 id: folioHomeScreen
                 folio: root.folio
                 maskManager: root.maskManager

containments/homescreens/folio/qml/private/WidgetResizeHandleFrame.qml

@@ -7,7 +7,7 @@ import QtQuick.Controls as QQC2
 import Qt5Compat.GraphicalEffects
 
 import org.kde.kirigami as Kirigami
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../delegate'
 

containments/homescreens/folio/qml/settings/AppletListViewer.qml

@@ -11,7 +11,7 @@ import org.kde.kirigami as Kirigami
 import org.kde.plasma.plasmoid
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.private.shell 2.0
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell

containments/homescreens/folio/qml/settings/SettingsComponent.qml

@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../delegate'
 

containments/homescreens/folio/qml/settings/SettingsWindow.qml

@@ -9,7 +9,7 @@ import QtQuick.Controls as QQC2
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 
 import '../delegate'

containments/homescreens/folio/widgetcontainer.h

@@ -10,9 +10,9 @@
 class WidgetContainer : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(bool editMode READ editMode WRITE setEditMode NOTIFY editModeChanged)
+    QML_ELEMENT
 
-    QML_NAMED_ELEMENT(WidgetContainer)
+    Q_PROPERTY(bool editMode READ editMode WRITE setEditMode NOTIFY editModeChanged)
 
 public:
     WidgetContainer(QQuickItem *parent = nullptr);