refactor: Port to QML modules

CMakeLists.txt

@@ -10,6 +10,7 @@ if(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OSX deployment version")
 endif()
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED 20)
 

resources.qrc

@@ -1,64 +1,7 @@
 <RCC>
     <qresource prefix="/qml">
-        <file>src/gui/UserStatusMessageView.qml</file>
-        <file>src/gui/UserStatusSelectorPage.qml</file>
-        <file>src/gui/EmojiPicker.qml</file>
-        <file>src/gui/UserStatusSelectorButton.qml</file>
-        <file>src/gui/UserStatusSetStatusView.qml</file>
-        <file>src/gui/PredefinedStatusButton.qml</file>
-        <file>src/gui/ErrorBox.qml</file>
-        <file>src/gui/filedetails/FileActivityView.qml</file>
-        <file>src/gui/filedetails/FileDetailsPage.qml</file>
-        <file>src/gui/filedetails/FileDetailsView.qml</file>
-        <file>src/gui/filedetails/FileDetailsWindow.qml</file>
-        <file>src/gui/filedetails/FileTag.qml</file>
-        <file>src/gui/filedetails/NCInputDateField.qml</file>
-        <file>src/gui/filedetails/NCInputTextArea.qml</file>
-        <file>src/gui/filedetails/NCInputTextField.qml</file>
-        <file>src/gui/filedetails/NCTabButton.qml</file>
-        <file>src/gui/filedetails/ShareeDelegate.qml</file>
-        <file>src/gui/filedetails/ShareDelegate.qml</file>
-        <file>src/gui/filedetails/ShareDetailsPage.qml</file>
-        <file>src/gui/filedetails/ShareeSearchField.qml</file>
-        <file>src/gui/filedetails/ShareView.qml</file>
-        <file>src/gui/tray/MainWindow.qml</file>
-        <file>src/gui/tray/UserLine.qml</file>
-        <file>src/gui/tray/HeaderButton.qml</file>
-        <file>src/gui/tray/SyncStatus.qml</file>
-        <file>src/gui/tray/ActivityItem.qml</file>
-        <file>src/gui/tray/AutoSizingMenu.qml</file>
-        <file>src/gui/tray/ActivityList.qml</file>
-        <file>src/gui/tray/CurrentAccountHeaderButton.qml</file>
-        <file>src/gui/tray/TrayWindowHeader.qml</file>
-        <file>src/gui/tray/UnifiedSearchInputContainer.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultItem.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultItemSkeleton.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultListItem.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultNothingFound.qml</file>
-        <file>src/gui/tray/UnifiedSearchPlaceholderView.qml</file>
-        <file>src/gui/tray/UnifiedSearchResultSectionItem.qml</file>
-        <file>src/gui/tray/ActivityItemContextMenu.qml</file>
-        <file>src/gui/tray/ActivityItemActions.qml</file>
-        <file>src/gui/tray/ActivityItemContent.qml</file>
-        <file>src/gui/tray/TalkReplyTextField.qml</file>
-        <file>src/gui/tray/CallNotificationDialog.qml</file>
-        <file>src/gui/tray/EditFileLocallyLoadingDialog.qml</file>
-        <file>src/gui/tray/EncryptionTokenDiscoveryDialog.qml</file>
-        <file>src/gui/tray/NCBusyIndicator.qml</file>
-        <file>src/gui/tray/NCIconWithBackgroundImage.qml</file>
-        <file>src/gui/tray/NCProgressBar.qml</file>
-        <file>src/gui/tray/EnforcedPlainTextLabel.qml</file>
         <file>theme/Style/Style.qml</file>
         <file>theme/Style/qmldir</file>
-        <file>src/gui/tray/ListItemLineAndSubline.qml</file>
-        <file>src/gui/tray/TrayFoldersMenuButton.qml</file>
-        <file>src/gui/tray/TrayFolderListItem.qml</file>
-        <file>src/gui/ResolveConflictsDialog.qml</file>
-        <file>src/gui/ConflictDelegate.qml</file>
-        <file>src/gui/ConflictItemFileInfo.qml</file>
         <file>src/gui/macOS/ui/FileProviderSettings.qml</file>
         <file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
     </qresource>

src/3rdparty/kirigami/wheelhandler.h

@@ -5,12 +5,13 @@
 
 #pragma once
 
 #include <QGuiApplication>
 #include <QObject>
 #include <QPoint>
 #include <QQuickItem>
 #include <QStyleHints>
 #include <QtQml>
+#include <qqmlregistration.h>
 
 class QWheelEvent;
 class WheelHandler;
@@ -21,6 +22,7 @@
 class KirigamiWheelEvent : public QObject
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(WheelEvent)
 
     /**
      * x: real

src/gui/CMakeLists.txt

@@ -183,40 +183,7 @@ set(client_SRCS
     emojimodel.cpp
     syncconflictsmodel.h
     syncconflictsmodel.cpp
-    fileactivitylistmodel.h
-    fileactivitylistmodel.cpp
-    filedetails/datefieldbackend.h
-    filedetails/datefieldbackend.cpp
-    filedetails/filedetails.h
-    filedetails/filedetails.cpp
-    filedetails/sharemodel.h
-    filedetails/sharemodel.cpp
-    filedetails/shareemodel.h
-    filedetails/shareemodel.cpp
-    filedetails/sortedsharemodel.h
-    filedetails/sortedsharemodel.cpp
-    tray/svgimageprovider.h
-    tray/svgimageprovider.cpp
-    tray/syncstatussummary.h
-    tray/syncstatussummary.cpp
-    tray/activitydata.h
-    tray/activitydata.cpp
-    tray/activitylistmodel.h
-    tray/activitylistmodel.cpp
-    tray/unifiedsearchresult.h
-    tray/asyncimageresponse.cpp
-    tray/unifiedsearchresult.cpp
-    tray/unifiedsearchresultslistmodel.h
-    tray/trayimageprovider.cpp
-    tray/unifiedsearchresultslistmodel.cpp
-    tray/usermodel.h
-    tray/usermodel.cpp
-    tray/notificationhandler.h
-    tray/notificationhandler.cpp
-    tray/sortedactivitylistmodel.h
-    tray/sortedactivitylistmodel.cpp
     creds/credentialsfactory.h
-    tray/talkreply.cpp
     creds/credentialsfactory.cpp
     creds/httpcredentialsgui.h
     creds/httpcredentialsgui.cpp
@@ -534,26 +501,41 @@ endif()
 
 add_library(nextcloudCore STATIC ${final_src})
 
-target_link_libraries(nextcloudCore
-  PUBLIC
-  Nextcloud::sync
-  Qt::Widgets
-  Qt::Svg
-  Qt::Network
-  Qt::Xml
-  Qt::Qml
-  Qt::Quick
-  Qt::QuickControls2
-  Qt::QuickWidgets
-  KF6::Archive
-  )
+qt_add_qml_module(nextcloudCore
+    URI com.nextcloud.desktopclient
+    IMPORTS
+    	com.nextcloud.desktopclient.tray
+	com.nextcloud.desktopclient.filedetails
+    QML_FILES 
+        UserStatusMessageView.qml
+        UserStatusSelectorPage.qml
+        EmojiPicker.qml
+        UserStatusSelectorButton.qml
+        UserStatusSetStatusView.qml
+        PredefinedStatusButton.qml
+        ErrorBox.qml
+)
 
-if(KF6GuiAddons_FOUND)
-  target_link_libraries(nextcloudCore
-    PUBLIC
-    KF6::GuiAddons
-  )
-  add_definitions(-DHAVE_KGUIADDONS)
+target_link_libraries(nextcloudCore PUBLIC
+    Nextcloud::sync
+    Qt::Widgets
+    Qt::Svg
+    Qt::Network
+    Qt::Xml
+    Qt::Qml
+    Qt::Quick
+    Qt::QuickControls2
+    Qt::QuickWidgets
+    KF6::Archive
+)
+
+target_include_directories(nextcloudCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(TARGET KF6::GuiAddons)
+    target_link_libraries(nextcloudCore PUBLIC
+        KF6::GuiAddons
+    )
+    add_definitions(-DHAVE_KGUIADDONS)
 endif()
 
 add_subdirectory(socketapi)
@@ -589,6 +571,9 @@ target_include_directories(nextcloudCore
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+add_subdirectory(tray)
+add_subdirectory(filedetails)
+
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     if(NOT WIN32)
         file(GLOB _icons "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon.png")
@@ -652,7 +637,15 @@ set_target_properties(nextcloud PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
 )
 
-target_link_libraries(nextcloud PRIVATE nextcloudCore)
+set_target_properties(nextcloud PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_link_libraries(nextcloud PRIVATE
+    nextcloudTray
+    nextcloudTrayplugin
+    nextcloudFileDetails
+    nextcloudFileDetailsplugin
+    nextcloudCore
+    nextcloudCoreplugin
+)
 
 if(TARGET PkgConfig::CLOUDPROVIDERS)
     message("Building with libcloudproviderssupport")

src/gui/accountstate.cpp

@@ -698,3 +698,6 @@ QUrl AccountApp::iconUrl() const
 /*-------------------------------------------------------------------------------------*/
 
 } // namespace OCC
+
+Q_DECLARE_METATYPE(OCC::AccountState *)
+Q_DECLARE_METATYPE(OCC::AccountStatePtr)

src/gui/accountstate.h

@@ -284,7 +284,4 @@ class AccountApp : public QObject
 
 }
 
-Q_DECLARE_METATYPE(OCC::AccountState *)
-Q_DECLARE_METATYPE(OCC::AccountStatePtr)
-
 #endif //ACCOUNTINFO_H

src/gui/callstatechecker.h

@@ -5,8 +5,9 @@
 
 #pragma once
 
 #include <QObject>
 #include <QTimer>
+#include <qqmlregistration.h>
 
 #include "networkjobs.h"
 #include "accountstate.h"
@@ -16,6 +17,7 @@
 class CallStateChecker : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
     Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
     Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged)
     Q_PROPERTY(bool checking READ checking WRITE setChecking NOTIFY checkingChanged)

src/gui/emojimodel.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
 #include <QObject>
 #include <QSettings>
 #include <QObject>
 #include <QQmlEngine>
@@ -75,6 +75,7 @@
 class EmojiModel : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     Q_PROPERTY(QVariantList model READ model NOTIFY modelChanged)
     Q_PROPERTY(QAbstractListModel *emojiCategoriesModel READ emojiCategoriesModel CONSTANT)

src/gui/filedetails/CMakeLists.txt

@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2025 Nextcloud GmbH
+# SPDX-FileContributor: Carl Schwan <[email protected]>
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_library(nextcloudFileDetails STATIC)
+
+qt_add_qml_module(nextcloudFileDetails
+    URI com.nextcloud.desktopclient.filedetails
+    QML_FILES 
+        FileActivityView.qml
+        FileDetailsPage.qml
+        FileDetailsView.qml
+        FileDetailsWindow.qml
+        FileTag.qml
+        NCInputDateField.qml
+        NCInputTextArea.qml
+        NCInputTextField.qml
+        NCTabButton.qml
+        ShareeDelegate.qml
+        ShareDelegate.qml
+        ShareDetailsPage.qml
+        ShareeSearchField.qml
+        ShareView.qml
+    SOURCES
+        datefieldbackend.h
+        datefieldbackend.cpp
+        filedetails.h
+        filedetails.cpp
+        sharemodel.h
+        sharemodel.cpp
+        shareemodel.h
+        shareemodel.cpp
+        sortedsharemodel.h
+        sortedsharemodel.cpp
+)
+
+target_link_libraries(nextcloudFileDetails PRIVATE nextcloudCore)

src/gui/filedetails/datefieldbackend.h

@@ -5,8 +5,9 @@
 
 #pragma once
 
 #include <QDate>
 #include <QObject>
+#include <qqmlregistration.h>
 
 class TestDateFieldBackend;
 
@@ -18,6 +19,7 @@
 class DateFieldBackend : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged)
     Q_PROPERTY(qint64 dateMsecs READ dateMsecs WRITE setDateMsecs NOTIFY dateMsecsChanged)

src/gui/filedetails/filedetails.h

@@ -5,10 +5,11 @@
 
 #pragma once
 
 #include <QFileInfo>
 #include <QFileSystemWatcher>
 #include <QLocale>
 #include <QTimer>
+#include <qqmlregistration.h>
 
 #include "common/syncjournalfilerecord.h"
 
@@ -21,6 +22,7 @@
 class FileDetails : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
     Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged)
     Q_PROPERTY(QString name READ name NOTIFY fileChanged)
     Q_PROPERTY(QString sizeString READ sizeString NOTIFY fileChanged)

src/gui/filedetails/shareemodel.h

@@ -5,8 +5,9 @@
 
 #pragma once
 
 #include <QAbstractListModel>
 #include <QTimer>
+#include <qqmlregistration.h>
 
 #include "accountstate.h"
 #include "sharee.h"
@@ -19,6 +20,7 @@
 class ShareeModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
     Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged)
     Q_PROPERTY(bool shareItemIsFolder READ shareItemIsFolder WRITE setShareItemIsFolder NOTIFY shareItemIsFolderChanged)
     Q_PROPERTY(QString searchString READ searchString WRITE setSearchString NOTIFY searchStringChanged)

src/gui/filedetails/sharemodel.h

@@ -5,7 +5,8 @@
 
 #pragma once
 
 #include <QAbstractListModel>
+#include <qqmlregistration.h>
 
 #include "accountstate.h"
 #include "folder.h"
@@ -17,6 +18,7 @@
 class ShareModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
     Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged)
     Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged)
     Q_PROPERTY(bool accountConnected READ accountConnected NOTIFY accountConnectedChanged)

src/gui/filedetails/sortedsharemodel.h

@@ -5,14 +5,16 @@
 
 #pragma once
 
 #include <QSortFilterProxyModel>
+#include <qqmlregistration.h>
 #include "sharemodel.h"
 
 namespace OCC {
 
 class SortedShareModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
 public:
     explicit SortedShareModel(QObject *parent = nullptr);

src/gui/macOS/CMakeLists.txt

@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: 2025 Nextcloud GmbH
+# SPDX-FileContributor: Carl Schwan <[email protected]>
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_library(nextcloudMacOS STATIC)
+
+qt_add_qml_module(nextcloudMacOS
+    URI com.nextcloud.desktopclient.nextcloud.macos
+    QML_FILES 
+	ui/FileProviderSettings.qml
+	ui/FileProviderFileDelegate.qml
+)