Skip to content

Commit 0542b42

Browse files
CarlSchwanCarlSchwan
committed
refactor: Port to QML modules
Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>
1 parent 99497cf commit 0542b42

33 files changed

Lines changed: 304 additions & 163 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if(APPLE)
1010
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "Minimum OSX deployment version")
1111
endif()
1212

13+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1314
set(CMAKE_CXX_STANDARD 20)
1415
set(CMAKE_CXX_STANDARD_REQUIRED 20)
1516

‎resources.qrc‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,7 @@
11
<RCC>
22
<qresource prefix="/qml">
3-
<file>src/gui/UserStatusMessageView.qml</file>
4-
<file>src/gui/UserStatusSelectorPage.qml</file>
5-
<file>src/gui/EmojiPicker.qml</file>
6-
<file>src/gui/UserStatusSelectorButton.qml</file>
7-
<file>src/gui/UserStatusSetStatusView.qml</file>
8-
<file>src/gui/PredefinedStatusButton.qml</file>
9-
<file>src/gui/ErrorBox.qml</file>
10-
<file>src/gui/filedetails/FileActivityView.qml</file>
11-
<file>src/gui/filedetails/FileDetailsPage.qml</file>
12-
<file>src/gui/filedetails/FileDetailsView.qml</file>
13-
<file>src/gui/filedetails/FileDetailsWindow.qml</file>
14-
<file>src/gui/filedetails/FileTag.qml</file>
15-
<file>src/gui/filedetails/NCInputDateField.qml</file>
16-
<file>src/gui/filedetails/NCInputTextArea.qml</file>
17-
<file>src/gui/filedetails/NCInputTextField.qml</file>
18-
<file>src/gui/filedetails/NCTabButton.qml</file>
19-
<file>src/gui/filedetails/ShareeDelegate.qml</file>
20-
<file>src/gui/filedetails/ShareDelegate.qml</file>
21-
<file>src/gui/filedetails/ShareDetailsPage.qml</file>
22-
<file>src/gui/filedetails/ShareeSearchField.qml</file>
23-
<file>src/gui/filedetails/ShareView.qml</file>
24-
<file>src/gui/tray/MainWindow.qml</file>
25-
<file>src/gui/tray/UserLine.qml</file>
26-
<file>src/gui/tray/HeaderButton.qml</file>
27-
<file>src/gui/tray/SyncStatus.qml</file>
28-
<file>src/gui/tray/ActivityItem.qml</file>
29-
<file>src/gui/tray/AutoSizingMenu.qml</file>
30-
<file>src/gui/tray/ActivityList.qml</file>
31-
<file>src/gui/tray/CurrentAccountHeaderButton.qml</file>
32-
<file>src/gui/tray/TrayWindowHeader.qml</file>
33-
<file>src/gui/tray/UnifiedSearchInputContainer.qml</file>
34-
<file>src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml</file>
35-
<file>src/gui/tray/UnifiedSearchResultItem.qml</file>
36-
<file>src/gui/tray/UnifiedSearchResultItemSkeleton.qml</file>
37-
<file>src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml</file>
38-
<file>src/gui/tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml</file>
39-
<file>src/gui/tray/UnifiedSearchResultListItem.qml</file>
40-
<file>src/gui/tray/UnifiedSearchResultNothingFound.qml</file>
41-
<file>src/gui/tray/UnifiedSearchPlaceholderView.qml</file>
42-
<file>src/gui/tray/UnifiedSearchResultSectionItem.qml</file>
43-
<file>src/gui/tray/ActivityItemContextMenu.qml</file>
44-
<file>src/gui/tray/ActivityItemActions.qml</file>
45-
<file>src/gui/tray/ActivityItemContent.qml</file>
46-
<file>src/gui/tray/TalkReplyTextField.qml</file>
47-
<file>src/gui/tray/CallNotificationDialog.qml</file>
48-
<file>src/gui/tray/EditFileLocallyLoadingDialog.qml</file>
49-
<file>src/gui/tray/EncryptionTokenDiscoveryDialog.qml</file>
50-
<file>src/gui/tray/NCBusyIndicator.qml</file>
51-
<file>src/gui/tray/NCIconWithBackgroundImage.qml</file>
52-
<file>src/gui/tray/NCProgressBar.qml</file>
53-
<file>src/gui/tray/EnforcedPlainTextLabel.qml</file>
543
<file>theme/Style/Style.qml</file>
554
<file>theme/Style/qmldir</file>
56-
<file>src/gui/tray/ListItemLineAndSubline.qml</file>
57-
<file>src/gui/tray/TrayFoldersMenuButton.qml</file>
58-
<file>src/gui/tray/TrayFolderListItem.qml</file>
59-
<file>src/gui/ResolveConflictsDialog.qml</file>
60-
<file>src/gui/ConflictDelegate.qml</file>
61-
<file>src/gui/ConflictItemFileInfo.qml</file>
625
<file>src/gui/macOS/ui/FileProviderSettings.qml</file>
636
<file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
647
<file>src/gui/integration/FileActionsWindow.qml</file>

‎src/3rdparty/kirigami/wheelhandler.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <QQuickItem>
1212
#include <QStyleHints>
1313
#include <QtQml>
14+
#include <qqmlregistration.h>
1415

1516
class QWheelEvent;
1617
class WheelHandler;
@@ -21,6 +22,7 @@ class WheelHandler;
2122
class KirigamiWheelEvent : public QObject
2223
{
2324
Q_OBJECT
25+
QML_NAMED_ELEMENT(WheelEvent)
2426

2527
/**
2628
* x: real

‎src/gui/CMakeLists.txt‎

Lines changed: 47 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -182,40 +182,7 @@ set(client_SRCS
182182
emojimodel.cpp
183183
syncconflictsmodel.h
184184
syncconflictsmodel.cpp
185-
fileactivitylistmodel.h
186-
fileactivitylistmodel.cpp
187-
filedetails/datefieldbackend.h
188-
filedetails/datefieldbackend.cpp
189-
filedetails/filedetails.h
190-
filedetails/filedetails.cpp
191-
filedetails/sharemodel.h
192-
filedetails/sharemodel.cpp
193-
filedetails/shareemodel.h
194-
filedetails/shareemodel.cpp
195-
filedetails/sortedsharemodel.h
196-
filedetails/sortedsharemodel.cpp
197-
tray/svgimageprovider.h
198-
tray/svgimageprovider.cpp
199-
tray/syncstatussummary.h
200-
tray/syncstatussummary.cpp
201-
tray/activitydata.h
202-
tray/activitydata.cpp
203-
tray/activitylistmodel.h
204-
tray/activitylistmodel.cpp
205-
tray/unifiedsearchresult.h
206-
tray/asyncimageresponse.cpp
207-
tray/unifiedsearchresult.cpp
208-
tray/unifiedsearchresultslistmodel.h
209-
tray/trayimageprovider.cpp
210-
tray/unifiedsearchresultslistmodel.cpp
211-
tray/usermodel.h
212-
tray/usermodel.cpp
213-
tray/notificationhandler.h
214-
tray/notificationhandler.cpp
215-
tray/sortedactivitylistmodel.h
216-
tray/sortedactivitylistmodel.cpp
217185
creds/credentialsfactory.h
218-
tray/talkreply.cpp
219186
creds/credentialsfactory.cpp
220187
creds/httpcredentialsgui.h
221188
creds/httpcredentialsgui.cpp
@@ -522,27 +489,42 @@ endif()
522489

523490
add_library(nextcloudCore STATIC ${final_src})
524491

525-
target_link_libraries(nextcloudCore
526-
PUBLIC
527-
Nextcloud::sync
528-
Qt::Widgets
529-
Qt::Svg
530-
Qt::Network
531-
Qt::Xml
532-
Qt::Qml
533-
Qt::Quick
534-
Qt::QuickControls2
535-
Qt::QuickWidgets
536-
KF6::Archive
537-
KDAB::kdsingleapplication
538-
)
492+
qt_add_qml_module(nextcloudCore
493+
URI com.nextcloud.desktopclient
494+
IMPORTS
495+
com.nextcloud.desktopclient.tray
496+
com.nextcloud.desktopclient.filedetails
497+
QML_FILES
498+
UserStatusMessageView.qml
499+
UserStatusSelectorPage.qml
500+
EmojiPicker.qml
501+
UserStatusSelectorButton.qml
502+
UserStatusSetStatusView.qml
503+
PredefinedStatusButton.qml
504+
ErrorBox.qml
505+
)
539506

540-
if(KF6GuiAddons_FOUND)
541-
target_link_libraries(nextcloudCore
542-
PUBLIC
543-
KF6::GuiAddons
544-
)
545-
add_definitions(-DHAVE_KGUIADDONS)
507+
target_link_libraries(nextcloudCore PUBLIC
508+
Nextcloud::sync
509+
Qt::Widgets
510+
Qt::Svg
511+
Qt::Network
512+
Qt::Xml
513+
Qt::Qml
514+
Qt::Quick
515+
Qt::QuickControls2
516+
Qt::QuickWidgets
517+
KF6::Archive
518+
KDAB::kdsingleapplication
519+
)
520+
521+
target_include_directories(nextcloudCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
522+
523+
if(TARGET KF6::GuiAddons)
524+
target_link_libraries(nextcloudCore PUBLIC
525+
KF6::GuiAddons
526+
)
527+
add_definitions(-DHAVE_KGUIADDONS)
546528
endif()
547529

548530
add_subdirectory(socketapi)
@@ -575,6 +557,9 @@ target_include_directories(nextcloudCore
575557
${CMAKE_CURRENT_SOURCE_DIR}
576558
)
577559

560+
add_subdirectory(tray)
561+
add_subdirectory(filedetails)
562+
578563
if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
579564
if(NOT WIN32)
580565
file(GLOB _icons "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon.png")
@@ -638,7 +623,15 @@ set_target_properties(nextcloud PROPERTIES
638623
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
639624
)
640625

641-
target_link_libraries(nextcloud PRIVATE nextcloudCore)
626+
set_target_properties(nextcloud PROPERTIES POSITION_INDEPENDENT_CODE ON)
627+
target_link_libraries(nextcloud PRIVATE
628+
nextcloudTray
629+
nextcloudTrayplugin
630+
nextcloudFileDetails
631+
nextcloudFileDetailsplugin
632+
nextcloudCore
633+
nextcloudCoreplugin
634+
)
642635

643636
if(TARGET PkgConfig::CLOUDPROVIDERS)
644637
message("Building with libcloudproviderssupport")

‎src/gui/accountstate.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,3 +709,6 @@ QUrl AccountApp::iconUrl() const
709709
/*-------------------------------------------------------------------------------------*/
710710

711711
} // namespace OCC
712+
713+
Q_DECLARE_METATYPE(OCC::AccountState *)
714+
Q_DECLARE_METATYPE(OCC::AccountStatePtr)

‎src/gui/accountstate.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,4 @@ class AccountApp : public QObject
284284

285285
}
286286

287-
Q_DECLARE_METATYPE(OCC::AccountState *)
288-
Q_DECLARE_METATYPE(OCC::AccountStatePtr)
289-
290287
#endif //ACCOUNTINFO_H

‎src/gui/callstatechecker.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <QObject>
99
#include <QTimer>
10+
#include <qqmlregistration.h>
1011

1112
#include "networkjobs.h"
1213
#include "accountstate.h"
@@ -16,6 +17,7 @@ namespace OCC {
1617
class CallStateChecker : public QObject
1718
{
1819
Q_OBJECT
20+
QML_ELEMENT
1921
Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
2022
Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged)
2123
Q_PROPERTY(bool checking READ checking WRITE setChecking NOTIFY checkingChanged)

‎src/gui/emojimodel.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class EmojiCategoriesModel : public QAbstractListModel
7575
class EmojiModel : public QObject
7676
{
7777
Q_OBJECT
78+
QML_ELEMENT
7879

7980
Q_PROPERTY(QVariantList model READ model NOTIFY modelChanged)
8081
Q_PROPERTY(QAbstractListModel *emojiCategoriesModel READ emojiCategoriesModel CONSTANT)

‎src/gui/filedetails/CMakeLists.txt‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH
2+
# SPDX-FileContributor: Carl Schwan <carl.schwan@nextcloud.com>
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
5+
add_library(nextcloudFileDetails STATIC)
6+
7+
qt_add_qml_module(nextcloudFileDetails
8+
URI com.nextcloud.desktopclient.filedetails
9+
QML_FILES
10+
FileActivityView.qml
11+
FileDetailsPage.qml
12+
FileDetailsView.qml
13+
FileDetailsWindow.qml
14+
FileTag.qml
15+
NCInputDateField.qml
16+
NCInputTextArea.qml
17+
NCInputTextField.qml
18+
NCTabButton.qml
19+
ShareeDelegate.qml
20+
ShareDelegate.qml
21+
ShareDetailsPage.qml
22+
ShareeSearchField.qml
23+
ShareView.qml
24+
SOURCES
25+
datefieldbackend.h
26+
datefieldbackend.cpp
27+
filedetails.h
28+
filedetails.cpp
29+
sharemodel.h
30+
sharemodel.cpp
31+
shareemodel.h
32+
shareemodel.cpp
33+
sortedsharemodel.h
34+
sortedsharemodel.cpp
35+
)
36+
37+
target_link_libraries(nextcloudFileDetails PRIVATE nextcloudCore)

‎src/gui/filedetails/datefieldbackend.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <QDate>
99
#include <QObject>
10+
#include <qqmlregistration.h>
1011

1112
class TestDateFieldBackend;
1213

@@ -18,6 +19,7 @@ namespace Quick
1819
class DateFieldBackend : public QObject
1920
{
2021
Q_OBJECT
22+
QML_ELEMENT
2123

2224
Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged)
2325
Q_PROPERTY(qint64 dateMsecs READ dateMsecs WRITE setDateMsecs NOTIFY dateMsecsChanged)

0 commit comments

Comments
 (0)