Skip to content

Commit

Permalink
Port the FolderStatus to Qml
Browse files Browse the repository at this point in the history
This prepares the work on the improved accessibility

Issue: #11527
  • Loading branch information
TheOneRing committed Mar 15, 2024
1 parent 2695618 commit 82cd20d
Show file tree
Hide file tree
Showing 25 changed files with 894 additions and 808 deletions.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

find_package(QT 6.2 NAMES Qt6 COMPONENTS Core REQUIRED)

find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml REQUIRED)
find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml Quick QuickWidgets QuickControls2 REQUIRED)
find_package(Qt6LinguistTools REQUIRED)
get_target_property (QT_QMAKE_EXECUTABLE Qt::qmake IMPORTED_LOCATION)
message(STATUS "Using Qt ${QT_VERSION} (${QT_QMAKE_EXECUTABLE})")
Expand All @@ -37,6 +37,9 @@ include(ECMSetupVersion)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMEnableSanitizers)

# while we use qt_add_qml_module instead of ecm_add_qml_module
# include ECMQmlModule to set up the policies
include(ECMQmlModule)

if(UNIT_TESTING)
message(DEPRECATION "Setting UNIT_TESTING is deprecated please use BUILD_TESTING")
Expand Down
6 changes: 6 additions & 0 deletions changelog/unreleased/11491
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: New Folder status

We rewrote the Folder status page.

https://github.com/owncloud/client/pull/11491
https://github.com/owncloud/client/issues/11527
16 changes: 13 additions & 3 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ set(client_SRCS
folder.cpp
folderman.cpp
folderstatusmodel.cpp
folderstatusdelegate.cpp
folderwatcher.cpp
generalsettings.cpp
ignorelisteditor.cpp
Expand Down Expand Up @@ -102,16 +101,27 @@ add_subdirectory(loginrequireddialog)

add_library(owncloudCore STATIC ${final_src})
set_target_properties(owncloudCore PROPERTIES AUTOUIC ON AUTORCC ON)
# for the generated qml module
target_include_directories(owncloudCore PRIVATE models)
target_link_libraries(owncloudCore
PUBLIC
Qt::Widgets Qt::Network Qt::Xml
Qt::Widgets Qt::Network Qt::Xml Qt::Quick Qt::QuickWidgets Qt::QuickControls2
newwizard folderwizard spaces loginrequireddialog
libsync
Qt6Keychain::Qt6Keychain
)

apply_common_target_settings(owncloudCore)
qt_add_qml_module(owncloudCore
URI org.ownCloud.qmlcomponents
VERSION 1.0
NAMESPACE OCC
QML_FILES
qml/FolderDelegate.qml
qml/FolderError.qml
)

target_link_libraries(owncloudCore PUBLIC owncloudCoreplugin)

add_subdirectory(spaces)

Expand Down Expand Up @@ -159,7 +169,7 @@ set_target_properties(owncloud PROPERTIES
AUTORCC ON
)
apply_common_target_settings(owncloud)
target_link_libraries(owncloud owncloudCore owncloudResources KDAB::kdsingleapplication )
target_link_libraries(owncloud PUBLIC owncloudCore owncloudResources KDAB::kdsingleapplication )

MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}")

Expand Down

0 comments on commit 82cd20d

Please sign in to comment.