Port the FolderStatus to Qml

This prepares the work on the improved accessibility

Issue: #11527

Author: TheOneRing

CMakeLists.txt

@@ -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})")
@@ -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")

changelog/unreleased/11491

@@ -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

src/gui/CMakeLists.txt

@@ -37,7 +37,6 @@ set(client_SRCS
     folder.cpp
     folderman.cpp
     folderstatusmodel.cpp
-    folderstatusdelegate.cpp
     folderwatcher.cpp
     generalsettings.cpp
     ignorelisteditor.cpp
@@ -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)
 
@@ -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}")
 

src/gui/accountsettings.cpp

@@ -15,17 +15,19 @@
 #ifndef ACCOUNTSETTINGS_H
 #define ACCOUNTSETTINGS_H
 
-#include <QWidget>
 
 #include "folder.h"
 #include "loginrequireddialog.h"
 #include "owncloudgui.h"
 #include "progressdispatcher.h"
 
+
+#include <QSortFilterProxyModel>
+#include <QWidget>
+
 class QModelIndex;
 class QNetworkReply;
 class QLabel;
-class QSortFilterProxyModel;
 
 namespace OCC {
 class AccountModalWidget;
@@ -49,6 +51,7 @@ class AccountSettings : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(AccountStatePtr accountState MEMBER _accountState)
+    Q_PROPERTY(QSortFilterProxyModel *model MEMBER _sortModel CONSTANT)
 
 public:
     enum class ModalWidgetSizePolicy { Minimum = QSizePolicy::Minimum, Expanding = QSizePolicy::Expanding };
@@ -62,6 +65,8 @@ class AccountSettings : public QWidget
     void addModalLegacyDialog(QWidget *widget, ModalWidgetSizePolicy sizePolicy);
     void addModalWidget(AccountModalWidget *widget);
 
+    auto model() { return _sortModel; }
+
 signals:
     void folderChanged();
     void showIssuesList();
@@ -71,18 +76,15 @@ public slots:
 
 protected slots:
     void slotAddFolder();
-    void slotEnableCurrentFolder(bool terminate = false);
-    void slotScheduleCurrentFolder();
-    void slotScheduleCurrentFolderForceFullDiscovery();
-    void slotForceSyncCurrentFolder();
-    void slotRemoveCurrentFolder();
-    void slotEnableVfsCurrentFolder();
-    void slotDisableVfsCurrentFolder();
+    void slotEnableCurrentFolder(Folder *folder, bool terminate = false);
+    void slotForceSyncCurrentFolder(Folder *folder);
+    void slotRemoveCurrentFolder(Folder *folder);
+    void slotEnableVfsCurrentFolder(Folder *folder);
+    void slotDisableVfsCurrentFolder(Folder *folder);
     void slotFolderWizardAccepted();
     void slotDeleteAccount();
     void slotToggleSignInState();
-    void slotCustomContextMenuRequested(const QPoint &);
-    void slotFolderListClicked(const QModelIndex &indx);
+    void slotCustomContextMenuRequested(Folder *folder);
 
 private:
     void showSelectiveSyncDialog(Folder *folder);
@@ -93,13 +95,9 @@ protected slots:
     void createAccountToolbox();
     void doForceSyncCurrentFolder(Folder *selectedFolder);
 
-    /// Returns the alias of the selected folder, empty string if none
-    Folder *selectedFolder() const;
-
     Ui::AccountSettings *ui;
 
     FolderStatusModel *_model;
-    FolderStatusDelegate *_delegate;
     QSortFilterProxyModel *_sortModel;
     bool _wasDisabledBefore;
     AccountStatePtr _accountState;

src/gui/accountsettings.h

@@ -147,20 +147,7 @@
      <widget class="QWidget" name="folderListPage">
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
-        <widget class="QListView" name="_folderList">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>5</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="contextMenuPolicy">
-          <enum>Qt::CustomContextMenu</enum>
-         </property>
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-        </widget>
+        <widget class="QQuickWidget" name="quickWidget"/>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -193,6 +180,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QQuickWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QtQuickWidgets/QQuickWidget</header>
+  </customwidget>
   <customwidget>
    <class>QProgressIndicator</class>
    <extends>QWidget</extends>

src/gui/accountsettings.ui

@@ -26,8 +26,8 @@
 
 #include <QDateTime>
 #include <QObject>
-#include <QStringList>
 #include <QUuid>
+#include <QtQml/QtQml>
 
 #include <chrono>
 #include <memory>
@@ -146,6 +146,7 @@ class FolderDefinition
 class Folder : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
 public:
     enum class ChangeReason {

src/gui/folder.h

@@ -19,10 +19,10 @@
 #include "progressdispatcher.h"
 
 #include <QAbstractItemModel>
-#include <QLoggingCategory>
-#include <QVector>
 #include <QElapsedTimer>
-#include <QPointer>
+#include <QLoggingCategory>
+#include <QQuickImageProvider>
+#include <QtQml/QQmlEngine>
 
 class QNetworkReply;
 
@@ -43,34 +43,22 @@ namespace {
 class FolderStatusModel : public QAbstractTableModel
 {
     Q_OBJECT
+    QML_ELEMENT
 public:
-    enum class Columns {
-        HeaderRole, // must be 0 as it is also used from the default delegate
-        FolderPathRole, // for a SubFolder it's the complete path
-        FolderSecondPathRole,
-        FolderConflictMsg,
+    enum class Roles {
+        ToolTip = Qt::ToolTipRole,
+        DisplayName = Qt::UserRole + 1, // must be 0 as it is also used from the default delegate
+        Subtitle,
         FolderErrorMsg,
-        FolderSyncPaused,
-        FolderStatusIconRole,
-        FolderAccountConnected,
-        FolderImage,
-
         SyncProgressOverallPercent,
         SyncProgressOverallString,
         SyncProgressItemString,
-        WarningCount,
-        SyncRunning,
-
         FolderSyncText,
-        IsReady, // boolean
-        IsUsingSpaces, // boolean
-
-        Priority, // uint32_t
-        IsDeployed, // bool
-
-        QuotaUsed,
-        QuotaTotal,
-
+        Priority,
+        Quota,
+        FolderImageUrl,
+        FolderStatusUrl,
+        Folder,
         ColumnCount
     };
     Q_ENUMS(Columns);
@@ -84,6 +72,8 @@ class FolderStatusModel : public QAbstractTableModel
     int columnCount(const QModelIndex &parent = QModelIndex()) const override;
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
+    QHash<int, QByteArray> roleNames() const override;
+
 public slots:
     void slotUpdateFolderState(Folder *);
     void resetFolders();
@@ -99,6 +89,18 @@ private slots:
     std::vector<std::unique_ptr<SubFolderInfo>> _folders;
 };
 
-} // namespace OCC
 
+class SpaceImageProvider : public QQuickImageProvider
+{
+    Q_OBJECT
+public:
+    SpaceImageProvider(AccountStatePtr accountStat);
+    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
+
+
+private:
+    AccountStatePtr _accountStat;
+};
+
+} // namespace OCC
 #endif // FOLDERSTATUSMODEL_H

src/gui/folderstatusdelegate.cpp

@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) by Hannah von Reth <hannah.vonreth@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.ownCloud.qmlcomponents 1.0
+
+Pane {
+    // TODO: not cool
+    readonly property real normalSize: 170
+
+    ScrollView {
+        id: scrollView
+        anchors.fill: parent
+        clip: true
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+
+        ListView {
+            anchors.fill: parent
+            model: ctx.model
+
+            spacing: 20
+
+            delegate: Pane {
+                id: folderDelegate
+
+                required property string displayName
+                required property string descriptionText
+                required property url imageUrl
+                required property url statusUrl
+                required property double progress
+                required property string overallText
+                required property string itemText
+                required property var errorMsg
+                required property string quota
+                required property string toolTip
+
+                required property Folder folder
+
+                clip: true
+                width: ListView.view.width - scrollView.ScrollBar.vertical.width - 10
+
+                implicitHeight: normalSize
+                background: Rectangle {
+                    color: scrollView.palette.base
+                }
+
+                hoverEnabled: true
+
+                ToolTip.text: folderDelegate.toolTip
+                ToolTip.visible: hovered
+                ToolTip.delay: 1000
+                ToolTip.timeout: 5000
+
+                ColumnLayout {
+                    id: colLayout
+                    anchors.fill: parent
+                    spacing: 10
+
+                    RowLayout {
+                        Layout.alignment: Qt.AlignTop
+                        Layout.fillWidth: true
+
+                        Pane {
+                            Layout.preferredHeight: normalSize - 20
+                            Layout.preferredWidth: normalSize - 20
+                            Layout.alignment: Qt.AlignTop
+                            background: Rectangle {
+                                color: scrollView.palette.alternateBase
+                            }
+                            Image {
+                                anchors.fill: parent
+                                fillMode: Image.PreserveAspectFit
+                                source: imageUrl
+                            }
+                        }
+                        ColumnLayout {
+                            spacing: 6
+                            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
+                            Layout.fillWidth: true
+
+                            RowLayout {
+                                Layout.fillWidth: true
+                                Image {
+                                    Layout.preferredHeight: 16
+                                    Layout.preferredWidth: 16
+                                    source: statusUrl
+                                }
+                                Label {
+                                    Layout.fillWidth: true
+                                    text: folderDelegate.displayName
+                                    font.bold: true
+                                    font.pointSize: 15
+                                    elide: Text.ElideRight
+                                }
+                            }
+                            Label {
+                                Layout.fillWidth: true
+                                text: folderDelegate.descriptionText
+                                elide: Text.ElideRight
+                            }
+                            // we will either display quota or overallText
+                            Label {
+                                Layout.fillWidth: true
+                                text: folderDelegate.quota
+                                elide: Text.ElideRight
+                                visible: folderDelegate.quota && !folderDelegate.overallText
+                            }
+
+                            Item {
+                                // ensure the progress bar always consumes its space
+                                Layout.preferredHeight: 10
+                                Layout.fillWidth: true
+                                ProgressBar {
+                                    anchors.fill: parent
+                                    value: folderDelegate.progress
+                                    visible: folderDelegate.overallText || folderDelegate.itemText
+                                }
+                            }
+
+                            Label {
+
+                                Layout.fillWidth: true
+                                text: folderDelegate.overallText
+                                elide: Text.ElideMiddle
+                            }
+
+                            Label {
+                                Layout.fillWidth: true
+                                text: folderDelegate.itemText
+                                elide: Text.ElideMiddle
+                                // only display the item text if we don't have errors
+                                // visible:  !folderDelegate.errorMsg.length
+                            }
+
+                            FolderError {
+                                Layout.fillWidth: true
+                                errorMessages: folderDelegate.errorMsg
+                                onCollapsedChanged: {
+                                    if (!collapsed) {
+                                        // TODO: not cool
+                                        folderDelegate.implicitHeight = normalSize + implicitHeight + 10;
+                                    } else {
+                                        folderDelegate.implicitHeight = normalSize;
+                                    }
+                                }
+                            }
+                        }
+                        Button {
+                            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                            Layout.maximumHeight: 30
+                            display: AbstractButton.IconOnly
+                            icon.source: "image://ownCloud/core/more"
+                            onClicked: {
+                                ctx.slotCustomContextMenuRequested(folder);
+                            }
+                        }
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    acceptedButtons: Qt.RightButton
+
+                    onClicked: {
+                        ctx.slotCustomContextMenuRequested(folder);
+                    }
+                }
+            }
+        }
+    }
+}

src/gui/folderstatusdelegate.h

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) by Hannah von Reth <hannah.vonreth@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+ColumnLayout {
+    property bool collapsed: true
+    required property var errorMessages
+
+    component ErrorItem: RowLayout {
+        property alias text: label.text
+        property alias maximumLineCount: label.maximumLineCount
+        Image {
+            Layout.alignment: Qt.AlignTop
+            source: "image://ownCloud/core/warning"
+            Layout.maximumHeight: 16
+            Layout.maximumWidth: 16
+        }
+        Label {
+            id: label
+            Layout.fillWidth: true
+            elide: Label.ElideLeft
+            wrapMode: Label.WordWrap
+        }
+    }
+
+    Component {
+        id: expandedError
+        ColumnLayout {
+            Layout.fillWidth: true
+            Repeater {
+                model: errorMessages
+                delegate: ErrorItem {
+                    required property string modelData
+                    text: modelData
+                    Layout.fillWidth: true
+                }
+            }
+            Label {
+                Layout.alignment: Qt.AlignHCenter
+                text: "<a href='foo'>" + qsTr("Show less") + "</a>"
+                onLinkActivated: {
+                    collapsed = true;
+                }
+            }
+        }
+    }
+
+    Component {
+        id: collapsedError
+        ColumnLayout {
+            Layout.fillWidth: true
+            ErrorItem {
+                Layout.fillWidth: true
+                text: errorMessages
+                maximumLineCount: 1
+            }
+            Label {
+                Layout.alignment: Qt.AlignHCenter
+                text: "<a href='foo'>" + qsTr("Show more") + "</a>"
+                onLinkActivated: {
+                    collapsed = false;
+                }
+            }
+        }
+    }
+
+    function loadComponent() {
+        if (errorMessages.length) {
+            return collapsed ? collapsedError : expandedError;
+        }
+        return undefined;
+    }
+
+    Loader {
+        id: loader
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+        sourceComponent: loadComponent()
+    }
+
+    onCollapsedChanged: {
+        loader.sourceComponent = loadComponent();
+    }
+}

src/gui/folderstatusmodel.cpp

@@ -87,6 +87,7 @@ target_link_libraries(libsync
         Qt::Core
         Qt::Network
         Qt::Widgets
+        Qt::QuickControls2
 
     PRIVATE
         Qt::Concurrent

src/gui/folderstatusmodel.h

@@ -95,7 +95,7 @@ QUrl Space::imageUrl() const
 QIcon Space::image() const
 {
     if (_image.isNull()) {
-        return Resources::getCoreIcon(QStringLiteral("folder-sync"));
+        return Resources::getCoreIcon(QStringLiteral("space"));
     }
     return _image;
 }

src/gui/qml/FolderDelegate.qml

@@ -21,7 +21,7 @@
 #include <QApplication>
 #include <QGuiApplication>
 #include <QIcon>
-#include <QMetaMethod>
+#include <QQuickStyle>
 
 
 #include <chrono>
@@ -67,6 +67,7 @@ void WinPlatform::setApplication(QCoreApplication *application)
 
     if (auto guiApp = qobject_cast<QGuiApplication *>(application)) {
         QApplication::setStyle(QStringLiteral("fusion"));
+        QQuickStyle::setStyle(QStringLiteral("Fusion"));
     }
 }
 

src/gui/qml/FolderError.qml

@@ -10,7 +10,7 @@ generate_theme(owncloudResources OWNCLOUD_SIDEBAR_ICONS)
 # make them available to the whole project
 set(OWNCLOUD_SIDEBAR_ICONS ${OWNCLOUD_SIDEBAR_ICONS} CACHE INTERNAL "Sidebar icons" FORCE)
 
-target_link_libraries(owncloudResources PUBLIC Qt::Core Qt::Gui)
+target_link_libraries(owncloudResources PUBLIC Qt::Core Qt::Gui Qt::Quick)
 apply_common_target_settings(owncloudResources)
 target_include_directories(owncloudResources PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>)
 target_compile_definitions(owncloudResources PRIVATE APPLICATION_SHORTNAME="${APPLICATION_SHORTNAME}")

src/libsync/CMakeLists.txt

@@ -40,6 +40,8 @@
         <file alias="resources/dark/undo.svg">font-awesome/dark/undo-solid.svg</file>
         <file alias="resources/wizard/style.qss">wizard/style.qss</file>
         <file alias="resources/oauth/oauth.html.in">oauth/oauth.html.in</file>
+        <file alias="resources/dark/space.svg">remixicon/dark/space.svg</file>
+        <file alias="resources/light/space.svg">remixicon/light/space.svg</file>
         <file alias="resources/dark/states/error.svg">font-awesome/dark/states/error.svg</file>
         <file alias="resources/dark/states/information.svg">font-awesome/dark/states/information.svg</file>
         <file alias="resources/dark/states/offline.svg">font-awesome/dark/states/offline.svg</file>

src/libsync/graphapi/space.cpp

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

src/libsync/platform_win.cpp

@@ -52,7 +52,6 @@ constexpr bool isVanilla()
     return std::string_view(APPLICATION_SHORTNAME) == "ownCloud";
 }
 
-
 bool hasTheme(IconType type, const QString &theme)
 {
     // <<is vanilla, theme name>, bool
@@ -79,7 +78,6 @@ bool Resources::hasMonoTheme()
 {
     // mono icons are only supported in vanilla and if a customer provides them
     // no fallback to vanilla
-    qDebug() << hasTheme(Resources::IconType::BrandedIcon, whiteTheme());
     return hasTheme(Resources::IconType::BrandedIcon, whiteTheme());
 }
 
@@ -172,3 +170,29 @@ QIcon OCC::Resources::themeUniversalIcon(const QString &name, IconType iconType)
 {
     return loadIcon(QStringLiteral("universal"), name, iconType);
 }
+
+CoreImageProvider::CoreImageProvider()
+    : QQuickImageProvider(QQuickImageProvider::Pixmap)
+{
+}
+QPixmap CoreImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
+{
+    const auto [type, path] = [&id] {
+        const QString type = id.mid(0, id.indexOf(QLatin1Char('/')));
+        return std::make_tuple(type, id.mid(type.size()));
+    }();
+    Q_ASSERT(!path.isEmpty());
+    QIcon icon;
+    if (type == QLatin1String("theme")) {
+        icon = themeIcon(path);
+    } else if (type == QLatin1String("core")) {
+        icon = getCoreIcon(path);
+    } else {
+        Q_UNREACHABLE();
+    }
+    const QSize actualSize = requestedSize.isValid() ? requestedSize : icon.availableSizes().first();
+    if (size) {
+        *size = actualSize;
+    }
+    return icon.pixmap(actualSize);
+}

src/resources/CMakeLists.txt

@@ -17,6 +17,7 @@
 
 #include <QIcon>
 #include <QUrl>
+#include <QtQuick/QQuickImageProvider>
 
 namespace OCC::Resources {
 Q_NAMESPACE
@@ -48,4 +49,13 @@ QIcon OWNCLOUDRESOURCES_EXPORT themeIcon(const QString &name, IconType iconType
  * Returns a universal (non color schema aware) icon.
  */
 QIcon OWNCLOUDRESOURCES_EXPORT themeUniversalIcon(const QString &name, IconType iconType = IconType::BrandedIcon);
+
+class OWNCLOUDRESOURCES_EXPORT CoreImageProvider : public QQuickImageProvider
+{
+    Q_OBJECT
+public:
+    CoreImageProvider();
+
+    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
+};
 }