From 46df1cf9140050bb68495709c7e79951d97efd5c Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Mon, 23 Jun 2025 15:49:56 +0200 Subject: [PATCH 01/30] feat(socketapi): add file actions option to list of options for files. Signed-off-by: Camila Ayres --- src/gui/socketapi/socketapi.cpp | 16 +++++++++++++++- src/gui/socketapi/socketapi.h | 3 +++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 58efdddaa7c69..d2d4576fcc2d6 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -615,6 +615,12 @@ void SocketApi::processLeaveShareRequest(const QString &localFile, SocketListene FolderMan::instance()->leaveShare(QDir::fromNativeSeparators(localFile)); } +void SocketApi::processFileActionsRequest(const QString &localFile) +{ + const auto fileData = FileData::get(localFile); + emit fileActionsCommandReceived(fileData.localPath); +} + void SocketApi::broadcastStatusPushMessage(const QString &systemPath, SyncFileStatus fileStatus) { QString msg = buildMessage(QLatin1String("STATUS"), systemPath, fileStatus.toSocketAPIString()); @@ -723,6 +729,13 @@ void SocketApi::command_EDIT(const QString &localFile, SocketListener *listener) job->start(); } +void SocketApi::command_FILE_ACTIONS(const QString &localFile, SocketListener *listener) +{ + Q_UNUSED(listener); + + processFileActionsRequest(localFile); +} + // don't pull the share manager into socketapi unittests #ifndef OWNCLOUD_TEST @@ -1114,10 +1127,11 @@ void OCC::SocketApi::openPrivateLink(const QString &link) void SocketApi::command_GET_STRINGS(const QString &argument, SocketListener *listener) { - static std::array, 6> strings { { + static std::array, 7> strings { { { "SHARE_MENU_TITLE", tr("Share options") }, { "FILE_ACTIVITY_MENU_TITLE", tr("Activity") }, { "CONTEXT_MENU_TITLE", Theme::instance()->appNameGUI() }, + { "FILE_ACTIONS_MENU_TITLE", tr("File actions") }, { "COPY_PRIVATE_LINK_MENU_TITLE", tr("Copy private link to clipboard") }, { "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email …") }, { "CONTEXT_MENU_ICON", APPLICATION_ICON_NAME }, diff --git a/src/gui/socketapi/socketapi.h b/src/gui/socketapi/socketapi.h index 5dcf6900e8c04..b717ab3e65c61 100644 --- a/src/gui/socketapi/socketapi.h +++ b/src/gui/socketapi/socketapi.h @@ -64,6 +64,7 @@ public slots: signals: void shareCommandReceived(const QString &localPath); void fileActivityCommandReceived(const QString &localPath); + void fileActionsCommandReceived(const QString &localPath); private slots: void slotNewConnection(); @@ -107,6 +108,7 @@ private slots: void processLeaveShareRequest(const QString &localFile, SocketListener *listener); void processFileActivityRequest(const QString &localFile); void processEncryptRequest(const QString &localFile); + void processFileActionsRequest(const QString &localFile); Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString &argument, OCC::SocketListener *listener); Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString &argument, OCC::SocketListener *listener); @@ -131,6 +133,7 @@ private slots: Q_INVOKABLE void command_MOVE_ITEM(const QString &localFile, OCC::SocketListener *listener); Q_INVOKABLE void command_LOCK_FILE(const QString &localFile, OCC::SocketListener *listener); Q_INVOKABLE void command_UNLOCK_FILE(const QString &localFile, OCC::SocketListener *listener); + Q_INVOKABLE void command_FILE_ACTIONS(const QString &localFile, OCC::SocketListener *listener); void setFileLock(const QString &localFile, const SyncFileItem::LockStatus lockState) const; From a33ea24dab90d122fc089401b50003db7cef5a35 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Sun, 17 Aug 2025 19:18:46 +0200 Subject: [PATCH 02/30] feat(declarativeui): add basic class to retrieve json from server. - add endpoints model. - add class to manage endpoints and declarativeui display. Signed-off-by: Camila Ayres --- src/gui/CMakeLists.txt | 6 + src/gui/declarativeui/declarativeui.cpp | 77 +++++++++++++ src/gui/declarativeui/declarativeui.h | 56 ++++++++++ src/gui/declarativeui/declarativeuimodel.cpp | 109 +++++++++++++++++++ src/gui/declarativeui/declarativeuimodel.h | 57 ++++++++++ src/gui/declarativeui/endpointmodel.cpp | 78 +++++++++++++ src/gui/declarativeui/endpointmodel.h | 51 +++++++++ 7 files changed, 434 insertions(+) create mode 100644 src/gui/declarativeui/declarativeui.cpp create mode 100644 src/gui/declarativeui/declarativeui.h create mode 100644 src/gui/declarativeui/declarativeuimodel.cpp create mode 100644 src/gui/declarativeui/declarativeuimodel.h create mode 100644 src/gui/declarativeui/endpointmodel.cpp create mode 100644 src/gui/declarativeui/endpointmodel.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 66a73d7e912e4..a70488d8bf377 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -258,6 +258,12 @@ set(client_SRCS wizard/linklabel.cpp wizard/wizardproxysettingsdialog.h wizard/wizardproxysettingsdialog.cpp + declarativeui/declarativeuimodel.h + declarativeui/declarativeuimodel.cpp + declarativeui/declarativeui.h + declarativeui/declarativeui.cpp + declarativeui/endpointmodel.h + declarativeui/endpointmodel.cpp ) if (NOT DISABLE_ACCOUNT_MIGRATION) diff --git a/src/gui/declarativeui/declarativeui.cpp b/src/gui/declarativeui/declarativeui.cpp new file mode 100644 index 0000000000000..1e46453417da4 --- /dev/null +++ b/src/gui/declarativeui/declarativeui.cpp @@ -0,0 +1,77 @@ +/* + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "declarativeui.h" +#include "networkjobs.h" +#include "accountfwd.h" +#include "account.h" + +namespace OCC { + +Q_LOGGING_CATEGORY(lcDeclarativeUi, "nextcloud.gui.declarativeui", QtInfoMsg) + +DeclarativeUi::DeclarativeUi(QObject *parent) + : QObject(parent) +{ + _endpointModel = std::make_unique(this); +} + +void DeclarativeUi::fetchEndpoints() +{ + _endpointModel->parseElements(_accountState->account()->capabilities().declarativeUiEndpoints()); +} + +void DeclarativeUi::setAccountState(AccountState *accountState) +{ + if (accountState == nullptr) { + return; + } + + if (accountState == _accountState) { + return; + } + + _accountState = accountState; + _declarativeUiModel = std::make_unique(_accountState->account(), this); + connect(_declarativeUiModel.get(), &DeclarativeUiModel::pageFetched, + this, &DeclarativeUi::declarativeUiFetched); + connect(this, &DeclarativeUi::declarativeUiFetched, + this, &DeclarativeUi::declarativeUiModelChanged); + Q_EMIT accountStateChanged(); +} + +void DeclarativeUi::setLocalPath(const QString &localPath) +{ + if (localPath.isEmpty()) { + return; + } + + if (localPath == _localPath) { + return; + } + + _localPath = localPath; + Q_EMIT localPathChanged(); +} + +AccountState *DeclarativeUi::accountState() const +{ + return _accountState; +} + +QString DeclarativeUi::localPath() const +{ + return _localPath; +} + +DeclarativeUiModel *DeclarativeUi::declarativeUiModel() const { + return _declarativeUiModel.get(); +} + +EndpointModel *DeclarativeUi::endpointModel() const { + return _endpointModel.get(); +} + +} diff --git a/src/gui/declarativeui/declarativeui.h b/src/gui/declarativeui/declarativeui.h new file mode 100644 index 0000000000000..b1061a2cc45eb --- /dev/null +++ b/src/gui/declarativeui/declarativeui.h @@ -0,0 +1,56 @@ +/* + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#pragma once + +#include +#include + +#include "accountstate.h" +#include "declarativeuimodel.h" +#include "endpointmodel.h" + +namespace OCC { + +Q_DECLARE_LOGGING_CATEGORY(lcDeclarativeUi) +class JsonApiJob; + +class DeclarativeUi : public QObject +{ + Q_OBJECT + Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) + Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged) + Q_PROPERTY(DeclarativeUiModel* declarativeUiModel READ declarativeUiModel NOTIFY declarativeUiModelChanged) + Q_PROPERTY(EndpointModel* endpointModel READ endpointModel NOTIFY endpointModelChanged) + +public: + DeclarativeUi(QObject *parent = nullptr); + + void fetchEndpoints(); + + void setAccountState(AccountState *accountState); + void setLocalPath(const QString &localPath); + + [[nodiscard]] AccountState *accountState() const; + [[nodiscard]] QString localPath() const; + [[nodiscard]] DeclarativeUiModel *declarativeUiModel() const; + [[nodiscard]] EndpointModel *endpointModel() const; + +signals: + void declarativeUiFetched(); + void localPathChanged(); + void accountStateChanged(); + void declarativeUiModelChanged(); + void endpointModelChanged(); + +private: + AccountState *_accountState; + QString _localPath; + + std::unique_ptr _declarativeUiModel; + std::unique_ptr _endpointModel; +}; + +} diff --git a/src/gui/declarativeui/declarativeuimodel.cpp b/src/gui/declarativeui/declarativeuimodel.cpp new file mode 100644 index 0000000000000..c520d03d2b9a9 --- /dev/null +++ b/src/gui/declarativeui/declarativeuimodel.cpp @@ -0,0 +1,109 @@ +/* + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "declarativeuimodel.h" +#include "networkjobs.h" +#include "accountstate.h" + +namespace OCC { + +DeclarativeUiModel::DeclarativeUiModel(const AccountPtr &account, QObject *parent) + : QAbstractListModel(parent) + , _account(account) +{ + fetchPage(); +} + +void DeclarativeUiModel::fetchPage() +{ + if (!_account) { + return; + } + + auto job = new JsonApiJob(_account, + QLatin1String("ocs/v2.php/apps/declarativetest/version1"), + this); + connect(job, &JsonApiJob::jsonReceived, + this, &DeclarativeUiModel::slotPageFetched); + job->start(); +} + +void DeclarativeUiModel::slotPageFetched(const QJsonDocument &json) +{ + const auto root = json.object().value(QStringLiteral("root")).toObject(); + if (root.empty()) { + return; + } + const auto orientation = root.value(QStringLiteral("orientation")).toString(); + const auto rows = root.value(QStringLiteral("rows")).toArray(); + if (rows.empty()) { + return; + } + + for (const auto &rowValue : rows) { + const auto row = rowValue.toObject(); + const auto children = row.value("children").toArray(); + + for (const auto &childValue : children) { + const auto child = childValue.toObject(); + Element element; + element.name = child.value(QStringLiteral("element")).toString(); + element.type = child.value(QStringLiteral("type")).toString(); + element.label = child.value(QStringLiteral("label")).toString(); + element.url = _account->url().toString() + child.value(QStringLiteral("url")).toString(); + element.text = child.value(QStringLiteral("text")).toString(); + _page.append(element); + } + } + + Q_EMIT pageFetched(); +} + +QVariant DeclarativeUiModel::data(const QModelIndex &index, int role) const +{ + Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + switch (role) { + case ElementNameRole: + return _page.at(index.row()).name; // Button, Text, Image + case ElementTypeRole: + return _page.at(index.row()).type; // Primary, Secondarys + case ElementLabelRole: + return _page.at(index.row()).label; // Cancel, Submit + case ElementUrlRole: + return _page.at(index.row()).url; // /core/img/logo/log.png + case ElementTextRole: + return _page.at(index.row()).text; // String + } + + return {}; +} + +int DeclarativeUiModel::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) { + return 0; + } + + return _page.size(); +} + +QHash DeclarativeUiModel::roleNames() const +{ + auto roles = QAbstractListModel::roleNames(); + roles[ElementNameRole] = "name"; + roles[ElementTypeRole] = "type"; + roles[ElementLabelRole] = "label"; + roles[ElementUrlRole] = "url"; + roles[ElementTextRole] = "text"; + + return roles; +} + +QString DeclarativeUiModel::pageOrientation() const +{ + return _pageOrientation; +} + +} diff --git a/src/gui/declarativeui/declarativeuimodel.h b/src/gui/declarativeui/declarativeuimodel.h new file mode 100644 index 0000000000000..f0f85047e3d0a --- /dev/null +++ b/src/gui/declarativeui/declarativeuimodel.h @@ -0,0 +1,57 @@ +/* + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#pragma once + +#include +#include "libsync/account.h" + +namespace OCC { + +class JsonApiJob; + +class DeclarativeUiModel : public QAbstractListModel +{ + Q_OBJECT + +public: + explicit DeclarativeUiModel(const AccountPtr &accountState, QObject *parent = nullptr); + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QHash roleNames() const override; + + enum DataRole { + ElementNameRole = Qt::UserRole + 1, + ElementTypeRole, + ElementLabelRole, + ElementTextRole, + ElementUrlRole + }; + Q_ENUM(DataRole) + + [[nodiscard]] QString pageOrientation() const; + void fetchPage(); + +signals: + void pageFetched(); + +public slots: + void slotPageFetched(const QJsonDocument &json); + +private: + struct Element { + QString name; + QString type; + QString label; + QString url; + QString text; + }; + QList _page; + QString _pageOrientation; + + AccountPtr _account; +}; + +} diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp new file mode 100644 index 0000000000000..6599b60ac599a --- /dev/null +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -0,0 +1,78 @@ +/* + * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "endpointmodel.h" + +namespace OCC { + +EndpointModel::EndpointModel(QObject *parent) + : QAbstractListModel(parent) +{ + +} + +EndpointModel::EndpointType EndpointModel::stringToEnum(const QString &type) +{ + if (type == QStringLiteral("context-menu")) { + return EndpointType::ContextMenuRole; + } + + if (type == QStringLiteral("create-new")) { + return EndpointType::CreateMenuRole; + } + + return {}; +} + +void EndpointModel::parseElements(const QVariantList &elementsList) +{ + for (const auto &element : elementsList) { + const auto elementMap = element.toMap(); + const auto type = elementMap.value("type").toString(); + const auto endpoints = elementMap.value("endpoints").toList(); + for (const auto &endpoint : endpoints) { + const auto element = endpoint.toMap(); + _endpoints.append({stringToEnum(type), + element.value("name").toString(), + element.value("url").toString()}); + } + } +} + +QVariant EndpointModel::data(const QModelIndex &index, int role) const +{ + Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + switch (role) { + case EndpointTypeRole: + return _endpoints.at(index.row()).type; + case EndpointNameRole: + return _endpoints.at(index.row()).name; + case EndpointUrlRole: + return _endpoints.at(index.row()).url; + } + + return {}; +} + +int EndpointModel::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) { + return 0; + } + + return _endpoints.size(); +} + +QHash EndpointModel::roleNames() const +{ + auto roles = QAbstractListModel::roleNames(); + roles[EndpointTypeRole] = "endpointType"; + roles[EndpointNameRole] = "endpointName"; + roles[EndpointUrlRole] = "endpointUrl"; + + return roles; +} + +} // namespace OCC diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h new file mode 100644 index 0000000000000..7a340a1044d85 --- /dev/null +++ b/src/gui/declarativeui/endpointmodel.h @@ -0,0 +1,51 @@ +/* + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#pragma once + +#include +#include + +namespace OCC { + +class EndpointModel : public QAbstractListModel { + Q_OBJECT + +public: + explicit EndpointModel(QObject *const parent = nullptr); + + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QHash roleNames() const override; + + enum DataRole { + EndpointTypeRole = Qt::UserRole + 1, + EndpointNameRole, + EndpointUrlRole + }; + Q_ENUM(DataRole) + + enum EndpointType { + ContextMenuRole, + CreateMenuRole + }; + Q_ENUM(EndpointType) + + struct Endpoint { + EndpointType type; + QString name; + QString url; + }; + + using Endpoints = QList; + + void parseElements(const QVariantList &elementsList); + +private: + EndpointType stringToEnum(const QString &type); + Endpoints _endpoints; +}; + +} From f37e24d869f119ef840f5c99146482fe5c52b753 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 2 Sep 2025 13:49:21 +0200 Subject: [PATCH 03/30] feat(declarativeui): fetch delcarativeui endpoints in capabilities. Signed-off-by: Camila Ayres --- src/libsync/capabilities.cpp | 13 +++++++++++++ src/libsync/capabilities.h | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 92bfa5d6d73ea..af8a00a45211a 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -437,6 +437,18 @@ QStringList Capabilities::forbiddenFilenameExtensions() const return _capabilities["files"].toMap()["forbidden_filename_extensions"].toStringList(); } +bool Capabilities::serverHasDeclarativeUi() const +{ + return _capabilities[QStringLiteral("declarativeui")].toMap().isEmpty(); +} + +QVariantList Capabilities::declarativeUiEndpoints() const +{ + const auto declarativeUi = _capabilities.value("declarativeui").toMap(); + const auto hooks = declarativeUi.value("hooks").toList(); + return hooks; +} + /*-------------------------------------------------------------------------------------*/ // Direct Editing @@ -466,6 +478,7 @@ DirectEditor* Capabilities::getDirectEditorForOptionalMimetype(const QMimeType & return nullptr; } + /*-------------------------------------------------------------------------------------*/ DirectEditor::DirectEditor(const QString &id, const QString &name, QObject* parent) diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index 68569ab228d44..ece247a65be1d 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -175,6 +175,9 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] bool serverHasValidSubscription() const; [[nodiscard]] QString desktopEnterpriseChannel() const; + [[nodiscard]] bool serverHasDeclarativeUi() const; + [[nodiscard]] QVariantList declarativeUiEndpoints() const; + // Direct Editing void addDirectEditor(DirectEditor* directEditor); DirectEditor* getDirectEditorForMimetype(const QMimeType &mimeType); @@ -184,7 +187,6 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] QMap serverThemingMap() const; QVariantMap _capabilities; - QList _directEditors; }; From 5a64346a4fa169e17ab672549059c268f246e744 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 2 Sep 2025 13:52:27 +0200 Subject: [PATCH 04/30] feat(declarativeui): display application window with declarative ui. - display endpoints in an application window. Signed-off-by: Camila Ayres --- resources.qrc | 2 + src/gui/application.cpp | 3 + src/gui/declarativeui/DeclarativeUiWindow.qml | 103 ++++++++++++++++++ src/gui/declarativeui/FileActionsWindow.qml | 89 +++++++++++++++ src/gui/declarativeui/endpointmodel.cpp | 76 +++++++++---- src/gui/declarativeui/endpointmodel.h | 36 +++--- src/gui/owncloudgui.cpp | 13 +++ src/gui/owncloudgui.h | 2 + src/gui/systray.cpp | 95 ++++++++++++++++ src/gui/systray.h | 6 + 10 files changed, 389 insertions(+), 36 deletions(-) create mode 100644 src/gui/declarativeui/DeclarativeUiWindow.qml create mode 100644 src/gui/declarativeui/FileActionsWindow.qml diff --git a/resources.qrc b/resources.qrc index 2681104929615..0ce9ba9810fd4 100644 --- a/resources.qrc +++ b/resources.qrc @@ -61,5 +61,7 @@ src/gui/ConflictItemFileInfo.qml src/gui/macOS/ui/FileProviderSettings.qml src/gui/macOS/ui/FileProviderFileDelegate.qml + src/gui/declarativeui/DeclarativeUiWindow.qml + src/gui/declarativeui/FileActionsWindow.qml diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 1454d93040963..a7dc38c3500ef 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -431,6 +431,9 @@ Application::Application(int &argc, char **argv) connect(FolderMan::instance()->socketApi(), &SocketApi::fileActivityCommandReceived, _gui.data(), &ownCloudGui::slotShowFileActivityDialog); + connect(FolderMan::instance()->socketApi(), &SocketApi::fileActionsCommandReceived, + _gui.data(), &ownCloudGui::slotShowFileActivityDialog); + // startup procedure. connect(&_checkConnectionTimer, &QTimer::timeout, this, &Application::slotCheckConnection); _checkConnectionTimer.setInterval(ConnectionValidator::DefaultCallingIntervalMsec); // check for connection every 32 seconds. diff --git a/src/gui/declarativeui/DeclarativeUiWindow.qml b/src/gui/declarativeui/DeclarativeUiWindow.qml new file mode 100644 index 0000000000000..d4baaf2a9e17c --- /dev/null +++ b/src/gui/declarativeui/DeclarativeUiWindow.qml @@ -0,0 +1,103 @@ +/* + * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import QtQuick.Controls + +import com.nextcloud.desktopclient +import Style + +ApplicationWindow { + id: root + width: 400 + height: 500 + minimumWidth: 300 + minimumHeight: 300 + LayoutMirroring.childrenInherit: true + LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft + + property var accountState: ({}) + property string localPath: "" + + title: qsTr("Declarative UI for %1").arg(root.localPath) + + Component { + id: declarativeUiDelegate + + Item { + id: declarativeUiItem + width: parent.width + height: 40 + + required property string name + required property string type + required property string label + required property string url + required property string text + + Row { + anchors.fill: parent + anchors.margins: 8 + spacing: 5 + height: implicitHeight + + Row { + anchors.fill: parent + anchors.margins: 8 + spacing: 5 + height: implicitHeight + + Text { + text: declarativeUiItem.text + color: Style.accentColor + font.pixelSize: Style.pixelSize + verticalAlignment: Text.AlignVCenter + visible: declarativeUiItem.name == "Text" + } + + Image { + source: declarativeUiItem.url + width: 50 + height: 50 + verticalAlignment: Text.AlignVCenter + visible: declarativeUiItem.name == "Image" + } + + } + + Button { + text: declarativeUiItem.label + width: 120 + height: 30 + visible: declarativeUiItem.name == "Button" + } + } + } + } + + DeclarativeUi { + id: declarativeUi + accountState: root.accountState + localPath: root.localPath + } + + ListView { + id: declarativeUiView + model: declarativeUi.declarativeUiModel + delegate: declarativeUiDelegate + + anchors.fill: parent + anchors.margins: 10 + + Component.onCompleted: { + console.log("Completed DeclarativeUi ListView!") + console.log("Row count:", declarativeUi.declarativeUiModel.rowCount()) + } + } + + +} diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml new file mode 100644 index 0000000000000..354d132e2f682 --- /dev/null +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -0,0 +1,89 @@ +/* + * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import QtQuick.Controls + +import com.nextcloud.desktopclient +import Style + +ApplicationWindow { + id: root + width: 400 + height: 500 + minimumWidth: 300 + minimumHeight: 300 + LayoutMirroring.childrenInherit: true + LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft + + property var accountState: ({}) + property string localPath: "" + + title: qsTr("File actions for %1").arg(root.localPath) + + Component { + id: fileActionsDelegate + + Item { + id: fileActionsItem + width: parent.width + height: 40 + + required property string type + required property string name + required property string url + + Row { + anchors.fill: parent + anchors.margins: 8 + spacing: 5 + height: implicitHeight + + Text { + text: fileActionsItem.type + color: Style.accentColor + font.pixelSize: Style.pixelSize + verticalAlignment: Text.AlignVCenter + } + + Text { + text: fileActionsItem.name + color: Style.accentColor + font.pixelSize: Style.pixelSize + verticalAlignment: Text.AlignVCenter + } + + Text { + text: fileActionsItem.url + color: Style.accentColor + font.pixelSize: Style.pixelSize + verticalAlignment: Text.AlignVCenter + } + } + } + } + + EndpointModel { + id: endpointModel + accountState: root.accountState + localPath: root.localPath + } + + ListView { + id: fileActionsView + model: endpointModel + delegate: fileActionsDelegate + + anchors.fill: parent + anchors.margins: 10 + + Component.onCompleted: { + console.log("Row count:", endpointModel.rowCount()) + } + } + +} diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp index 6599b60ac599a..8b2c4d64cc4d6 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -4,53 +4,48 @@ */ #include "endpointmodel.h" +#include "account.h" namespace OCC { EndpointModel::EndpointModel(QObject *parent) : QAbstractListModel(parent) { - } -EndpointModel::EndpointType EndpointModel::stringToEnum(const QString &type) +void EndpointModel::parseEndpoints() { - if (type == QStringLiteral("context-menu")) { - return EndpointType::ContextMenuRole; - } - - if (type == QStringLiteral("create-new")) { - return EndpointType::CreateMenuRole; + if (!_accountState->isConnected()) { + return; } - return {}; -} - -void EndpointModel::parseElements(const QVariantList &elementsList) -{ + const auto elementsList = _accountState->account()->capabilities().declarativeUiEndpoints(); for (const auto &element : elementsList) { const auto elementMap = element.toMap(); - const auto type = elementMap.value("type").toString(); + const auto type = elementMap.value("type").toString(); // context-menu, create-new const auto endpoints = elementMap.value("endpoints").toList(); for (const auto &endpoint : endpoints) { const auto element = endpoint.toMap(); - _endpoints.append({stringToEnum(type), + _endpoints.append({element.value("type").toString(), element.value("name").toString(), element.value("url").toString()}); } } + + Q_EMIT endpointModelChanged(); } QVariant EndpointModel::data(const QModelIndex &index, int role) const { Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + const auto row = index.row(); switch (role) { case EndpointTypeRole: - return _endpoints.at(index.row()).type; + return _endpoints.at(row).type; //context-menu, create-new case EndpointNameRole: - return _endpoints.at(index.row()).name; + return _endpoints.at(row).name; // Deck board case EndpointUrlRole: - return _endpoints.at(index.row()).url; + return _endpoints.at(row).url; // /ocs/v2.php/apps/declarativetest/newDeckBoard } return {}; @@ -68,11 +63,50 @@ int EndpointModel::rowCount(const QModelIndex &parent) const QHash EndpointModel::roleNames() const { auto roles = QAbstractListModel::roleNames(); - roles[EndpointTypeRole] = "endpointType"; - roles[EndpointNameRole] = "endpointName"; - roles[EndpointUrlRole] = "endpointUrl"; + roles[EndpointTypeRole] = "type"; + roles[EndpointNameRole] = "name"; + roles[EndpointUrlRole] = "url"; return roles; } +void EndpointModel::setAccountState(AccountState *accountState) +{ + if (accountState == nullptr) { + return; + } + + if (accountState == _accountState) { + return; + } + + _accountState = accountState; + parseEndpoints(); + Q_EMIT accountStateChanged(); +} + +void EndpointModel::setLocalPath(const QString &localPath) +{ + if (localPath.isEmpty()) { + return; + } + + if (localPath == _localPath) { + return; + } + + _localPath = localPath; + Q_EMIT localPathChanged(); +} + +AccountState *EndpointModel::accountState() const +{ + return _accountState; +} + +QString EndpointModel::localPath() const +{ + return _localPath; +} + } // namespace OCC diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h index 7a340a1044d85..e3896b575ca0b 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/endpointmodel.h @@ -8,14 +8,17 @@ #include #include +#include "accountstate.h" + namespace OCC { class EndpointModel : public QAbstractListModel { Q_OBJECT + Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) + Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged) public: explicit EndpointModel(QObject *const parent = nullptr); - [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; [[nodiscard]] QHash roleNames() const override; @@ -27,25 +30,28 @@ class EndpointModel : public QAbstractListModel { }; Q_ENUM(DataRole) - enum EndpointType { - ContextMenuRole, - CreateMenuRole - }; - Q_ENUM(EndpointType) + void parseEndpoints(); - struct Endpoint { - EndpointType type; - QString name; - QString url; - }; + void setAccountState(AccountState *accountState); + void setLocalPath(const QString &localPath); - using Endpoints = QList; + [[nodiscard]] AccountState *accountState() const; + [[nodiscard]] QString localPath() const; - void parseElements(const QVariantList &elementsList); +signals: + void endpointModelChanged(); + void localPathChanged(); + void accountStateChanged(); private: - EndpointType stringToEnum(const QString &type); - Endpoints _endpoints; + struct Endpoint { + QString type; + QString name; + QString url; + }; + QList _endpoints; + AccountState *_accountState; + QString _localPath; }; } diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 75735efab7a5f..1d69d8d6726e8 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -33,6 +33,7 @@ #include "tray/sortedactivitylistmodel.h" #include "tray/syncstatussummary.h" #include "tray/unifiedsearchresultslistmodel.h" +#include "declarativeui/declarativeui.h" #include "filesystem.h" #ifdef WITH_LIBCLOUDPROVIDERS @@ -134,6 +135,8 @@ ownCloudGui::ownCloudGui(Application *parent) qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "ShareeModel"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "SortedShareModel"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel"); + qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "DeclarativeUi"); + qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "EndpointModel"); qmlRegisterUncreatableType("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel"); qmlRegisterUncreatableType("com.nextcloud.desktopclient", 1, 0, "activity", "Activity"); @@ -715,4 +718,14 @@ void ownCloudGui::slotShowFileActivityDialog(const QString &localPath) const _tray->createFileActivityDialog(localPath); } +void ownCloudGui::slotShowDeclarativeUiDialog(const QString &localPath) const +{ + _tray->showDeclarativeUiDialog(localPath); +} + +void ownCloudGui::slotShowFileActionsDialog(const QString &localPath) const +{ + _tray->showFileActionsDialog(localPath); +} + } // end namespace diff --git a/src/gui/owncloudgui.h b/src/gui/owncloudgui.h index 40006a905c190..b069a900c2645 100644 --- a/src/gui/owncloudgui.h +++ b/src/gui/owncloudgui.h @@ -95,6 +95,8 @@ public slots: */ void slotShowShareDialog(const QString &localPath) const; void slotShowFileActivityDialog(const QString &localPath) const; + void slotShowDeclarativeUiDialog(const QString &localPath) const; + void slotShowFileActionsDialog(const QString &localPath) const; void slotNewAccountWizard(); private slots: diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index e9fc7564b75b4..d27837b15a3cd 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -16,6 +16,7 @@ #include "configfile.h" #include "accessmanager.h" #include "callstatechecker.h" +#include "declarativeui/declarativeui.h" #include #include @@ -436,6 +437,88 @@ void Systray::createFileActivityDialog(const QString &localPath) Q_EMIT showFileDetailsPage(localPath, FileDetailsPage::Activity); } +void Systray::showDeclarativeUiDialog(const QString &localPath) +{ + createDeclarativeUiDialog(localPath); +} + +void Systray::showFileActionsDialog(const QString &localPath) +{ + createFileActionsDialog(localPath); +} + +void Systray::createDeclarativeUiDialog(const QString &localPath) +{ + if (!_trayEngine) { + qCWarning(lcSystray) << "Could not open declarative UI dialog for" << localPath << "as no tray engine was available"; + return; + } + + const auto folder = FolderMan::instance()->folderForPath(localPath); + if (!folder) { + qCWarning(lcSystray) << "Could not open declarative UI dialog for" << localPath << "no responsible folder found"; + return; + } + + QQmlComponent declarativeUiQml(trayEngine(), QStringLiteral("qrc:/qml/src/gui/declarativeui/DeclarativeUiWindow.qml")); + if (declarativeUiQml.isError()) { + qCWarning(lcSystray) << declarativeUiQml.errorString(); + qCWarning(lcSystray) << declarativeUiQml.errors(); + return; + } + + const QVariantMap initialProperties{ + {"accountState", QVariant::fromValue(folder->accountState())}, + {"localPath", localPath}, + }; + const auto declarativeUiDialog = declarativeUiQml.createWithInitialProperties(initialProperties); + const auto dialog = qobject_cast(declarativeUiDialog); + if (!dialog) { + qCWarning(lcSystray) << "Declarative UI dialog window resulted in creation of object that was not a window!"; + return; + } + + dialog->show(); + dialog->raise(); + dialog->requestActivate(); +} + +void Systray::createFileActionsDialog(const QString &localPath) +{ + if (!_trayEngine) { + qCWarning(lcSystray) << "Could not open file actions dialog for" << localPath << "as no tray engine was available"; + return; + } + + const auto folder = FolderMan::instance()->folderForPath(localPath); + if (!folder) { + qCWarning(lcSystray) << "Could not open file actions dialog for" << localPath << "no responsible folder found"; + return; + } + + QQmlComponent fileActionsQml(trayEngine(), QStringLiteral("qrc:/qml/src/gui/declarativeui/FileActionsWindow.qml")); + if (fileActionsQml.isError()) { + qCWarning(lcSystray) << fileActionsQml.errorString(); + qCWarning(lcSystray) << fileActionsQml.errors(); + return; + } + + const QVariantMap initialProperties{ + {"accountState", QVariant::fromValue(folder->accountState())}, + {"localPath", localPath}, + }; + const auto fileActionsDialog = fileActionsQml.createWithInitialProperties(initialProperties); + const auto dialog = qobject_cast(fileActionsDialog); + if (!dialog) { + qCWarning(lcSystray) << "File Actions dialog window resulted in creation of object that was not a window!"; + return; + } + + dialog->show(); + dialog->raise(); + dialog->requestActivate(); +} + void Systray::presentShareViewInTray(const QString &localPath) { const auto folder = FolderMan::instance()->folderForPath(localPath); @@ -448,6 +531,18 @@ void Systray::presentShareViewInTray(const QString &localPath) Q_EMIT showFileDetails(folder->accountState(), localPath, FileDetailsPage::Sharing); } +void Systray::presentDeclarativeUiViewInSystray(const QString &localPath) +{ + qCDebug(lcSystray) << "Opening declarative ui view in tray for " << localPath; + createDeclarativeUiDialog(localPath); +} + +void Systray::presentFileActionsViewInSystray(const QString &localPath) +{ + qCDebug(lcSystray) << "Opening file actions view in tray for " << localPath; + createFileActionsDialog(localPath); +} + void Systray::slotCurrentUserChanged() { if (_trayEngine) { diff --git a/src/gui/systray.h b/src/gui/systray.h index 87f4a6b196ccd..cc17353503dce 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -146,8 +146,12 @@ public slots: void createShareDialog(const QString &localPath); void createFileActivityDialog(const QString &localPath); + void showDeclarativeUiDialog(const QString &localPath); + void showFileActionsDialog(const QString &localPath); void presentShareViewInTray(const QString &localPath); + void presentDeclarativeUiViewInSystray(const QString &localPath); + void presentFileActionsViewInSystray(const QString &localPath); private slots: void slotUpdateSyncPausedState(); @@ -165,6 +169,8 @@ private slots: void setupContextMenu(); void createFileDetailsDialog(const QString &localPath); + void createDeclarativeUiDialog(const QString &localPath); + void createFileActionsDialog(const QString &localPath); [[nodiscard]] QScreen *currentScreen() const; [[nodiscard]] QRect currentScreenRect() const; From 394f5319d0b4a1a9efee3ddc1fa24bf595aa79e4 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 2 Sep 2025 16:41:50 +0200 Subject: [PATCH 05/30] feat(declarativeui): list declarative ui and file actions in context menu. - remove EndpointModel from DeclarativeUi class. Signed-off-by: Camila Ayres --- src/gui/application.cpp | 5 ++++- src/gui/declarativeui/declarativeui.cpp | 11 +---------- src/gui/declarativeui/declarativeui.h | 7 +------ src/gui/socketapi/socketapi.cpp | 6 ++++++ src/gui/socketapi/socketapi.h | 2 ++ 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/gui/application.cpp b/src/gui/application.cpp index a7dc38c3500ef..9f1e3234d7410 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -432,7 +432,10 @@ Application::Application(int &argc, char **argv) _gui.data(), &ownCloudGui::slotShowFileActivityDialog); connect(FolderMan::instance()->socketApi(), &SocketApi::fileActionsCommandReceived, - _gui.data(), &ownCloudGui::slotShowFileActivityDialog); + _gui.data(), &ownCloudGui::slotShowFileActionsDialog); + + connect(FolderMan::instance()->socketApi(), &SocketApi::declarativeUiCommandReceived, + _gui.data(), &ownCloudGui::slotShowDeclarativeUiDialog); // startup procedure. connect(&_checkConnectionTimer, &QTimer::timeout, this, &Application::slotCheckConnection); diff --git a/src/gui/declarativeui/declarativeui.cpp b/src/gui/declarativeui/declarativeui.cpp index 1e46453417da4..ab46603ab9230 100644 --- a/src/gui/declarativeui/declarativeui.cpp +++ b/src/gui/declarativeui/declarativeui.cpp @@ -15,12 +15,6 @@ Q_LOGGING_CATEGORY(lcDeclarativeUi, "nextcloud.gui.declarativeui", QtInfoMsg) DeclarativeUi::DeclarativeUi(QObject *parent) : QObject(parent) { - _endpointModel = std::make_unique(this); -} - -void DeclarativeUi::fetchEndpoints() -{ - _endpointModel->parseElements(_accountState->account()->capabilities().declarativeUiEndpoints()); } void DeclarativeUi::setAccountState(AccountState *accountState) @@ -39,6 +33,7 @@ void DeclarativeUi::setAccountState(AccountState *accountState) this, &DeclarativeUi::declarativeUiFetched); connect(this, &DeclarativeUi::declarativeUiFetched, this, &DeclarativeUi::declarativeUiModelChanged); + Q_EMIT accountStateChanged(); } @@ -70,8 +65,4 @@ DeclarativeUiModel *DeclarativeUi::declarativeUiModel() const { return _declarativeUiModel.get(); } -EndpointModel *DeclarativeUi::endpointModel() const { - return _endpointModel.get(); -} - } diff --git a/src/gui/declarativeui/declarativeui.h b/src/gui/declarativeui/declarativeui.h index b1061a2cc45eb..1028a8f688f06 100644 --- a/src/gui/declarativeui/declarativeui.h +++ b/src/gui/declarativeui/declarativeui.h @@ -23,34 +23,29 @@ class DeclarativeUi : public QObject Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged) Q_PROPERTY(DeclarativeUiModel* declarativeUiModel READ declarativeUiModel NOTIFY declarativeUiModelChanged) - Q_PROPERTY(EndpointModel* endpointModel READ endpointModel NOTIFY endpointModelChanged) public: DeclarativeUi(QObject *parent = nullptr); - void fetchEndpoints(); - void setAccountState(AccountState *accountState); void setLocalPath(const QString &localPath); [[nodiscard]] AccountState *accountState() const; [[nodiscard]] QString localPath() const; [[nodiscard]] DeclarativeUiModel *declarativeUiModel() const; - [[nodiscard]] EndpointModel *endpointModel() const; signals: void declarativeUiFetched(); + void endpointsParsed(); void localPathChanged(); void accountStateChanged(); void declarativeUiModelChanged(); - void endpointModelChanged(); private: AccountState *_accountState; QString _localPath; std::unique_ptr _declarativeUiModel; - std::unique_ptr _endpointModel; }; } diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index d2d4576fcc2d6..4021e18d13085 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -621,6 +621,12 @@ void SocketApi::processFileActionsRequest(const QString &localFile) emit fileActionsCommandReceived(fileData.localPath); } +void SocketApi::processDeclarativeUiRequest(const QString &localFile) +{ + const auto fileData = FileData::get(localFile); + emit declarativeUiCommandReceived(fileData.localPath); +} + void SocketApi::broadcastStatusPushMessage(const QString &systemPath, SyncFileStatus fileStatus) { QString msg = buildMessage(QLatin1String("STATUS"), systemPath, fileStatus.toSocketAPIString()); diff --git a/src/gui/socketapi/socketapi.h b/src/gui/socketapi/socketapi.h index b717ab3e65c61..3ed469baaf7a6 100644 --- a/src/gui/socketapi/socketapi.h +++ b/src/gui/socketapi/socketapi.h @@ -65,6 +65,7 @@ public slots: void shareCommandReceived(const QString &localPath); void fileActivityCommandReceived(const QString &localPath); void fileActionsCommandReceived(const QString &localPath); + void declarativeUiCommandReceived(const QString &localPath); private slots: void slotNewConnection(); @@ -109,6 +110,7 @@ private slots: void processFileActivityRequest(const QString &localFile); void processEncryptRequest(const QString &localFile); void processFileActionsRequest(const QString &localFile); + void processDeclarativeUiRequest(const QString &localFile); Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString &argument, OCC::SocketListener *listener); Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString &argument, OCC::SocketListener *listener); From 7f1127f7b3b9506173eeaae3c6b82a8b57eaad8a Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 2 Sep 2025 16:47:55 +0200 Subject: [PATCH 06/30] feat(declarativeui): list declarative ui and file actions in the tray activitiy. Signed-off-by: Camila Ayres --- src/gui/tray/ActivityItemContent.qml | 31 +++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 2260ed8e6e296..6bbf27ae5e95e 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -185,7 +185,36 @@ RowLayout { display: Button.IconOnly visible: model.showFileDetails - onClicked: Systray.presentShareViewInTray(model.openablePath) + onClicked: fileMoreButtonMenu.visible ? fileMoreButtonMenu.close() : fileMoreButtonMenu.popup() + + AutoSizingMenu { + id: fileMoreButtonMenu + closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape + + MenuItem { + height: visible ? implicitHeight : 0 + text: qsTr("File details") + font.pixelSize: Style.topLinePixelSize + hoverEnabled: true + onClicked: Systray.presentShareViewInTray(model.openablePath) + } + + MenuItem { + height: visible ? implicitHeight : 0 + text: qsTr("File actions") + font.pixelSize: Style.topLinePixelSize + hoverEnabled: true + onClicked: Systray.presentFileActionsViewInSystray(model.openablePath) + } + + MenuItem { + height: visible ? implicitHeight : 0 + text: qsTr("Declarative UI") + font.pixelSize: Style.topLinePixelSize + hoverEnabled: true + onClicked: Systray.presentDeclarativeUiViewInSystray(model.openablePath) + } + } } Button { From b99f3eaf8fec3eae75d7fbcaa41abd6f93a35eb1 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 2 Sep 2025 16:51:11 +0200 Subject: [PATCH 07/30] fix(declarativeui): remove log messages. Signed-off-by: Camila Ayres --- src/gui/declarativeui/DeclarativeUiWindow.qml | 5 ----- src/gui/declarativeui/FileActionsWindow.qml | 4 ---- src/gui/declarativeui/declarativeuimodel.cpp | 1 - 3 files changed, 10 deletions(-) diff --git a/src/gui/declarativeui/DeclarativeUiWindow.qml b/src/gui/declarativeui/DeclarativeUiWindow.qml index d4baaf2a9e17c..93ba9e4064275 100644 --- a/src/gui/declarativeui/DeclarativeUiWindow.qml +++ b/src/gui/declarativeui/DeclarativeUiWindow.qml @@ -92,11 +92,6 @@ ApplicationWindow { anchors.fill: parent anchors.margins: 10 - - Component.onCompleted: { - console.log("Completed DeclarativeUi ListView!") - console.log("Row count:", declarativeUi.declarativeUiModel.rowCount()) - } } diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 354d132e2f682..8aa2b09e8937b 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -80,10 +80,6 @@ ApplicationWindow { anchors.fill: parent anchors.margins: 10 - - Component.onCompleted: { - console.log("Row count:", endpointModel.rowCount()) - } } } diff --git a/src/gui/declarativeui/declarativeuimodel.cpp b/src/gui/declarativeui/declarativeuimodel.cpp index c520d03d2b9a9..e3216a6db1de2 100644 --- a/src/gui/declarativeui/declarativeuimodel.cpp +++ b/src/gui/declarativeui/declarativeuimodel.cpp @@ -5,7 +5,6 @@ #include "declarativeuimodel.h" #include "networkjobs.h" -#include "accountstate.h" namespace OCC { From 5e429c279d6fb8fac2789cc2024313356f6c6380 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 2 Sep 2025 21:13:29 +0200 Subject: [PATCH 08/30] feat(declarativeui): add icon and filter to endpoint model and UI. - add one action to the endpoints. Signed-off-by: Camila Ayres --- src/gui/declarativeui/DeclarativeUiWindow.qml | 34 ++++----- src/gui/declarativeui/FileActionsWindow.qml | 71 ++++++++++++------- src/gui/declarativeui/endpointmodel.cpp | 64 ++++++++++++++++- src/gui/declarativeui/endpointmodel.h | 24 ++++++- 4 files changed, 145 insertions(+), 48 deletions(-) diff --git a/src/gui/declarativeui/DeclarativeUiWindow.qml b/src/gui/declarativeui/DeclarativeUiWindow.qml index 93ba9e4064275..d08f05543e79d 100644 --- a/src/gui/declarativeui/DeclarativeUiWindow.qml +++ b/src/gui/declarativeui/DeclarativeUiWindow.qml @@ -45,28 +45,20 @@ ApplicationWindow { spacing: 5 height: implicitHeight - Row { - anchors.fill: parent - anchors.margins: 8 - spacing: 5 - height: implicitHeight - - Text { - text: declarativeUiItem.text - color: Style.accentColor - font.pixelSize: Style.pixelSize - verticalAlignment: Text.AlignVCenter - visible: declarativeUiItem.name == "Text" - } - - Image { - source: declarativeUiItem.url - width: 50 - height: 50 - verticalAlignment: Text.AlignVCenter - visible: declarativeUiItem.name == "Image" - } + Text { + text: declarativeUiItem.text + color: Style.accentColor + font.pixelSize: Style.pixelSize + verticalAlignment: Text.AlignVCenter + visible: declarativeUiItem.name == "Text" + } + Image { + source: declarativeUiItem.url + width: 50 + height: 50 + verticalAlignment: Text.AlignVCenter + visible: declarativeUiItem.name == "Image" } Button { diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 8aa2b09e8937b..e17913cdb8242 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -10,6 +10,7 @@ import QtQuick.Controls import com.nextcloud.desktopclient import Style +import "../tray" ApplicationWindow { id: root @@ -19,12 +20,53 @@ ApplicationWindow { minimumHeight: 300 LayoutMirroring.childrenInherit: true LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft + flags: Qt.Window + color: Style.currentUserHeaderColor property var accountState: ({}) property string localPath: "" title: qsTr("File actions for %1").arg(root.localPath) + EndpointModel { + id: endpointModel + accountState: root.accountState + localPath: root.localPath + } + + RowLayout { + spacing: 8 + Layout.fillWidth: true + + Image { + source: "image://svgimage-custom-color/folder.svg/" + palette.windowText + Layout.minimumWidth: Style.headerButtonIconSize + Layout.minimumHeight: Style.headerButtonIconSize + } + + EnforcedPlainTextLabel { + text: root.localPath + Layout.fillWidth: true + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + } + + Button { + icon.source: "image://svgimage-custom-color/add.svg/" + palette.windowText + icon.width: Style.activityListButtonIconSize + icon.height: Style.activityListButtonIconSize + Layout.minimumWidth: Style.activityListButtonWidth + Layout.minimumHeight: Style.activityListButtonHeight + } + + Button { + icon.source: "image://svgimage-custom-color/close.svg/" + palette.windowText + icon.width: Style.activityListButtonIconSize + icon.height: Style.activityListButtonIconSize + Layout.minimumWidth: Style.activityListButtonWidth + Layout.minimumHeight: Style.activityListButtonHeight + } + } + Component { id: fileActionsDelegate @@ -33,9 +75,7 @@ ApplicationWindow { width: parent.width height: 40 - required property string type required property string name - required property string url Row { anchors.fill: parent @@ -43,36 +83,17 @@ ApplicationWindow { spacing: 5 height: implicitHeight - Text { - text: fileActionsItem.type - color: Style.accentColor - font.pixelSize: Style.pixelSize - verticalAlignment: Text.AlignVCenter - } - - Text { + Button { + icon.source: "image://svgimage-custom-color/files.svg/" + palette.windowText text: fileActionsItem.name - color: Style.accentColor - font.pixelSize: Style.pixelSize - verticalAlignment: Text.AlignVCenter - } - - Text { - text: fileActionsItem.url - color: Style.accentColor font.pixelSize: Style.pixelSize - verticalAlignment: Text.AlignVCenter + height: implicitHeight + onClicked: endpointModel.createRequest(endpointModel.index) } } } } - EndpointModel { - id: endpointModel - accountState: root.accountState - localPath: root.localPath - } - ListView { id: fileActionsView model: endpointModel diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp index 8b2c4d64cc4d6..da4af05566a1f 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -4,6 +4,7 @@ */ #include "endpointmodel.h" +#include "networkjobs.h" #include "account.h" namespace OCC { @@ -28,7 +29,10 @@ void EndpointModel::parseEndpoints() const auto element = endpoint.toMap(); _endpoints.append({element.value("type").toString(), element.value("name").toString(), - element.value("url").toString()}); + element.value("url").toString(), + element.value("desktop_icon").toString(), + element.value("filter").toString(), + element.value("parameter").toString()}); } } @@ -46,6 +50,14 @@ QVariant EndpointModel::data(const QModelIndex &index, int role) const return _endpoints.at(row).name; // Deck board case EndpointUrlRole: return _endpoints.at(row).url; // /ocs/v2.php/apps/declarativetest/newDeckBoard + case EndpointIconRole: + return _endpoints.at(row).icon; // zip + case EndpointFilterRole: + return _endpoints.at(row).filter; // image/ + case EndpointParameterRole: + return _endpoints.at(row).parameter; // fileId + case EndpointVerbRole: + return _endpoints.at(row).verb; // POST, GET } return {}; @@ -66,6 +78,10 @@ QHash EndpointModel::roleNames() const roles[EndpointTypeRole] = "type"; roles[EndpointNameRole] = "name"; roles[EndpointUrlRole] = "url"; + roles[EndpointIconRole] = "icon"; + roles[EndpointFilterRole] = "filter"; + roles[EndpointParameterRole] = "parameter"; + roles[EndpointVerbRole] = "verb"; return roles; } @@ -109,4 +125,50 @@ QString EndpointModel::localPath() const return _localPath; } +void EndpointModel::createRequest(const int row) +{ + if (!_accountState) { + return; + } + + auto job = new JsonApiJob(_accountState->account(), + _endpoints.at(row).url, + this); + connect(job, &JsonApiJob::jsonReceived, + this, &EndpointModel::processRequest); + QUrlQuery params; + params.addQueryItem(_endpoints.at(row).parameter, 0); //fileId + job->addQueryParams(params); + job->setVerb(SimpleApiJob::Verb::Post); //fixit _endpoints.at(row).verb + job->start(); +} + +void EndpointModel::processRequest(const QJsonDocument &json) +{ + const auto root = json.object().value(QStringLiteral("root")).toObject(); + if (root.empty()) { + return; + } + const auto orientation = root.value(QStringLiteral("orientation")).toString(); + const auto rows = root.value(QStringLiteral("rows")).toArray(); + if (rows.empty()) { + return; + } + + for (const auto &rowValue : rows) { + const auto row = rowValue.toObject(); + const auto children = row.value("children").toArray(); + + for (const auto &childValue : children) { + const auto child = childValue.toObject(); + _response.name = child.value(QStringLiteral("element")).toString(); + _response.type = child.value(QStringLiteral("type")).toString(); + _response.label = child.value(QStringLiteral("label")).toString(); + _response.url = _accountState->account()->url().toString() + + child.value(QStringLiteral("url")).toString(); + _response.text = child.value(QStringLiteral("text")).toString(); + } + } +} + } // namespace OCC diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h index e3896b575ca0b..2f63e69c537df 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/endpointmodel.h @@ -26,7 +26,11 @@ class EndpointModel : public QAbstractListModel { enum DataRole { EndpointTypeRole = Qt::UserRole + 1, EndpointNameRole, - EndpointUrlRole + EndpointUrlRole, + EndpointIconRole, + EndpointFilterRole, + EndpointParameterRole, + EndpointVerbRole }; Q_ENUM(DataRole) @@ -42,12 +46,30 @@ class EndpointModel : public QAbstractListModel { void endpointModelChanged(); void localPathChanged(); void accountStateChanged(); + void requestDone(); + +public slots: + void createRequest(const int row); + void processRequest(const QJsonDocument &json); private: + struct Response { + QString name; + QString type; + QString label; + QString url; + QString text; + }; + Response _response; + struct Endpoint { QString type; QString name; QString url; + QString icon; + QString filter; + QString parameter; + QString verb; }; QList _endpoints; AccountState *_accountState; From 12a628f4dd1af06a62836f1802f242ac7504c1a0 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 3 Sep 2025 18:18:00 +0200 Subject: [PATCH 09/30] feat: style file actions window. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 156 ++++++++++++-------- src/gui/systray.cpp | 6 +- 2 files changed, 99 insertions(+), 63 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index e17913cdb8242..36f162cdc39bd 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -7,26 +7,23 @@ import QtQuick import QtQuick.Window import QtQuick.Layouts import QtQuick.Controls - import com.nextcloud.desktopclient import Style -import "../tray" ApplicationWindow { id: root width: 400 - height: 500 + height: 300 minimumWidth: 300 - minimumHeight: 300 - LayoutMirroring.childrenInherit: true - LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft - flags: Qt.Window - color: Style.currentUserHeaderColor + minimumHeight: 200 + flags: Qt.Dialog + visible: true property var accountState: ({}) property string localPath: "" + property string shortLocalPath: "" - title: qsTr("File actions for %1").arg(root.localPath) + title: qsTr("File actions for %1").arg(root.shortLocalPath) EndpointModel { id: endpointModel @@ -34,73 +31,108 @@ ApplicationWindow { localPath: root.localPath } - RowLayout { - spacing: 8 - Layout.fillWidth: true + Rectangle { + anchors.fill: parent + color: Style.infoBoxBackgroundColor + //radius: Style.trayWindowRadius + border.color: Style.accentColor + + ColumnLayout { + anchors.fill: parent + anchors.margins: Style.standardSpacing + spacing: Style.standardSpacing + + RowLayout { + Layout.fillWidth: true + spacing: Style.standardSpacing + + Image { + source: "image://svgimage-custom-color/files.svg/" + palette.windowText + width: Style.minimumActivityItemHeight + height: Style.minimumActivityItemHeight + } - Image { - source: "image://svgimage-custom-color/folder.svg/" + palette.windowText - Layout.minimumWidth: Style.headerButtonIconSize - Layout.minimumHeight: Style.headerButtonIconSize - } + ColumnLayout { + Layout.fillWidth: true + spacing: Style.extraSmallSpacing - EnforcedPlainTextLabel { - text: root.localPath - Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft - } + Label { + text: root.shortLocalPath + font.bold: true + font.pixelSize: Style.pixelSize + color: Style.ncHeaderTextColor + } + } + } - Button { - icon.source: "image://svgimage-custom-color/add.svg/" + palette.windowText - icon.width: Style.activityListButtonIconSize - icon.height: Style.activityListButtonIconSize - Layout.minimumWidth: Style.activityListButtonWidth - Layout.minimumHeight: Style.activityListButtonHeight - } + Rectangle { + Layout.fillWidth: true + height: Style.extraExtraSmallSpacing + color: Style.accentColor + } - Button { - icon.source: "image://svgimage-custom-color/close.svg/" + palette.windowText - icon.width: Style.activityListButtonIconSize - icon.height: Style.activityListButtonIconSize - Layout.minimumWidth: Style.activityListButtonWidth - Layout.minimumHeight: Style.activityListButtonHeight + ListView { + id: fileActionsView + model: endpointModel + clip: true + spacing: Style.trayHorizontalMargin + Layout.fillWidth: true + Layout.fillHeight: true + delegate: fileActionsDelegate + } + + Rectangle { + Layout.fillWidth: true + height: Style.extraExtraSmallSpacing + color: Style.accentColor + } } } Component { id: fileActionsDelegate - Item { - id: fileActionsItem - width: parent.width - height: 40 + RowLayout { + Layout.fillWidth: true + spacing: Style.standardSpacing + height: implicitHeight required property string name - - Row { - anchors.fill: parent - anchors.margins: 8 - spacing: 5 - height: implicitHeight - - Button { - icon.source: "image://svgimage-custom-color/files.svg/" + palette.windowText - text: fileActionsItem.name - font.pixelSize: Style.pixelSize - height: implicitHeight - onClicked: endpointModel.createRequest(endpointModel.index) + required property int index + + Button { + Layout.fillWidth: true + implicitHeight: Style.activityListButtonHeight + + padding: 0 + leftPadding: Style.standardSpacing + rightPadding: Style.standardSpacing + spacing: Style.standardSpacing + + contentItem: Row { + anchors.fill: parent + anchors.margins: Style.smallSpacing + spacing: Style.standardSpacing + + Image { + source: "image://svgimage-custom-color/settings.svg/" + palette.windowText + width: Style.minimumActivityItemHeight + height: Style.minimumActivityItemHeight + fillMode: Image.PreserveAspectFit + anchors.verticalCenter: parent.verticalCenter + } + + Label { + text: name + color: Style.ncHeaderTextColor + font.pixelSize: Style.pixelSize + verticalAlignment: Text.AlignVCenter + anchors.verticalCenter: parent.verticalCenter + } } + + onClicked: endpointModel.createRequest(index) } } } - - ListView { - id: fileActionsView - model: endpointModel - delegate: fileActionsDelegate - - anchors.fill: parent - anchors.margins: 10 - } - } diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index d27837b15a3cd..6c7554bccbf3f 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -503,10 +503,14 @@ void Systray::createFileActionsDialog(const QString &localPath) return; } + QFileInfo localFile{localPath}; + const auto shortLocalPath = localFile.fileName(); const QVariantMap initialProperties{ {"accountState", QVariant::fromValue(folder->accountState())}, - {"localPath", localPath}, + {"shortLocalPath", shortLocalPath}, + {"localPath", localPath} }; + const auto fileActionsDialog = fileActionsQml.createWithInitialProperties(initialProperties); const auto dialog = qobject_cast(fileActionsDialog); if (!dialog) { From af8c1b2a192a9c12c49e31c14ccb6733cb156922 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 3 Sep 2025 19:15:40 +0200 Subject: [PATCH 10/30] feat: display response from request from file actions. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 22 ++++++++ src/gui/declarativeui/endpointmodel.cpp | 61 ++++++++++++++++++++- src/gui/declarativeui/endpointmodel.h | 39 ++++++++++--- 3 files changed, 113 insertions(+), 9 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 36f162cdc39bd..10720ab3b6cf0 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -22,6 +22,7 @@ ApplicationWindow { property var accountState: ({}) property string localPath: "" property string shortLocalPath: "" + property var response: ({}) title: qsTr("File actions for %1").arg(root.shortLocalPath) @@ -86,6 +87,27 @@ ApplicationWindow { height: Style.extraExtraSmallSpacing color: Style.accentColor } + + Text { + id: response + text: endpointModel.declarativeUiText + textFormat: Text.RichText + color: Style.ncHeaderTextColor + font.pointSize: Style.pixelSize + font.underline: true + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: Qt.openUrlExternally(endpointModel.declarativeUiUrl) + } + } + + Rectangle { + visible: response.text != "" + Layout.fillWidth: true + height: Style.extraExtraSmallSpacing + color: Style.accentColor + } } } diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp index da4af05566a1f..7589cd034c528 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -32,7 +32,8 @@ void EndpointModel::parseEndpoints() element.value("url").toString(), element.value("desktop_icon").toString(), element.value("filter").toString(), - element.value("parameter").toString()}); + element.value("parameter").toString(), + element.value("verb").toString()}); } } @@ -115,6 +116,12 @@ void EndpointModel::setLocalPath(const QString &localPath) Q_EMIT localPathChanged(); } +void EndpointModel::setResponse(const Response &response) +{ + _response = response; + Q_EMIT responseChanged(); +} + AccountState *EndpointModel::accountState() const { return _accountState; @@ -125,6 +132,56 @@ QString EndpointModel::localPath() const return _localPath; } +QString EndpointModel::name() const +{ + return _response.name; +} + +void EndpointModel::setName(const QString &name) +{ + _response.name = name; +} + +QString EndpointModel::type() const +{ + return _response.type; +} + +void EndpointModel::setType(const QString &type) +{ + _response.type = type; +} + +QString EndpointModel::label() const +{ + return _response.label; +} + +void EndpointModel::setLabel(const QString &label) +{ + _response.label = label; +} + +QString EndpointModel::url() const +{ + return _response.url; +} + +void EndpointModel::setUrl(const QString &url) +{ + _response.url = url; +} + +QString EndpointModel::text() const +{ + return _response.text; +} + +void EndpointModel::setText(const QString &text) +{ + _response.text = text; +} + void EndpointModel::createRequest(const int row) { if (!_accountState) { @@ -169,6 +226,8 @@ void EndpointModel::processRequest(const QJsonDocument &json) _response.text = child.value(QStringLiteral("text")).toString(); } } + + Q_EMIT responseChanged(); } } // namespace OCC diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h index 2f63e69c537df..ceec6c5ec30c2 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/endpointmodel.h @@ -16,6 +16,11 @@ class EndpointModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged) + Q_PROPERTY(QString declarativeUiName READ name WRITE setName NOTIFY responseChanged) + Q_PROPERTY(QString declarativeUiType READ type WRITE setType NOTIFY responseChanged) + Q_PROPERTY(QString declarativeUiLabel READ type WRITE setLabel NOTIFY responseChanged) + Q_PROPERTY(QString declarativeUiUrl READ url WRITE setUrl NOTIFY responseChanged) + Q_PROPERTY(QString declarativeUiText READ text WRITE setText NOTIFY responseChanged) public: explicit EndpointModel(QObject *const parent = nullptr); @@ -34,32 +39,50 @@ class EndpointModel : public QAbstractListModel { }; Q_ENUM(DataRole) + struct Response { + QString name; + QString type; + QString label; + QString url; + QString text; + }; + void parseEndpoints(); void setAccountState(AccountState *accountState); void setLocalPath(const QString &localPath); + void setResponse(const Response &response); [[nodiscard]] AccountState *accountState() const; [[nodiscard]] QString localPath() const; + [[nodiscard]] QString name() const; + void setName(const QString &name); + + [[nodiscard]] QString type() const; + void setType(const QString &type); + + [[nodiscard]] QString label() const; + void setLabel(const QString &label); + + [[nodiscard]] QString url() const; + void setUrl(const QString &url); + + [[nodiscard]] QString text() const; + void setText(const QString &text); + + signals: void endpointModelChanged(); void localPathChanged(); void accountStateChanged(); - void requestDone(); + void responseChanged(); public slots: void createRequest(const int row); void processRequest(const QJsonDocument &json); private: - struct Response { - QString name; - QString type; - QString label; - QString url; - QString text; - }; Response _response; struct Endpoint { From 609be60c444eae52d45928138c31c7fb27d661e7 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 3 Sep 2025 21:30:13 +0200 Subject: [PATCH 11/30] feat(declarativeui): improve the looks of the file actions Window. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 61 +++++++++++++++++---- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 10720ab3b6cf0..03fe44431f895 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -88,17 +88,51 @@ ApplicationWindow { color: Style.accentColor } - Text { - id: response - text: endpointModel.declarativeUiText - textFormat: Text.RichText - color: Style.ncHeaderTextColor - font.pointSize: Style.pixelSize - font.underline: true - MouseArea { + Button { + id: responseButton + visible: response.text !== "" + flat: true + Layout.fillWidth: true + implicitHeight: Style.activityListButtonHeight + + padding: 0 + leftPadding: Style.standardSpacing + rightPadding: Style.standardSpacing + spacing: Style.standardSpacing + + contentItem: Row { anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: Qt.openUrlExternally(endpointModel.declarativeUiUrl) + anchors.margins: Style.smallSpacing + spacing: Style.standardSpacing + + Image { + source: "image://svgimage-custom-color/public.svg/" + palette.windowText + width: Style.minimumActivityItemHeight + height: Style.minimumActivityItemHeight + fillMode: Image.PreserveAspectFit + anchors.verticalCenter: parent.verticalCenter + } + + Text { + id: response + text: endpointModel.declarativeUiText + textFormat: Text.RichText + color: Style.ncHeaderTextColor + font.pointSize: Style.pixelSize + font.underline: true + anchors.verticalCenter: parent.verticalCenter + MouseArea { + id: responseArea + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: Qt.openUrlExternally(endpointModel.declarativeUiUrl) + } + } + } + + ToolTip { + visible: responseButton.hovered + text: qsTr("Download file") } } @@ -123,6 +157,8 @@ ApplicationWindow { required property int index Button { + id: fileActionButton + flat: true Layout.fillWidth: true implicitHeight: Style.activityListButtonHeight @@ -153,6 +189,11 @@ ApplicationWindow { } } + ToolTip { + visible: fileActionButton.hovered + text: name + } + onClicked: endpointModel.createRequest(index) } } From a1d0ff2fbdd2ff9d76b556573a678f8f58279927 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Thu, 4 Sep 2025 11:01:07 +0200 Subject: [PATCH 12/30] fix: context menu. Signed-off-by: Camila Ayres --- src/gui/socketapi/socketapi.cpp | 11 ++++++++++- src/gui/socketapi/socketapi.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index 4021e18d13085..49725041c04c5 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -1135,9 +1135,9 @@ void SocketApi::command_GET_STRINGS(const QString &argument, SocketListener *lis { static std::array, 7> strings { { { "SHARE_MENU_TITLE", tr("Share options") }, + { "FILE_ACTIONS_MENU_TITLE", tr("File actions") }, { "FILE_ACTIVITY_MENU_TITLE", tr("Activity") }, { "CONTEXT_MENU_TITLE", Theme::instance()->appNameGUI() }, - { "FILE_ACTIONS_MENU_TITLE", tr("File actions") }, { "COPY_PRIVATE_LINK_MENU_TITLE", tr("Copy private link to clipboard") }, { "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email …") }, { "CONTEXT_MENU_ICON", APPLICATION_ICON_NAME }, @@ -1184,6 +1184,14 @@ void SocketApi::sendSharingContextMenuOptions(const FileData &fileData, SocketLi //listener->sendMessage(QLatin1String("MENU_ITEM:EMAIL_PRIVATE_LINK") + flagString + tr("Send private link by email …")); } +void SocketApi::sendFileActionsContextMenuOptions(const FileData &fileData, SocketListener *listener) +{ + const auto record = fileData.journalRecord(); + const auto isOnTheServer = record.isValid(); + const auto flagString = isOnTheServer ? QLatin1String("::") : QLatin1String(":d:"); + listener->sendMessage(QLatin1String("MENU_ITEM:FILE_ACTIONS") + flagString + tr("File actions")); +} + void SocketApi::sendEncryptFolderCommandMenuEntries(const QFileInfo &fileInfo, const FileData &fileData, const bool isE2eEncryptedPath, @@ -1368,6 +1376,7 @@ void SocketApi::command_GET_MENU_ITEMS(const QString &argument, OCC::SocketListe const auto itemEncryptionFlag = isE2eEncryptedPath ? SharingContextItemEncryptedFlag::EncryptedItem : SharingContextItemEncryptedFlag::NotEncryptedItem; const auto rootE2eeFolderFlag = isE2eEncryptedRootFolder ? SharingContextItemRootEncryptedFolderFlag::RootEncryptedFolder : SharingContextItemRootEncryptedFolderFlag::NonRootEncryptedFolder; sendSharingContextMenuOptions(fileData, listener, itemEncryptionFlag, rootE2eeFolderFlag); + sendFileActionsContextMenuOptions(fileData, listener); // Conflict files get conflict resolution actions bool isConflict = Utility::isConflictFile(fileData.folderRelativePath); diff --git a/src/gui/socketapi/socketapi.h b/src/gui/socketapi/socketapi.h index 3ed469baaf7a6..b6cfa102ef7b7 100644 --- a/src/gui/socketapi/socketapi.h +++ b/src/gui/socketapi/socketapi.h @@ -154,7 +154,7 @@ private slots: // Sends the context menu options relating to sharing to listener void sendSharingContextMenuOptions(const FileData &fileData, SocketListener *listener, SharingContextItemEncryptedFlag itemEncryptionFlag, SharingContextItemRootEncryptedFolderFlag rootE2eeFolderFlag); - + void sendFileActionsContextMenuOptions(const FileData &fileData, SocketListener *listener); void sendEncryptFolderCommandMenuEntries(const QFileInfo &fileInfo, const FileData &fileData, const bool isE2eEncryptedPath, From eb5cb875e3f4e2ff4b8bc91074b73c4cf5c963d7 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 16 Sep 2025 14:27:42 +0200 Subject: [PATCH 13/30] fix: update datat parsing to new API format. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 14 +++- src/gui/declarativeui/endpointmodel.cpp | 92 +++++++-------------- src/gui/declarativeui/endpointmodel.h | 37 +++------ src/libsync/capabilities.cpp | 5 +- src/libsync/capabilities.h | 2 +- 5 files changed, 55 insertions(+), 95 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 03fe44431f895..9b48aa7082527 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -44,6 +44,7 @@ ApplicationWindow { spacing: Style.standardSpacing RowLayout { + id: windowHeader Layout.fillWidth: true spacing: Style.standardSpacing @@ -67,6 +68,7 @@ ApplicationWindow { } Rectangle { + id: lineTop Layout.fillWidth: true height: Style.extraExtraSmallSpacing color: Style.accentColor @@ -83,6 +85,7 @@ ApplicationWindow { } Rectangle { + id: lineBottom Layout.fillWidth: true height: Style.extraExtraSmallSpacing color: Style.accentColor @@ -101,6 +104,7 @@ ApplicationWindow { spacing: Style.standardSpacing contentItem: Row { + id: responseContent anchors.fill: parent anchors.margins: Style.smallSpacing spacing: Style.standardSpacing @@ -115,7 +119,7 @@ ApplicationWindow { Text { id: response - text: endpointModel.declarativeUiText + text: endpointModel.responseLabel textFormat: Text.RichText color: Style.ncHeaderTextColor font.pointSize: Style.pixelSize @@ -125,18 +129,19 @@ ApplicationWindow { id: responseArea anchors.fill: parent cursorShape: Qt.PointingHandCursor - onClicked: Qt.openUrlExternally(endpointModel.declarativeUiUrl) + onClicked: Qt.openUrlExternally(endpointModel.responseUrl) } } } ToolTip { visible: responseButton.hovered - text: qsTr("Download file") + text: endpointModel.responseLabel } } Rectangle { + id: repsonseLineBottom visible: response.text != "" Layout.fillWidth: true height: Style.extraExtraSmallSpacing @@ -168,12 +173,13 @@ ApplicationWindow { spacing: Style.standardSpacing contentItem: Row { + id: fileActionsContent anchors.fill: parent anchors.margins: Style.smallSpacing spacing: Style.standardSpacing Image { - source: "image://svgimage-custom-color/settings.svg/" + palette.windowText + source: icon width: Style.minimumActivityItemHeight height: Style.minimumActivityItemHeight fillMode: Image.PreserveAspectFit diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp index 7589cd034c528..351fe0608d3eb 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -20,20 +20,22 @@ void EndpointModel::parseEndpoints() return; } - const auto elementsList = _accountState->account()->capabilities().declarativeUiEndpoints(); - for (const auto &element : elementsList) { - const auto elementMap = element.toMap(); - const auto type = elementMap.value("type").toString(); // context-menu, create-new - const auto endpoints = elementMap.value("endpoints").toList(); - for (const auto &endpoint : endpoints) { - const auto element = endpoint.toMap(); - _endpoints.append({element.value("type").toString(), - element.value("name").toString(), - element.value("url").toString(), - element.value("desktop_icon").toString(), - element.value("filter").toString(), - element.value("parameter").toString(), - element.value("verb").toString()}); + const auto declarativeUiMap = _accountState->account()->capabilities().declarativeUiEndpoints(); + for (auto declarativeUiApp : std::as_const(declarativeUiMap)) { + const auto contextMenuMap = declarativeUiApp.toMap(); + for (const auto &contextMenuItem : contextMenuMap) { + const auto contextMenuList = contextMenuItem.toList(); + for (const auto &contextMenuMap : contextMenuList) { + const auto contextMenu = contextMenuMap.toMap(); + _endpoints.append({contextMenu.value("type").toString(), + _accountState->account()->url().toString() + + contextMenu.value("icon").toString(), + contextMenu.value("name").toString(), + contextMenu.value("url").toString(), + contextMenu.value("method").toString(), + contextMenu.value("mimetypeFilters").toString(), + contextMenu.value("params").toString()}); + } } } @@ -47,18 +49,18 @@ QVariant EndpointModel::data(const QModelIndex &index, int role) const switch (role) { case EndpointTypeRole: return _endpoints.at(row).type; //context-menu, create-new + case EndpointIconRole: + return _endpoints.at(row).icon; // deck.svg case EndpointNameRole: - return _endpoints.at(row).name; // Deck board + return _endpoints.at(row).name; // Convert file case EndpointUrlRole: return _endpoints.at(row).url; // /ocs/v2.php/apps/declarativetest/newDeckBoard - case EndpointIconRole: - return _endpoints.at(row).icon; // zip - case EndpointFilterRole: - return _endpoints.at(row).filter; // image/ - case EndpointParameterRole: - return _endpoints.at(row).parameter; // fileId - case EndpointVerbRole: - return _endpoints.at(row).verb; // POST, GET + case EndpointMethodRole: + return _endpoints.at(row).method; // GET + case EndpointMimetypeFiltersRole: + return _endpoints.at(row).mimetypeFilters; // image + case EndpointParamsRole: + return _endpoints.at(row).params; // filePath } return {}; @@ -77,12 +79,12 @@ QHash EndpointModel::roleNames() const { auto roles = QAbstractListModel::roleNames(); roles[EndpointTypeRole] = "type"; + roles[EndpointIconRole] = "icon"; roles[EndpointNameRole] = "name"; roles[EndpointUrlRole] = "url"; - roles[EndpointIconRole] = "icon"; - roles[EndpointFilterRole] = "filter"; - roles[EndpointParameterRole] = "parameter"; - roles[EndpointVerbRole] = "verb"; + roles[EndpointMethodRole] = "method"; + roles[EndpointMimetypeFiltersRole] = "mimeTypeFilters"; + roles[EndpointParamsRole] = "params"; return roles; } @@ -132,25 +134,6 @@ QString EndpointModel::localPath() const return _localPath; } -QString EndpointModel::name() const -{ - return _response.name; -} - -void EndpointModel::setName(const QString &name) -{ - _response.name = name; -} - -QString EndpointModel::type() const -{ - return _response.type; -} - -void EndpointModel::setType(const QString &type) -{ - _response.type = type; -} QString EndpointModel::label() const { @@ -172,16 +155,6 @@ void EndpointModel::setUrl(const QString &url) _response.url = url; } -QString EndpointModel::text() const -{ - return _response.text; -} - -void EndpointModel::setText(const QString &text) -{ - _response.text = text; -} - void EndpointModel::createRequest(const int row) { if (!_accountState) { @@ -194,7 +167,7 @@ void EndpointModel::createRequest(const int row) connect(job, &JsonApiJob::jsonReceived, this, &EndpointModel::processRequest); QUrlQuery params; - params.addQueryItem(_endpoints.at(row).parameter, 0); //fileId + params.addQueryItem(_endpoints.at(row).params, 0); //fileId job->addQueryParams(params); job->setVerb(SimpleApiJob::Verb::Post); //fixit _endpoints.at(row).verb job->start(); @@ -218,12 +191,9 @@ void EndpointModel::processRequest(const QJsonDocument &json) for (const auto &childValue : children) { const auto child = childValue.toObject(); - _response.name = child.value(QStringLiteral("element")).toString(); - _response.type = child.value(QStringLiteral("type")).toString(); - _response.label = child.value(QStringLiteral("label")).toString(); + _response.label = child.value(QStringLiteral("element")).toString(); _response.url = _accountState->account()->url().toString() + child.value(QStringLiteral("url")).toString(); - _response.text = child.value(QStringLiteral("text")).toString(); } } diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h index ceec6c5ec30c2..ba8f19e9c7c84 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/endpointmodel.h @@ -14,13 +14,11 @@ namespace OCC { class EndpointModel : public QAbstractListModel { Q_OBJECT + Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged) - Q_PROPERTY(QString declarativeUiName READ name WRITE setName NOTIFY responseChanged) - Q_PROPERTY(QString declarativeUiType READ type WRITE setType NOTIFY responseChanged) - Q_PROPERTY(QString declarativeUiLabel READ type WRITE setLabel NOTIFY responseChanged) - Q_PROPERTY(QString declarativeUiUrl READ url WRITE setUrl NOTIFY responseChanged) - Q_PROPERTY(QString declarativeUiText READ text WRITE setText NOTIFY responseChanged) + Q_PROPERTY(QString responseLabel READ label WRITE setLabel NOTIFY responseChanged) + Q_PROPERTY(QString responseUrl READ url WRITE setUrl NOTIFY responseChanged) public: explicit EndpointModel(QObject *const parent = nullptr); @@ -30,21 +28,18 @@ class EndpointModel : public QAbstractListModel { enum DataRole { EndpointTypeRole = Qt::UserRole + 1, + EndpointIconRole, EndpointNameRole, EndpointUrlRole, - EndpointIconRole, - EndpointFilterRole, - EndpointParameterRole, - EndpointVerbRole + EndpointMethodRole, + EndpointMimetypeFiltersRole, + EndpointParamsRole }; Q_ENUM(DataRole) struct Response { - QString name; - QString type; QString label; QString url; - QString text; }; void parseEndpoints(); @@ -56,22 +51,12 @@ class EndpointModel : public QAbstractListModel { [[nodiscard]] AccountState *accountState() const; [[nodiscard]] QString localPath() const; - [[nodiscard]] QString name() const; - void setName(const QString &name); - - [[nodiscard]] QString type() const; - void setType(const QString &type); - [[nodiscard]] QString label() const; void setLabel(const QString &label); [[nodiscard]] QString url() const; void setUrl(const QString &url); - [[nodiscard]] QString text() const; - void setText(const QString &text); - - signals: void endpointModelChanged(); void localPathChanged(); @@ -87,12 +72,12 @@ public slots: struct Endpoint { QString type; + QString icon; QString name; QString url; - QString icon; - QString filter; - QString parameter; - QString verb; + QString method; + QString mimetypeFilters; + QString params; }; QList _endpoints; AccountState *_accountState; diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index af8a00a45211a..7de47f90813e5 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -442,11 +442,10 @@ bool Capabilities::serverHasDeclarativeUi() const return _capabilities[QStringLiteral("declarativeui")].toMap().isEmpty(); } -QVariantList Capabilities::declarativeUiEndpoints() const +QVariantMap Capabilities::declarativeUiEndpoints() const { const auto declarativeUi = _capabilities.value("declarativeui").toMap(); - const auto hooks = declarativeUi.value("hooks").toList(); - return hooks; + return declarativeUi; } /*-------------------------------------------------------------------------------------*/ diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index ece247a65be1d..4c564c3e98689 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -176,7 +176,7 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] QString desktopEnterpriseChannel() const; [[nodiscard]] bool serverHasDeclarativeUi() const; - [[nodiscard]] QVariantList declarativeUiEndpoints() const; + [[nodiscard]] QVariantMap declarativeUiEndpoints() const; // Direct Editing void addDirectEditor(DirectEditor* directEditor); From a10316754888707a939fa96afac8308fc2d4b9b3 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 16 Sep 2025 17:44:38 +0200 Subject: [PATCH 14/30] feat: add helper function to match string to SimpleApiJob::Verb. - use the file id in file actions requests. - filter and display file actions based on the file mimetype. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 1 + src/gui/declarativeui/endpointmodel.cpp | 130 +++++++++++++------- src/gui/declarativeui/endpointmodel.h | 30 +++-- src/gui/systray.cpp | 2 +- src/libsync/capabilities.cpp | 44 +++++++ src/libsync/capabilities.h | 2 + src/libsync/networkjobs.cpp | 17 +++ src/libsync/networkjobs.h | 2 + 8 files changed, 170 insertions(+), 58 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 9b48aa7082527..aa667988435cc 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -160,6 +160,7 @@ ApplicationWindow { required property string name required property int index + required property string icon Button { id: fileActionButton diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp index 351fe0608d3eb..e18f1a7780f44 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -6,6 +6,7 @@ #include "endpointmodel.h" #include "networkjobs.h" #include "account.h" +#include "folderman.h" namespace OCC { @@ -14,41 +15,11 @@ EndpointModel::EndpointModel(QObject *parent) { } -void EndpointModel::parseEndpoints() -{ - if (!_accountState->isConnected()) { - return; - } - - const auto declarativeUiMap = _accountState->account()->capabilities().declarativeUiEndpoints(); - for (auto declarativeUiApp : std::as_const(declarativeUiMap)) { - const auto contextMenuMap = declarativeUiApp.toMap(); - for (const auto &contextMenuItem : contextMenuMap) { - const auto contextMenuList = contextMenuItem.toList(); - for (const auto &contextMenuMap : contextMenuList) { - const auto contextMenu = contextMenuMap.toMap(); - _endpoints.append({contextMenu.value("type").toString(), - _accountState->account()->url().toString() - + contextMenu.value("icon").toString(), - contextMenu.value("name").toString(), - contextMenu.value("url").toString(), - contextMenu.value("method").toString(), - contextMenu.value("mimetypeFilters").toString(), - contextMenu.value("params").toString()}); - } - } - } - - Q_EMIT endpointModelChanged(); -} - QVariant EndpointModel::data(const QModelIndex &index, int role) const { Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid)); const auto row = index.row(); switch (role) { - case EndpointTypeRole: - return _endpoints.at(row).type; //context-menu, create-new case EndpointIconRole: return _endpoints.at(row).icon; // deck.svg case EndpointNameRole: @@ -57,8 +28,6 @@ QVariant EndpointModel::data(const QModelIndex &index, int role) const return _endpoints.at(row).url; // /ocs/v2.php/apps/declarativetest/newDeckBoard case EndpointMethodRole: return _endpoints.at(row).method; // GET - case EndpointMimetypeFiltersRole: - return _endpoints.at(row).mimetypeFilters; // image case EndpointParamsRole: return _endpoints.at(row).params; // filePath } @@ -78,17 +47,20 @@ int EndpointModel::rowCount(const QModelIndex &parent) const QHash EndpointModel::roleNames() const { auto roles = QAbstractListModel::roleNames(); - roles[EndpointTypeRole] = "type"; roles[EndpointIconRole] = "icon"; roles[EndpointNameRole] = "name"; roles[EndpointUrlRole] = "url"; roles[EndpointMethodRole] = "method"; - roles[EndpointMimetypeFiltersRole] = "mimeTypeFilters"; roles[EndpointParamsRole] = "params"; return roles; } +AccountState *EndpointModel::accountState() const +{ + return _accountState; +} + void EndpointModel::setAccountState(AccountState *accountState) { if (accountState == nullptr) { @@ -100,10 +72,15 @@ void EndpointModel::setAccountState(AccountState *accountState) } _accountState = accountState; - parseEndpoints(); Q_EMIT accountStateChanged(); } +QString EndpointModel::localPath() const +{ + return _localPath; +} + + void EndpointModel::setLocalPath(const QString &localPath) { if (localPath.isEmpty()) { @@ -115,25 +92,53 @@ void EndpointModel::setLocalPath(const QString &localPath) } _localPath = localPath; + + setFileId(); + setMimeType(); + parseEndpoints(); + Q_EMIT localPathChanged(); } -void EndpointModel::setResponse(const Response &response) +QByteArray EndpointModel::fileId() const { - _response = response; - Q_EMIT responseChanged(); + return _fileId; } -AccountState *EndpointModel::accountState() const +void EndpointModel::setFileId() { - return _accountState; + const auto folderForPath = FolderMan::instance()->folderForPath(_localPath); + const auto file = _localPath.mid(folderForPath->cleanPath().length() + 1); + SyncJournalFileRecord fileRecord; + if (!folderForPath->journalDb()->getFileRecord(file, &fileRecord)) { + qDebug() << "Invalid file record for path:" << _localPath; + return; + } + + _fileId = fileRecord._fileId; } -QString EndpointModel::localPath() const +QMimeType EndpointModel::mimeType() const { - return _localPath; + return _mimeType; } +void EndpointModel::setMimeType() +{ + const auto folderForPath = FolderMan::instance()->folderForPath(_localPath); + const auto file = _localPath.mid(folderForPath->cleanPath().length() + 1); + SyncJournalFileRecord fileRecord; + if (!folderForPath->journalDb()->getFileRecord(file, &fileRecord)) { + qDebug() << "Invalid file record for path:" << _localPath; + return; + } + + const auto mimeMatchMode = fileRecord.isVirtualFile() ? QMimeDatabase::MatchExtension + : QMimeDatabase::MatchDefault; + QMimeDatabase mimeDb; + const auto mimeType = mimeDb.mimeTypeForFile(_localPath, mimeMatchMode); + _mimeType = mimeType; +} QString EndpointModel::label() const { @@ -155,21 +160,56 @@ void EndpointModel::setUrl(const QString &url) _response.url = url; } +void EndpointModel::setResponse(const Response &response) +{ + _response = response; + Q_EMIT responseChanged(); +} + +void EndpointModel::parseEndpoints() +{ + if (!_accountState->isConnected()) { + return; + } + + const auto contextMenuList = _accountState->account()->capabilities().contextMenuByMimeType(_mimeType); + for (const auto &contextMenu : contextMenuList) { + _endpoints.append({_accountState->account()->url().toString() + + contextMenu.value("icon").toString(), + contextMenu.value("name").toString(), + contextMenu.value("url").toString(), + contextMenu.value("method").toString(), + contextMenu.value("params").toString()}); + } + + Q_EMIT endpointModelChanged(); +} + +QString EndpointModel::parseUrl(const QString &url) const +{ + auto unparsedUrl = url; + const auto fileIdParam = QStringLiteral("{fileId}"); + const auto parsedUrl = unparsedUrl.replace(QRegularExpression(fileIdParam), _fileId); + return parsedUrl; +} + void EndpointModel::createRequest(const int row) { if (!_accountState) { return; } + const auto requesturl = parseUrl(_endpoints.at(row).url); auto job = new JsonApiJob(_accountState->account(), - _endpoints.at(row).url, + requesturl, this); connect(job, &JsonApiJob::jsonReceived, this, &EndpointModel::processRequest); QUrlQuery params; - params.addQueryItem(_endpoints.at(row).params, 0); //fileId + params.addQueryItem(_endpoints.at(row).params, _fileId); job->addQueryParams(params); - job->setVerb(SimpleApiJob::Verb::Post); //fixit _endpoints.at(row).verb + const auto verb = job->stringToVerb(_endpoints.at(row).method); + job->setVerb(verb); job->start(); } diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h index ba8f19e9c7c84..710d15131efaa 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/endpointmodel.h @@ -27,12 +27,10 @@ class EndpointModel : public QAbstractListModel { [[nodiscard]] QHash roleNames() const override; enum DataRole { - EndpointTypeRole = Qt::UserRole + 1, - EndpointIconRole, + EndpointIconRole = Qt::UserRole + 1, EndpointNameRole, EndpointUrlRole, EndpointMethodRole, - EndpointMimetypeFiltersRole, EndpointParamsRole }; Q_ENUM(DataRole) @@ -42,14 +40,17 @@ class EndpointModel : public QAbstractListModel { QString url; }; - void parseEndpoints(); - + [[nodiscard]] AccountState *accountState() const; void setAccountState(AccountState *accountState); - void setLocalPath(const QString &localPath); - void setResponse(const Response &response); - [[nodiscard]] AccountState *accountState() const; [[nodiscard]] QString localPath() const; + void setLocalPath(const QString &localPath); + + [[nodiscard]] QByteArray fileId() const; + void setFileId(); + + [[nodiscard]] QMimeType mimeType() const; + void setMimeType(); [[nodiscard]] QString label() const; void setLabel(const QString &label); @@ -57,11 +58,16 @@ class EndpointModel : public QAbstractListModel { [[nodiscard]] QString url() const; void setUrl(const QString &url); + void setResponse(const Response &response); + + void parseEndpoints(); + QString parseUrl(const QString &url) const; + signals: - void endpointModelChanged(); - void localPathChanged(); void accountStateChanged(); + void localPathChanged(); void responseChanged(); + void endpointModelChanged(); public slots: void createRequest(const int row); @@ -71,17 +77,17 @@ public slots: Response _response; struct Endpoint { - QString type; QString icon; QString name; QString url; QString method; - QString mimetypeFilters; QString params; }; QList _endpoints; AccountState *_accountState; QString _localPath; + QByteArray _fileId; + QMimeType _mimeType; }; } diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 6c7554bccbf3f..6be2fab4e833a 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -508,7 +508,7 @@ void Systray::createFileActionsDialog(const QString &localPath) const QVariantMap initialProperties{ {"accountState", QVariant::fromValue(folder->accountState())}, {"shortLocalPath", shortLocalPath}, - {"localPath", localPath} + {"localPath", localPath}, }; const auto fileActionsDialog = fileActionsQml.createWithInitialProperties(initialProperties); diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 7de47f90813e5..351f29def27cb 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -448,6 +448,50 @@ QVariantMap Capabilities::declarativeUiEndpoints() const return declarativeUi; } +QList Capabilities::declarativeUiContextMenu() const +{ + const auto declarativeUiMap = _capabilities.value("declarativeui").toMap(); + QList contextMenu; + for (auto declarativeUiApp : std::as_const(declarativeUiMap)) { + const auto contextMenuMap = declarativeUiApp.toMap(); + if (!contextMenuMap.contains("context-menu")) { + continue; + } + + for (const auto &contextMenuItem : contextMenuMap) { + const auto contextMenuList = contextMenuItem.toList(); + for (const auto &contextMenuMap : contextMenuList) { + contextMenu.append(contextMenuMap.toMap()); + } + } + } + + return contextMenu; +} + +QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeType) const +{ + const auto contextMenu = declarativeUiContextMenu(); + qDebug() << "fileMimeType:" << fileMimeType.name(); + qDebug() << "parentMimeTypes:" << fileMimeType.parentMimeTypes(); + qDebug() << "allAncestors:" << fileMimeType.allAncestors(); + QList contextMenuByMimeType; + for (const auto &contextMenuMap : contextMenu) { + const auto mimetypeFilters = contextMenuMap.value("mimetype_filters").toString(); + const auto filesMimeTypeFilterList = mimetypeFilters.split(",", Qt::SkipEmptyParts); + for (const auto mimeType : filesMimeTypeFilterList) { + const auto mimeTypeName = mimeType.trimmed(); + qDebug() << "API mimeType:" << mimeTypeName; + if (fileMimeType.inherits(mimeTypeName) || fileMimeType.parentMimeTypes().contains(mimeTypeName)) { + contextMenuByMimeType.append(contextMenuMap); + break; + } + } + } + + return contextMenuByMimeType; +} + /*-------------------------------------------------------------------------------------*/ // Direct Editing diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index 4c564c3e98689..5c2dd6fe2f2c0 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -177,6 +177,8 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] bool serverHasDeclarativeUi() const; [[nodiscard]] QVariantMap declarativeUiEndpoints() const; + [[nodiscard]] QList declarativeUiContextMenu() const; + [[nodiscard]] QList contextMenuByMimeType(const QMimeType fileMimeType) const; // Direct Editing void addDirectEditor(DirectEditor* directEditor); diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index 2b994774f9e3b..4d3b5403e24bb 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -1464,6 +1464,23 @@ QByteArray SimpleApiJob::verbToString() const return "GET"; } +SimpleApiJob::Verb SimpleApiJob::stringToVerb(const QString &verb) const +{ + if (verb == QStringLiteral("POST")) { + return Verb::Post; + } + + if (verb == QStringLiteral("PUT")) { + return Verb::Put; + } + + if (verb == QStringLiteral("DELETE")) { + return Verb::Delete; + } + + return Verb::Get; +} + void SimpleApiJob::start() { addRawHeader("OCS-APIREQUEST", "true"); diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index 1134d49ecb246..4e5b9c485be9c 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -439,6 +439,8 @@ class OWNCLOUDSYNC_EXPORT SimpleApiJob : public AbstractNetworkJob void setVerb(Verb value); + [[nodiscard]] Verb stringToVerb(const QString &verb) const; + /** * @brief addQueryParams - add more parameters to the ocs call * @param params: list pairs of strings containing the parameter name and the value. From ea237613f3ed214713edaf1271464e99beee2b08 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 17 Sep 2025 14:39:33 +0200 Subject: [PATCH 15/30] fix: handle file action response. - adjust logic to get context menu by mimeType. Signed-off-by: Camila Ayres --- src/gui/declarativeui/endpointmodel.cpp | 36 +++++++++++-------------- src/gui/declarativeui/endpointmodel.h | 2 +- src/libsync/capabilities.cpp | 10 +++---- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/endpointmodel.cpp index e18f1a7780f44..710659ba1c399 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/endpointmodel.cpp @@ -172,6 +172,14 @@ void EndpointModel::parseEndpoints() return; } + if (_fileId.isEmpty()) { + return; + } + + if (!_mimeType.isValid()) { + return; + } + const auto contextMenuList = _accountState->account()->capabilities().contextMenuByMimeType(_mimeType); for (const auto &contextMenu : contextMenuList) { _endpoints.append({_accountState->account()->url().toString() @@ -206,36 +214,24 @@ void EndpointModel::createRequest(const int row) connect(job, &JsonApiJob::jsonReceived, this, &EndpointModel::processRequest); QUrlQuery params; - params.addQueryItem(_endpoints.at(row).params, _fileId); + //params.addQueryItem(_endpoints.at(row).params, _fileId); job->addQueryParams(params); const auto verb = job->stringToVerb(_endpoints.at(row).method); job->setVerb(verb); job->start(); } -void EndpointModel::processRequest(const QJsonDocument &json) +void EndpointModel::processRequest(const QJsonDocument &json, int statusCode) { - const auto root = json.object().value(QStringLiteral("root")).toObject(); - if (root.empty()) { - return; - } - const auto orientation = root.value(QStringLiteral("orientation")).toString(); - const auto rows = root.value(QStringLiteral("rows")).toArray(); - if (rows.empty()) { + Q_UNUSED(json) + auto message = tr("File action succeded, access your instance for the result."); + if (statusCode != 200) { + message = tr("File action did not succeed, access your instance for details."); return; } - for (const auto &rowValue : rows) { - const auto row = rowValue.toObject(); - const auto children = row.value("children").toArray(); - - for (const auto &childValue : children) { - const auto child = childValue.toObject(); - _response.label = child.value(QStringLiteral("element")).toString(); - _response.url = _accountState->account()->url().toString() + - child.value(QStringLiteral("url")).toString(); - } - } + _response.label = message; + _response.url = _accountState->account()->url().toString(); Q_EMIT responseChanged(); } diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/endpointmodel.h index 710d15131efaa..91251a3713ed8 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/endpointmodel.h @@ -71,7 +71,7 @@ class EndpointModel : public QAbstractListModel { public slots: void createRequest(const int row); - void processRequest(const QJsonDocument &json); + void processRequest(const QJsonDocument &json, int statusCode); private: Response _response; diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 351f29def27cb..400fab75131fb 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -472,17 +472,15 @@ QList Capabilities::declarativeUiContextMenu() const QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeType) const { const auto contextMenu = declarativeUiContextMenu(); - qDebug() << "fileMimeType:" << fileMimeType.name(); - qDebug() << "parentMimeTypes:" << fileMimeType.parentMimeTypes(); - qDebug() << "allAncestors:" << fileMimeType.allAncestors(); + const auto fileMimeTypeName = fileMimeType.name(); + const auto fileMimeTypeAliases = fileMimeType.aliases(); QList contextMenuByMimeType; for (const auto &contextMenuMap : contextMenu) { const auto mimetypeFilters = contextMenuMap.value("mimetype_filters").toString(); const auto filesMimeTypeFilterList = mimetypeFilters.split(",", Qt::SkipEmptyParts); for (const auto mimeType : filesMimeTypeFilterList) { - const auto mimeTypeName = mimeType.trimmed(); - qDebug() << "API mimeType:" << mimeTypeName; - if (fileMimeType.inherits(mimeTypeName) || fileMimeType.parentMimeTypes().contains(mimeTypeName)) { + auto capabilitiesMimeTypeName = mimeType.trimmed(); + if (fileMimeTypeName.startsWith(capabilitiesMimeTypeName) || fileMimeTypeAliases.contains(capabilitiesMimeTypeName)) { contextMenuByMimeType.append(contextMenuMap); break; } From de2c088ec50c5dcced4514362624718cd93ca7f9 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 17 Sep 2025 17:08:17 +0200 Subject: [PATCH 16/30] refactor: create function to set file id and mime type. - remove unused functions. - save string values in constexpr - rename Endpoint to Fileactions. Signed-off-by: Camila Ayres --- src/gui/CMakeLists.txt | 4 +- src/gui/declarativeui/FileActionsWindow.qml | 14 +- src/gui/declarativeui/declarativeui.h | 2 +- ...endpointmodel.cpp => fileactionsmodel.cpp} | 125 +++++++++--------- .../{endpointmodel.h => fileactionsmodel.h} | 32 ++--- src/gui/owncloudgui.cpp | 2 +- src/libsync/capabilities.cpp | 6 - src/libsync/capabilities.h | 1 - 8 files changed, 88 insertions(+), 98 deletions(-) rename src/gui/declarativeui/{endpointmodel.cpp => fileactionsmodel.cpp} (54%) rename src/gui/declarativeui/{endpointmodel.h => fileactionsmodel.h} (76%) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a70488d8bf377..09c9f5ccfee88 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -262,8 +262,8 @@ set(client_SRCS declarativeui/declarativeuimodel.cpp declarativeui/declarativeui.h declarativeui/declarativeui.cpp - declarativeui/endpointmodel.h - declarativeui/endpointmodel.cpp + declarativeui/fileactionsmodel.h + declarativeui/fileactionsmodel.cpp ) if (NOT DISABLE_ACCOUNT_MIGRATION) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index aa667988435cc..d1e58c9e9869e 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -26,8 +26,8 @@ ApplicationWindow { title: qsTr("File actions for %1").arg(root.shortLocalPath) - EndpointModel { - id: endpointModel + FileActionsModel { + id: fileActionModel accountState: root.accountState localPath: root.localPath } @@ -76,7 +76,7 @@ ApplicationWindow { ListView { id: fileActionsView - model: endpointModel + model: fileActionModel clip: true spacing: Style.trayHorizontalMargin Layout.fillWidth: true @@ -119,7 +119,7 @@ ApplicationWindow { Text { id: response - text: endpointModel.responseLabel + text: fileActionModel.responseLabel textFormat: Text.RichText color: Style.ncHeaderTextColor font.pointSize: Style.pixelSize @@ -129,14 +129,14 @@ ApplicationWindow { id: responseArea anchors.fill: parent cursorShape: Qt.PointingHandCursor - onClicked: Qt.openUrlExternally(endpointModel.responseUrl) + onClicked: Qt.openUrlExternally(fileActionModel.responseUrl) } } } ToolTip { visible: responseButton.hovered - text: endpointModel.responseLabel + text: fileActionModel.responseLabel } } @@ -201,7 +201,7 @@ ApplicationWindow { text: name } - onClicked: endpointModel.createRequest(index) + onClicked: fileActionModel.createRequest(index) } } } diff --git a/src/gui/declarativeui/declarativeui.h b/src/gui/declarativeui/declarativeui.h index 1028a8f688f06..e4dae39f1560f 100644 --- a/src/gui/declarativeui/declarativeui.h +++ b/src/gui/declarativeui/declarativeui.h @@ -10,7 +10,7 @@ #include "accountstate.h" #include "declarativeuimodel.h" -#include "endpointmodel.h" +#include "fileactionsmodel.h" namespace OCC { diff --git a/src/gui/declarativeui/endpointmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp similarity index 54% rename from src/gui/declarativeui/endpointmodel.cpp rename to src/gui/declarativeui/fileactionsmodel.cpp index 710659ba1c399..04067ae5347c2 100644 --- a/src/gui/declarativeui/endpointmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -3,65 +3,65 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "endpointmodel.h" +#include "fileactionsmodel.h" #include "networkjobs.h" #include "account.h" #include "folderman.h" namespace OCC { -EndpointModel::EndpointModel(QObject *parent) +FileActionsModel::FileActionsModel(QObject *parent) : QAbstractListModel(parent) { } -QVariant EndpointModel::data(const QModelIndex &index, int role) const +QVariant FileActionsModel::data(const QModelIndex &index, int role) const { Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid)); const auto row = index.row(); switch (role) { - case EndpointIconRole: - return _endpoints.at(row).icon; // deck.svg - case EndpointNameRole: - return _endpoints.at(row).name; // Convert file - case EndpointUrlRole: - return _endpoints.at(row).url; // /ocs/v2.php/apps/declarativetest/newDeckBoard - case EndpointMethodRole: - return _endpoints.at(row).method; // GET - case EndpointParamsRole: - return _endpoints.at(row).params; // filePath + case FileActionIconRole: + return _fileActions.at(row).icon; // deck.svg + case FileActionNameRole: + return _fileActions.at(row).name; // Convert file + case FileActionUrlRole: + return _fileActions.at(row).url; // /ocs/v2.php/apps/declarativetest/newDeckBoard + case FileActionMethodRole: + return _fileActions.at(row).method; // GET + case FileActionParamsRole: + return _fileActions.at(row).params; // filePath } return {}; } -int EndpointModel::rowCount(const QModelIndex &parent) const +int FileActionsModel::rowCount(const QModelIndex &parent) const { if (parent.isValid()) { return 0; } - return _endpoints.size(); + return _fileActions.size(); } -QHash EndpointModel::roleNames() const +QHash FileActionsModel::roleNames() const { auto roles = QAbstractListModel::roleNames(); - roles[EndpointIconRole] = "icon"; - roles[EndpointNameRole] = "name"; - roles[EndpointUrlRole] = "url"; - roles[EndpointMethodRole] = "method"; - roles[EndpointParamsRole] = "params"; + roles[FileActionIconRole] = "icon"; + roles[FileActionNameRole] = "name"; + roles[FileActionUrlRole] = "url"; + roles[FileActionMethodRole] = "method"; + roles[FileActionParamsRole] = "params"; return roles; } -AccountState *EndpointModel::accountState() const +AccountState *FileActionsModel::accountState() const { return _accountState; } -void EndpointModel::setAccountState(AccountState *accountState) +void FileActionsModel::setAccountState(AccountState *accountState) { if (accountState == nullptr) { return; @@ -75,13 +75,13 @@ void EndpointModel::setAccountState(AccountState *accountState) Q_EMIT accountStateChanged(); } -QString EndpointModel::localPath() const +QString FileActionsModel::localPath() const { return _localPath; } -void EndpointModel::setLocalPath(const QString &localPath) +void FileActionsModel::setLocalPath(const QString &localPath) { if (localPath.isEmpty()) { return; @@ -93,45 +93,28 @@ void EndpointModel::setLocalPath(const QString &localPath) _localPath = localPath; - setFileId(); - setMimeType(); + setupFileProperties(); parseEndpoints(); Q_EMIT localPathChanged(); } -QByteArray EndpointModel::fileId() const +QByteArray FileActionsModel::fileId() const { return _fileId; } -void EndpointModel::setFileId() +void FileActionsModel::setupFileProperties() { const auto folderForPath = FolderMan::instance()->folderForPath(_localPath); - const auto file = _localPath.mid(folderForPath->cleanPath().length() + 1); + _filePath = _localPath.mid(folderForPath->cleanPath().length() + 1); SyncJournalFileRecord fileRecord; - if (!folderForPath->journalDb()->getFileRecord(file, &fileRecord)) { + if (!folderForPath->journalDb()->getFileRecord(_filePath, &fileRecord)) { qDebug() << "Invalid file record for path:" << _localPath; return; } _fileId = fileRecord._fileId; -} - -QMimeType EndpointModel::mimeType() const -{ - return _mimeType; -} - -void EndpointModel::setMimeType() -{ - const auto folderForPath = FolderMan::instance()->folderForPath(_localPath); - const auto file = _localPath.mid(folderForPath->cleanPath().length() + 1); - SyncJournalFileRecord fileRecord; - if (!folderForPath->journalDb()->getFileRecord(file, &fileRecord)) { - qDebug() << "Invalid file record for path:" << _localPath; - return; - } const auto mimeMatchMode = fileRecord.isVirtualFile() ? QMimeDatabase::MatchExtension : QMimeDatabase::MatchDefault; @@ -140,33 +123,38 @@ void EndpointModel::setMimeType() _mimeType = mimeType; } -QString EndpointModel::label() const +QMimeType FileActionsModel::mimeType() const +{ + return _mimeType; +} + +QString FileActionsModel::label() const { return _response.label; } -void EndpointModel::setLabel(const QString &label) +void FileActionsModel::setLabel(const QString &label) { _response.label = label; } -QString EndpointModel::url() const +QString FileActionsModel::url() const { return _response.url; } -void EndpointModel::setUrl(const QString &url) +void FileActionsModel::setUrl(const QString &url) { _response.url = url; } -void EndpointModel::setResponse(const Response &response) +void FileActionsModel::setResponse(const Response &response) { _response = response; Q_EMIT responseChanged(); } -void EndpointModel::parseEndpoints() +void FileActionsModel::parseEndpoints() { if (!_accountState->isConnected()) { return; @@ -182,46 +170,53 @@ void EndpointModel::parseEndpoints() const auto contextMenuList = _accountState->account()->capabilities().contextMenuByMimeType(_mimeType); for (const auto &contextMenu : contextMenuList) { - _endpoints.append({_accountState->account()->url().toString() + _fileActions.append({_accountState->account()->url().toString() + contextMenu.value("icon").toString(), contextMenu.value("name").toString(), contextMenu.value("url").toString(), contextMenu.value("method").toString(), - contextMenu.value("params").toString()}); + contextMenu.value("params").toStringList()}); } - Q_EMIT endpointModelChanged(); + Q_EMIT fileActionModelChanged(); } -QString EndpointModel::parseUrl(const QString &url) const +QString FileActionsModel::parseUrl(const QString &url) const { auto unparsedUrl = url; - const auto fileIdParam = QStringLiteral("{fileId}"); - const auto parsedUrl = unparsedUrl.replace(QRegularExpression(fileIdParam), _fileId); + const auto parsedUrl = unparsedUrl.replace(QRegularExpression(fileIdUrlC), _fileId); return parsedUrl; } -void EndpointModel::createRequest(const int row) +void FileActionsModel::createRequest(const int row) { if (!_accountState) { return; } - const auto requesturl = parseUrl(_endpoints.at(row).url); + const auto requesturl = parseUrl(_fileActions.at(row).url); auto job = new JsonApiJob(_accountState->account(), requesturl, this); connect(job, &JsonApiJob::jsonReceived, - this, &EndpointModel::processRequest); + this, &FileActionsModel::processRequest); QUrlQuery params; - //params.addQueryItem(_endpoints.at(row).params, _fileId); + for (const auto ¶m : _fileActions.at(row).params) { + if (param == fileIdC) { + params.addQueryItem(param, _fileId); + } + + if (param == filePathC) { + params.addQueryItem(param, _filePath); + } + } job->addQueryParams(params); - const auto verb = job->stringToVerb(_endpoints.at(row).method); + const auto verb = job->stringToVerb(_fileActions.at(row).method); job->setVerb(verb); job->start(); } -void EndpointModel::processRequest(const QJsonDocument &json, int statusCode) +void FileActionsModel::processRequest(const QJsonDocument &json, int statusCode) { Q_UNUSED(json) auto message = tr("File action succeded, access your instance for the result."); diff --git a/src/gui/declarativeui/endpointmodel.h b/src/gui/declarativeui/fileactionsmodel.h similarity index 76% rename from src/gui/declarativeui/endpointmodel.h rename to src/gui/declarativeui/fileactionsmodel.h index 91251a3713ed8..94088046646a4 100644 --- a/src/gui/declarativeui/endpointmodel.h +++ b/src/gui/declarativeui/fileactionsmodel.h @@ -12,7 +12,7 @@ namespace OCC { -class EndpointModel : public QAbstractListModel { +class FileActionsModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) @@ -21,17 +21,17 @@ class EndpointModel : public QAbstractListModel { Q_PROPERTY(QString responseUrl READ url WRITE setUrl NOTIFY responseChanged) public: - explicit EndpointModel(QObject *const parent = nullptr); + explicit FileActionsModel(QObject *const parent = nullptr); [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; [[nodiscard]] QHash roleNames() const override; enum DataRole { - EndpointIconRole = Qt::UserRole + 1, - EndpointNameRole, - EndpointUrlRole, - EndpointMethodRole, - EndpointParamsRole + FileActionIconRole = Qt::UserRole + 1, + FileActionNameRole, + FileActionUrlRole, + FileActionMethodRole, + FileActionParamsRole }; Q_ENUM(DataRole) @@ -47,10 +47,8 @@ class EndpointModel : public QAbstractListModel { void setLocalPath(const QString &localPath); [[nodiscard]] QByteArray fileId() const; - void setFileId(); - [[nodiscard]] QMimeType mimeType() const; - void setMimeType(); + void setupFileProperties(); [[nodiscard]] QString label() const; void setLabel(const QString &label); @@ -67,7 +65,7 @@ class EndpointModel : public QAbstractListModel { void accountStateChanged(); void localPathChanged(); void responseChanged(); - void endpointModelChanged(); + void fileActionModelChanged(); public slots: void createRequest(const int row); @@ -75,19 +73,23 @@ public slots: private: Response _response; - - struct Endpoint { + struct FileAction { QString icon; QString name; QString url; QString method; - QString params; + QList params; }; - QList _endpoints; + QList _fileActions; AccountState *_accountState; QString _localPath; QByteArray _fileId; QMimeType _mimeType; + QString _filePath; + + static constexpr char fileIdUrlC[] = "{fileId}"; + static constexpr char fileIdC[] = "fileId"; + static constexpr char filePathC[] = "filePath"; }; } diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 1d69d8d6726e8..eed41b9663dca 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -136,7 +136,7 @@ ownCloudGui::ownCloudGui(Application *parent) qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "SortedShareModel"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "DeclarativeUi"); - qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "EndpointModel"); + qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "FileActionsModel"); qmlRegisterUncreatableType("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel"); qmlRegisterUncreatableType("com.nextcloud.desktopclient", 1, 0, "activity", "Activity"); diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 400fab75131fb..2ca4aa1ebeba2 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -442,12 +442,6 @@ bool Capabilities::serverHasDeclarativeUi() const return _capabilities[QStringLiteral("declarativeui")].toMap().isEmpty(); } -QVariantMap Capabilities::declarativeUiEndpoints() const -{ - const auto declarativeUi = _capabilities.value("declarativeui").toMap(); - return declarativeUi; -} - QList Capabilities::declarativeUiContextMenu() const { const auto declarativeUiMap = _capabilities.value("declarativeui").toMap(); diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index 5c2dd6fe2f2c0..06e43ebb7cf06 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -176,7 +176,6 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] QString desktopEnterpriseChannel() const; [[nodiscard]] bool serverHasDeclarativeUi() const; - [[nodiscard]] QVariantMap declarativeUiEndpoints() const; [[nodiscard]] QList declarativeUiContextMenu() const; [[nodiscard]] QList contextMenuByMimeType(const QMimeType fileMimeType) const; From 7e23ef212644c81a85ad5b5e056edf9e91e29132 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 17 Sep 2025 18:01:57 +0200 Subject: [PATCH 17/30] feat: add logging category to FileActionsModel. Signed-off-by: Camila Ayres --- src/gui/declarativeui/fileactionsmodel.cpp | 16 ++++++++++++---- src/gui/declarativeui/fileactionsmodel.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/gui/declarativeui/fileactionsmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp index 04067ae5347c2..ef580ab3a33a1 100644 --- a/src/gui/declarativeui/fileactionsmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -10,6 +10,8 @@ namespace OCC { +Q_LOGGING_CATEGORY(lcFileActions, "nextcloud.gui.fileactions", QtInfoMsg) + FileActionsModel::FileActionsModel(QObject *parent) : QAbstractListModel(parent) { @@ -110,7 +112,7 @@ void FileActionsModel::setupFileProperties() _filePath = _localPath.mid(folderForPath->cleanPath().length() + 1); SyncJournalFileRecord fileRecord; if (!folderForPath->journalDb()->getFileRecord(_filePath, &fileRecord)) { - qDebug() << "Invalid file record for path:" << _localPath; + qCWarning(lcFileActions) << "Invalid file record for path:" << _localPath; return; } @@ -157,14 +159,17 @@ void FileActionsModel::setResponse(const Response &response) void FileActionsModel::parseEndpoints() { if (!_accountState->isConnected()) { + qCWarning(lcFileActions) << "Account is not connected."; return; } if (_fileId.isEmpty()) { + qCWarning(lcFileActions) << "File id is empty for" << _localPath; return; } if (!_mimeType.isValid()) { + qCWarning(lcFileActions) << "Mime type is not valid for" << _localPath; return; } @@ -178,6 +183,7 @@ void FileActionsModel::parseEndpoints() contextMenu.value("params").toStringList()}); } + qCDebug(lcFileActions) << "File" << _localPath << "has" << _fileActions.size() << "actions available."; Q_EMIT fileActionModelChanged(); } @@ -191,6 +197,7 @@ QString FileActionsModel::parseUrl(const QString &url) const void FileActionsModel::createRequest(const int row) { if (!_accountState) { + qCWarning(lcFileActions) << "No account state for" << _localPath; return; } @@ -210,7 +217,9 @@ void FileActionsModel::createRequest(const int row) params.addQueryItem(param, _filePath); } } - job->addQueryParams(params); + if (!params.isEmpty()) { + job->addQueryParams(params); + } const auto verb = job->stringToVerb(_fileActions.at(row).method); job->setVerb(verb); job->start(); @@ -221,8 +230,7 @@ void FileActionsModel::processRequest(const QJsonDocument &json, int statusCode) Q_UNUSED(json) auto message = tr("File action succeded, access your instance for the result."); if (statusCode != 200) { - message = tr("File action did not succeed, access your instance for details."); - return; + qCWarning(lcFileActions) << "File action did not succeed for" << _localPath; } _response.label = message; diff --git a/src/gui/declarativeui/fileactionsmodel.h b/src/gui/declarativeui/fileactionsmodel.h index 94088046646a4..900dabf3f7b0e 100644 --- a/src/gui/declarativeui/fileactionsmodel.h +++ b/src/gui/declarativeui/fileactionsmodel.h @@ -12,6 +12,8 @@ namespace OCC { +Q_DECLARE_LOGGING_CATEGORY(lcFileActions) + class FileActionsModel : public QAbstractListModel { Q_OBJECT From 633add22ac05097f15927a28fdb227a51c4bfbff Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 17 Sep 2025 18:58:49 +0200 Subject: [PATCH 18/30] refactor: improve error handling. - change icon for file. - display a different icon for each mimetype. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 6 +-- src/gui/declarativeui/fileactionsmodel.cpp | 40 ++++++++++++++------ src/gui/declarativeui/fileactionsmodel.h | 20 ++++++---- src/libsync/capabilities.cpp | 42 +++++++++++---------- src/libsync/capabilities.h | 1 - theme.qrc.in | 1 + theme/file-open.svg | 1 + 7 files changed, 68 insertions(+), 43 deletions(-) create mode 100644 theme/file-open.svg diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index d1e58c9e9869e..b4bad7616a90b 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -49,7 +49,7 @@ ApplicationWindow { spacing: Style.standardSpacing Image { - source: "image://svgimage-custom-color/files.svg/" + palette.windowText + source: "image://svgimage-custom-color/file-open.svg/" + palette.windowText width: Style.minimumActivityItemHeight height: Style.minimumActivityItemHeight } @@ -93,7 +93,7 @@ ApplicationWindow { Button { id: responseButton - visible: response.text !== "" + visible: responseText.text !== "" flat: true Layout.fillWidth: true implicitHeight: Style.activityListButtonHeight @@ -118,7 +118,7 @@ ApplicationWindow { } Text { - id: response + id: responseText text: fileActionModel.responseLabel textFormat: Text.RichText color: Style.ncHeaderTextColor diff --git a/src/gui/declarativeui/fileactionsmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp index ef580ab3a33a1..ed8c7294ea645 100644 --- a/src/gui/declarativeui/fileactionsmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -74,6 +74,7 @@ void FileActionsModel::setAccountState(AccountState *accountState) } _accountState = accountState; + _accountUrl = _accountState->account()->url().toString(); Q_EMIT accountStateChanged(); } @@ -98,7 +99,7 @@ void FileActionsModel::setLocalPath(const QString &localPath) setupFileProperties(); parseEndpoints(); - Q_EMIT localPathChanged(); + Q_EMIT fileChanged(); } QByteArray FileActionsModel::fileId() const @@ -123,6 +124,9 @@ void FileActionsModel::setupFileProperties() QMimeDatabase mimeDb; const auto mimeType = mimeDb.mimeTypeForFile(_localPath, mimeMatchMode); _mimeType = mimeType; + + // TODO: display an icon for each mimeType + _fileIcon = ""; } QMimeType FileActionsModel::mimeType() const @@ -130,22 +134,27 @@ QMimeType FileActionsModel::mimeType() const return _mimeType; } -QString FileActionsModel::label() const +QString FileActionsModel::fileIcon() const +{ + return _fileIcon; +} + +QString FileActionsModel::responseLabel() const { return _response.label; } -void FileActionsModel::setLabel(const QString &label) +void FileActionsModel::setResponseLabel(const QString &label) { _response.label = label; } -QString FileActionsModel::url() const +QString FileActionsModel::responseUrl() const { return _response.url; } -void FileActionsModel::setUrl(const QString &url) +void FileActionsModel::setResponseUrl(const QString &url) { _response.url = url; } @@ -159,21 +168,31 @@ void FileActionsModel::setResponse(const Response &response) void FileActionsModel::parseEndpoints() { if (!_accountState->isConnected()) { - qCWarning(lcFileActions) << "Account is not connected."; + qCWarning(lcFileActions) << "The account is not connected" << _accountUrl; + setResponse({ tr("Your account is offline %1.", "account url").arg(_accountUrl), _accountUrl }); return; } if (_fileId.isEmpty()) { - qCWarning(lcFileActions) << "File id is empty for" << _localPath; + qCWarning(lcFileActions) << "The file id is empty, not initialized" << _localPath; + setResponse({ tr("The file id is empty for %1.", "file name").arg(_localPath), _accountUrl }); return; } if (!_mimeType.isValid()) { - qCWarning(lcFileActions) << "Mime type is not valid for" << _localPath; + qCWarning(lcFileActions) << "The mime type found for the file is not valid" << _localPath; + setResponse({ tr("The file type for %1 is not valid.", "file name").arg(_localPath), _accountUrl }); return; } const auto contextMenuList = _accountState->account()->capabilities().contextMenuByMimeType(_mimeType); + //const QList contextMenuList; + if (contextMenuList.isEmpty()) { + qCWarning(lcFileActions) << "contextMenuByMimeType is empty, nothing was returned by capabilities" << _localPath; + setResponse({ tr("No file actions were returned by the server for %1 files.", "file mymetype").arg(_mimeType.filterString()), _accountUrl }); + return; + } + for (const auto &contextMenu : contextMenuList) { _fileActions.append({_accountState->account()->url().toString() + contextMenu.value("icon").toString(), @@ -233,10 +252,7 @@ void FileActionsModel::processRequest(const QJsonDocument &json, int statusCode) qCWarning(lcFileActions) << "File action did not succeed for" << _localPath; } - _response.label = message; - _response.url = _accountState->account()->url().toString(); - - Q_EMIT responseChanged(); + setResponse({ message, _accountState->account()->url().toString() }); } } // namespace OCC diff --git a/src/gui/declarativeui/fileactionsmodel.h b/src/gui/declarativeui/fileactionsmodel.h index 900dabf3f7b0e..4243b5f5b35cd 100644 --- a/src/gui/declarativeui/fileactionsmodel.h +++ b/src/gui/declarativeui/fileactionsmodel.h @@ -18,9 +18,10 @@ class FileActionsModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(AccountState* accountState READ accountState WRITE setAccountState NOTIFY accountStateChanged) - Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY localPathChanged) - Q_PROPERTY(QString responseLabel READ label WRITE setLabel NOTIFY responseChanged) - Q_PROPERTY(QString responseUrl READ url WRITE setUrl NOTIFY responseChanged) + Q_PROPERTY(QString localPath READ localPath WRITE setLocalPath NOTIFY fileChanged) + Q_PROPERTY(QString fileIcon READ fileIcon NOTIFY fileChanged) + Q_PROPERTY(QString responseLabel READ responseLabel WRITE setResponseLabel NOTIFY responseChanged) + Q_PROPERTY(QString responseUrl READ responseUrl WRITE setResponseUrl NOTIFY responseChanged) public: explicit FileActionsModel(QObject *const parent = nullptr); @@ -50,13 +51,14 @@ class FileActionsModel : public QAbstractListModel { [[nodiscard]] QByteArray fileId() const; [[nodiscard]] QMimeType mimeType() const; + [[nodiscard]] QString fileIcon() const; void setupFileProperties(); - [[nodiscard]] QString label() const; - void setLabel(const QString &label); + [[nodiscard]] QString responseLabel() const; + void setResponseLabel(const QString &label); - [[nodiscard]] QString url() const; - void setUrl(const QString &url); + [[nodiscard]] QString responseUrl() const; + void setResponseUrl(const QString &url); void setResponse(const Response &response); @@ -65,7 +67,7 @@ class FileActionsModel : public QAbstractListModel { signals: void accountStateChanged(); - void localPathChanged(); + void fileChanged(); void responseChanged(); void fileActionModelChanged(); @@ -88,6 +90,8 @@ public slots: QByteArray _fileId; QMimeType _mimeType; QString _filePath; + QString _accountUrl; + QString _fileIcon; static constexpr char fileIdUrlC[] = "{fileId}"; static constexpr char fileIdC[] = "fileId"; diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 2ca4aa1ebeba2..f2aff98165705 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -442,42 +442,46 @@ bool Capabilities::serverHasDeclarativeUi() const return _capabilities[QStringLiteral("declarativeui")].toMap().isEmpty(); } -QList Capabilities::declarativeUiContextMenu() const +QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeType) const { const auto declarativeUiMap = _capabilities.value("declarativeui").toMap(); - QList contextMenu; + QVariantList contextMenuMapList; for (auto declarativeUiApp : std::as_const(declarativeUiMap)) { - const auto contextMenuMap = declarativeUiApp.toMap(); - if (!contextMenuMap.contains("context-menu")) { + const auto declarativeUiContextMenuMap = declarativeUiApp.toMap(); + if (!declarativeUiContextMenuMap.contains("context-menu")) { continue; } - for (const auto &contextMenuItem : contextMenuMap) { - const auto contextMenuList = contextMenuItem.toList(); - for (const auto &contextMenuMap : contextMenuList) { - contextMenu.append(contextMenuMap.toMap()); - } - } + contextMenuMapList.append(declarativeUiContextMenuMap.value("context-menu").toList()); } - return contextMenu; -} + if (contextMenuMapList.empty()) { + qCDebug(lcServerCapabilities) << "There is no context menu available in the capabilities."; + return {}; + } -QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeType) const -{ - const auto contextMenu = declarativeUiContextMenu(); const auto fileMimeTypeName = fileMimeType.name(); + qCDebug(lcServerCapabilities) << "Filtering file actions by mimeType:" << fileMimeTypeName; const auto fileMimeTypeAliases = fileMimeType.aliases(); + qCDebug(lcServerCapabilities) << "File actions mimeType aliases:" << fileMimeTypeAliases; + QList contextMenuByMimeType; - for (const auto &contextMenuMap : contextMenu) { + for (const auto &contextMenu : contextMenuMapList) { + const auto contextMenuMap = contextMenu.toMap(); const auto mimetypeFilters = contextMenuMap.value("mimetype_filters").toString(); const auto filesMimeTypeFilterList = mimetypeFilters.split(",", Qt::SkipEmptyParts); + for (const auto mimeType : filesMimeTypeFilterList) { auto capabilitiesMimeTypeName = mimeType.trimmed(); - if (fileMimeTypeName.startsWith(capabilitiesMimeTypeName) || fileMimeTypeAliases.contains(capabilitiesMimeTypeName)) { - contextMenuByMimeType.append(contextMenuMap); - break; + qCDebug(lcServerCapabilities) << "Context menu for mimeType:" << capabilitiesMimeTypeName; + + if (!fileMimeTypeName.startsWith(capabilitiesMimeTypeName) && !fileMimeTypeAliases.contains(capabilitiesMimeTypeName)) { + continue; } + + qCDebug(lcServerCapabilities) << "Found file action:" << contextMenuMap; + contextMenuByMimeType.append(contextMenuMap); + break; } } diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index 06e43ebb7cf06..85a14fbf4c579 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -176,7 +176,6 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] QString desktopEnterpriseChannel() const; [[nodiscard]] bool serverHasDeclarativeUi() const; - [[nodiscard]] QList declarativeUiContextMenu() const; [[nodiscard]] QList contextMenuByMimeType(const QMimeType fileMimeType) const; // Direct Editing diff --git a/theme.qrc.in b/theme.qrc.in index 4bf77d90807bc..6c71352a012f4 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -291,5 +291,6 @@ theme/chevron-double-up.svg theme/call-notification.wav theme/info.svg + theme/file-open.svg diff --git a/theme/file-open.svg b/theme/file-open.svg new file mode 100644 index 0000000000000..871c7217e7137 --- /dev/null +++ b/theme/file-open.svg @@ -0,0 +1 @@ + \ No newline at end of file From b85be63865cfdd4d8ae7ca0a7d8c20bb38c08419 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Thu, 18 Sep 2025 02:06:58 +0200 Subject: [PATCH 19/30] feat: return default icon when server doesn't have one. - improve file actions window UI. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 246 +++++++++++--------- src/gui/declarativeui/fileactionsmodel.cpp | 22 +- src/gui/declarativeui/fileactionsmodel.h | 1 + theme.qrc.in | 2 + theme/backup.svg | 1 + theme/convert_to_text.svg | 1 + 6 files changed, 157 insertions(+), 116 deletions(-) create mode 100644 theme/backup.svg create mode 100644 theme/convert_to_text.svg diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index b4bad7616a90b..b1ae487370ea8 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -7,16 +7,15 @@ import QtQuick import QtQuick.Window import QtQuick.Layouts import QtQuick.Controls +import Qt5Compat.GraphicalEffects import com.nextcloud.desktopclient import Style ApplicationWindow { id: root - width: 400 - height: 300 - minimumWidth: 300 - minimumHeight: 200 - flags: Qt.Dialog + height: Style.trayWindowWidth + width: Systray.useNormalWindow ? Style.trayWindowHeight : Style.trayWindowWidth + flags: Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint visible: true property var accountState: ({}) @@ -32,120 +31,146 @@ ApplicationWindow { localPath: root.localPath } - Rectangle { + background: Rectangle { + //radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius + border.width: Style.trayWindowBorderWidth + border.color: palette.dark + color: palette.window + } + + // TO FIX: OpacityMask { + // anchors.fill: parent + // anchors.margins: Style.trayWindowBorderWidth + // source: ShaderEffectSource { + // sourceItem: windowContent + // hideSource: true + // } + // maskSource: Rectangle { + // width: root.width + // height: root.height + // radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius + // } + // } + + ColumnLayout { + id: windowContent anchors.fill: parent - color: Style.infoBoxBackgroundColor - //radius: Style.trayWindowRadius - border.color: Style.accentColor + anchors.margins: Style.standardSpacing - ColumnLayout { - anchors.fill: parent - anchors.margins: Style.standardSpacing + RowLayout { + id: windowHeader + Layout.fillWidth: true spacing: Style.standardSpacing - RowLayout { - id: windowHeader - Layout.fillWidth: true - spacing: Style.standardSpacing - - Image { - source: "image://svgimage-custom-color/file-open.svg/" + palette.windowText - width: Style.minimumActivityItemHeight - height: Style.minimumActivityItemHeight - } - - ColumnLayout { - Layout.fillWidth: true - spacing: Style.extraSmallSpacing - - Label { - text: root.shortLocalPath - font.bold: true - font.pixelSize: Style.pixelSize - color: Style.ncHeaderTextColor - } - } + Image { + source: "image://svgimage-custom-color/file-open.svg/" + palette.windowText + width: Style.minimumActivityItemHeight + height: Style.minimumActivityItemHeight + Layout.alignment: Qt.AlignVCenter + Layout.margins: Style.extraSmallSpacing } - Rectangle { - id: lineTop + Label { + id: headerLocalPath + text: root.shortLocalPath + elide: Text.ElideRight + font.bold: true + font.pixelSize: Style.pixelSize + color: palette.text Layout.fillWidth: true - height: Style.extraExtraSmallSpacing - color: Style.accentColor + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft } - ListView { - id: fileActionsView - model: fileActionModel - clip: true - spacing: Style.trayHorizontalMargin - Layout.fillWidth: true - Layout.fillHeight: true - delegate: fileActionsDelegate + Button { + id: closeButton + flat: true + padding: 0 + spacing: 0 + icon.source: "image://svgimage-custom-color/close.svg/" + palette.windowText + icon.width: Style.extraSmallIconSize + icon.height: Style.extraSmallIconSize + Layout.alignment: Qt.AlignTop | Qt.AlignRight + Layout.rightMargin: Style.extraSmallSpacing + Layout.topMargin: Style.extraSmallSpacing + onClicked: root.close() + background: Rectangle { + color: "transparent" + radius: 0 + border.width: closeButton.hovered ? Style.trayWindowBorderWidth : 0 + border.color: palette.dark + anchors.fill: parent + Layout.margins: Style.extraSmallSpacing + } } + } - Rectangle { - id: lineBottom - Layout.fillWidth: true - height: Style.extraExtraSmallSpacing - color: Style.accentColor - } + Rectangle { + id: lineTop + Layout.fillWidth: true + height: Style.extraExtraSmallSpacing + color: palette.dark + } - Button { - id: responseButton - visible: responseText.text !== "" - flat: true - Layout.fillWidth: true - implicitHeight: Style.activityListButtonHeight + ListView { + id: fileActionsView + model: fileActionModel + clip: true + spacing: Style.trayHorizontalMargin + Layout.fillWidth: true + Layout.fillHeight: true + delegate: fileActionsDelegate + } - padding: 0 - leftPadding: Style.standardSpacing - rightPadding: Style.standardSpacing - spacing: Style.standardSpacing + Button { + id: responseButton + visible: responseText.text !== "" + flat: true + Layout.fillWidth: true + implicitHeight: Style.activityListButtonHeight - contentItem: Row { - id: responseContent - anchors.fill: parent - anchors.margins: Style.smallSpacing - spacing: Style.standardSpacing + padding: 0 + leftPadding: Style.smallSpacing + rightPadding: Style.smallSpacing + spacing: Style.standardSpacing - Image { - source: "image://svgimage-custom-color/public.svg/" + palette.windowText - width: Style.minimumActivityItemHeight - height: Style.minimumActivityItemHeight - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - } + background: Rectangle { + //radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius + border.width: Style.trayWindowBorderWidth + border.color: palette.dark + color: palette.window + } - Text { - id: responseText - text: fileActionModel.responseLabel - textFormat: Text.RichText - color: Style.ncHeaderTextColor - font.pointSize: Style.pixelSize - font.underline: true - anchors.verticalCenter: parent.verticalCenter - MouseArea { - id: responseArea - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: Qt.openUrlExternally(fileActionModel.responseUrl) - } - } + contentItem: Row { + id: responseContent + anchors.fill: parent + anchors.margins: Style.smallSpacing + spacing: Style.halfTrayWindowRadius + Layout.fillWidth: true + + Image { + source: "image://svgimage-custom-color/backup.svg/" + palette.windowText + width: Style.accountAvatarStateIndicatorSize + height: Style.accountAvatarStateIndicatorSize + fillMode: Image.PreserveAspectFit + anchors.verticalCenter: parent.verticalCenter } - ToolTip { - visible: responseButton.hovered + Text { + id: responseText text: fileActionModel.responseLabel + textFormat: Text.RichText + color: palette.text + font.pointSize: Style.pixelSize + font.underline: true + anchors.verticalCenter: parent.verticalCenter } } - Rectangle { - id: repsonseLineBottom - visible: response.text != "" - Layout.fillWidth: true - height: Style.extraExtraSmallSpacing - color: Style.accentColor + MouseArea { + id: responseArea + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: Qt.openUrlExternally(fileActionModel.responseUrl) } } } @@ -155,8 +180,10 @@ ApplicationWindow { RowLayout { Layout.fillWidth: true + Layout.margins: Style.extraSmallSpacing spacing: Style.standardSpacing height: implicitHeight + width: implicitWidth required property string name required property int index @@ -169,8 +196,8 @@ ApplicationWindow { implicitHeight: Style.activityListButtonHeight padding: 0 - leftPadding: Style.standardSpacing - rightPadding: Style.standardSpacing + leftPadding: Style.smallSpacing + rightPadding: Style.smallSpacing spacing: Style.standardSpacing contentItem: Row { @@ -178,30 +205,31 @@ ApplicationWindow { anchors.fill: parent anchors.margins: Style.smallSpacing spacing: Style.standardSpacing + Layout.fillWidth: true Image { - source: icon - width: Style.minimumActivityItemHeight - height: Style.minimumActivityItemHeight + source: icon + palette.windowText + width: Style.activityListButtonHeight + height: Style.activityListButtonHeight fillMode: Image.PreserveAspectFit anchors.verticalCenter: parent.verticalCenter } Label { text: name - color: Style.ncHeaderTextColor - font.pixelSize: Style.pixelSize + color: palette.text + font.pixelSize: Style.defaultFontPtSize verticalAlignment: Text.AlignVCenter anchors.verticalCenter: parent.verticalCenter } } - ToolTip { - visible: fileActionButton.hovered - text: name + MouseArea { + id: fileActionMouseArea + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: fileActionModel.createRequest(index) } - - onClicked: fileActionModel.createRequest(index) } } } diff --git a/src/gui/declarativeui/fileactionsmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp index ed8c7294ea645..8d01e95359fbc 100644 --- a/src/gui/declarativeui/fileactionsmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -194,12 +194,11 @@ void FileActionsModel::parseEndpoints() } for (const auto &contextMenu : contextMenuList) { - _fileActions.append({_accountState->account()->url().toString() - + contextMenu.value("icon").toString(), - contextMenu.value("name").toString(), - contextMenu.value("url").toString(), - contextMenu.value("method").toString(), - contextMenu.value("params").toStringList()}); + _fileActions.append({ parseIcon(contextMenu.value("icon").toString()), + contextMenu.value("name").toString(), + contextMenu.value("url").toString(), + contextMenu.value("method").toString(), + contextMenu.value("params").toStringList() }); } qCDebug(lcFileActions) << "File" << _localPath << "has" << _fileActions.size() << "actions available."; @@ -213,6 +212,15 @@ QString FileActionsModel::parseUrl(const QString &url) const return parsedUrl; } +QString FileActionsModel::parseIcon(const QString &icon) const +{ + if (icon.isEmpty()) { + return QStringLiteral("image://svgimage-custom-color/convert_to_text.svg/"); + } + + return _accountUrl + icon; +} + void FileActionsModel::createRequest(const int row) { if (!_accountState) { @@ -251,7 +259,7 @@ void FileActionsModel::processRequest(const QJsonDocument &json, int statusCode) if (statusCode != 200) { qCWarning(lcFileActions) << "File action did not succeed for" << _localPath; } - + const auto folderForPath = FolderMan::instance()->folderForPath(_localPath); setResponse({ message, _accountState->account()->url().toString() }); } diff --git a/src/gui/declarativeui/fileactionsmodel.h b/src/gui/declarativeui/fileactionsmodel.h index 4243b5f5b35cd..37a4a9c1c5e2f 100644 --- a/src/gui/declarativeui/fileactionsmodel.h +++ b/src/gui/declarativeui/fileactionsmodel.h @@ -64,6 +64,7 @@ class FileActionsModel : public QAbstractListModel { void parseEndpoints(); QString parseUrl(const QString &url) const; + QString parseIcon(const QString &icon) const; signals: void accountStateChanged(); diff --git a/theme.qrc.in b/theme.qrc.in index 6c71352a012f4..15581d0db340e 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -292,5 +292,7 @@ theme/call-notification.wav theme/info.svg theme/file-open.svg + theme/backup.svg + theme/convert_to_text.svg diff --git a/theme/backup.svg b/theme/backup.svg new file mode 100644 index 0000000000000..696aaba720e95 --- /dev/null +++ b/theme/backup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme/convert_to_text.svg b/theme/convert_to_text.svg new file mode 100644 index 0000000000000..62427bc8f8068 --- /dev/null +++ b/theme/convert_to_text.svg @@ -0,0 +1 @@ + \ No newline at end of file From a271e3eb4ee2accff2ff901cf51113e0455cf36f Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 30 Sep 2025 12:44:07 +0200 Subject: [PATCH 20/30] fix: parse response with declarative UI elements like url. - add opacity mask and more spacing. - Implement hover for the file action buttons. - fix logic to display error/success messages. - improve text for error/success messages. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 260 +++++++++++--------- src/gui/declarativeui/fileactionsmodel.cpp | 40 ++- src/gui/declarativeui/fileactionsmodel.h | 1 + 3 files changed, 174 insertions(+), 127 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index b1ae487370ea8..420c7e6d98a3b 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -17,12 +17,15 @@ ApplicationWindow { width: Systray.useNormalWindow ? Style.trayWindowHeight : Style.trayWindowWidth flags: Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint visible: true + color: "transparent" property var accountState: ({}) property string localPath: "" property string shortLocalPath: "" property var response: ({}) + readonly property int windowRadius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius + title: qsTr("File actions for %1").arg(root.shortLocalPath) FileActionsModel { @@ -32,146 +35,150 @@ ApplicationWindow { } background: Rectangle { - //radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius + id: maskSource + radius: root.windowRadius border.width: Style.trayWindowBorderWidth border.color: palette.dark color: palette.window } - // TO FIX: OpacityMask { - // anchors.fill: parent - // anchors.margins: Style.trayWindowBorderWidth - // source: ShaderEffectSource { - // sourceItem: windowContent - // hideSource: true - // } - // maskSource: Rectangle { - // width: root.width - // height: root.height - // radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius - // } - // } - - ColumnLayout { - id: windowContent + OpacityMask { anchors.fill: parent - anchors.margins: Style.standardSpacing + anchors.margins: Style.trayWindowBorderWidth + source: maskSourceItem + maskSource: maskSource + } - RowLayout { - id: windowHeader - Layout.fillWidth: true - spacing: Style.standardSpacing + Rectangle { + id: maskSourceItem + anchors.fill: parent + anchors.margins: Style.standardSpacing + radius: root.windowRadius + clip: true + color: Style.colorWithoutTransparency(palette.base) + + ColumnLayout { + id: windowContent + anchors.fill: parent + anchors.margins: Style.standardSpacing + + RowLayout { + id: windowHeader + Layout.fillWidth: true + spacing: Style.standardSpacing + + Image { + source: "image://svgimage-custom-color/file-open.svg/" + palette.windowText + width: Style.minimumActivityItemHeight + height: Style.minimumActivityItemHeight + Layout.alignment: Qt.AlignVCenter + Layout.margins: Style.extraSmallSpacing + } + + Label { + id: headerLocalPath + text: root.shortLocalPath + elide: Text.ElideRight + font.bold: true + font.pixelSize: Style.pixelSize + color: palette.text + Layout.fillWidth: true + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + } + + Button { + id: closeButton + flat: true + padding: Style.extraSmallSpacing + spacing: 0 + icon.source: "image://svgimage-custom-color/close.svg/" + palette.windowText + icon.width: Style.extraSmallIconSize + icon.height: Style.extraSmallIconSize + Layout.alignment: Qt.AlignTop | Qt.AlignRight + Layout.rightMargin: Style.extraSmallSpacing + Layout.topMargin: Style.extraSmallSpacing + onClicked: root.close() + background: Rectangle { + color: "transparent" + radius: root.windowRadius + border.width: closeButton.hovered ? Style.trayWindowBorderWidth : 0 + border.color: palette.dark + anchors.fill: parent + Layout.margins: Style.extraSmallSpacing + } + } + } - Image { - source: "image://svgimage-custom-color/file-open.svg/" + palette.windowText - width: Style.minimumActivityItemHeight - height: Style.minimumActivityItemHeight - Layout.alignment: Qt.AlignVCenter - Layout.margins: Style.extraSmallSpacing + Rectangle { + id: lineTop + Layout.fillWidth: true + height: Style.extraExtraSmallSpacing + color: palette.dark } - Label { - id: headerLocalPath - text: root.shortLocalPath - elide: Text.ElideRight - font.bold: true - font.pixelSize: Style.pixelSize - color: palette.text + ListView { + id: fileActionsView + model: fileActionModel + clip: true + spacing: Style.trayHorizontalMargin Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + Layout.fillHeight: true + delegate: fileActionsDelegate } Button { - id: closeButton + id: responseButton + visible: responseText.text !== "" flat: true - padding: 0 - spacing: 0 - icon.source: "image://svgimage-custom-color/close.svg/" + palette.windowText - icon.width: Style.extraSmallIconSize - icon.height: Style.extraSmallIconSize - Layout.alignment: Qt.AlignTop | Qt.AlignRight - Layout.rightMargin: Style.extraSmallSpacing - Layout.topMargin: Style.extraSmallSpacing - onClicked: root.close() + Layout.fillWidth: true + implicitHeight: Style.activityListButtonHeight + + padding: Style.standardSpacing + leftPadding: Style.standardSpacing + rightPadding: Style.standardSpacing + spacing: Style.standardSpacing + background: Rectangle { - color: "transparent" - radius: 0 - border.width: closeButton.hovered ? Style.trayWindowBorderWidth : 0 + radius: root.windowRadius + border.width: Style.trayWindowBorderWidth border.color: palette.dark - anchors.fill: parent - Layout.margins: Style.extraSmallSpacing + color: palette.window } - } - } - - Rectangle { - id: lineTop - Layout.fillWidth: true - height: Style.extraExtraSmallSpacing - color: palette.dark - } - ListView { - id: fileActionsView - model: fileActionModel - clip: true - spacing: Style.trayHorizontalMargin - Layout.fillWidth: true - Layout.fillHeight: true - delegate: fileActionsDelegate - } - - Button { - id: responseButton - visible: responseText.text !== "" - flat: true - Layout.fillWidth: true - implicitHeight: Style.activityListButtonHeight - - padding: 0 - leftPadding: Style.smallSpacing - rightPadding: Style.smallSpacing - spacing: Style.standardSpacing - - background: Rectangle { - //radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius - border.width: Style.trayWindowBorderWidth - border.color: palette.dark - color: palette.window - } + contentItem: Row { + id: responseContent + anchors.fill: parent + anchors.margins: Style.smallSpacing + spacing: Style.standardSpacing + padding: Style.standardSpacing + Layout.fillWidth: true - contentItem: Row { - id: responseContent - anchors.fill: parent - anchors.margins: Style.smallSpacing - spacing: Style.halfTrayWindowRadius - Layout.fillWidth: true + Image { + source: "image://svgimage-custom-color/backup.svg/" + palette.windowText + width: Style.accountAvatarStateIndicatorSize + height: Style.accountAvatarStateIndicatorSize + fillMode: Image.PreserveAspectFit + anchors.verticalCenter: parent.verticalCenter + } - Image { - source: "image://svgimage-custom-color/backup.svg/" + palette.windowText - width: Style.accountAvatarStateIndicatorSize - height: Style.accountAvatarStateIndicatorSize - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter + Text { + id: responseText + text: fileActionModel.responseLabel + textFormat: Text.RichText + color: palette.text + font.pointSize: Style.pixelSize + font.underline: true + anchors.verticalCenter: parent.verticalCenter + } } - Text { - id: responseText - text: fileActionModel.responseLabel - textFormat: Text.RichText - color: palette.text - font.pointSize: Style.pixelSize - font.underline: true - anchors.verticalCenter: parent.verticalCenter + MouseArea { + id: responseArea + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: Qt.openUrlExternally(fileActionModel.responseUrl) } } - - MouseArea { - id: responseArea - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: Qt.openUrlExternally(fileActionModel.responseUrl) - } } } @@ -180,10 +187,10 @@ ApplicationWindow { RowLayout { Layout.fillWidth: true - Layout.margins: Style.extraSmallSpacing + Layout.margins: Style.standardSpacing spacing: Style.standardSpacing height: implicitHeight - width: implicitWidth + width: parent.width required property string name required property int index @@ -195,15 +202,13 @@ ApplicationWindow { Layout.fillWidth: true implicitHeight: Style.activityListButtonHeight - padding: 0 - leftPadding: Style.smallSpacing - rightPadding: Style.smallSpacing + padding: Style.standardSpacing spacing: Style.standardSpacing contentItem: Row { id: fileActionsContent anchors.fill: parent - anchors.margins: Style.smallSpacing + anchors.margins: Style.standardSpacing spacing: Style.standardSpacing Layout.fillWidth: true @@ -224,11 +229,22 @@ ApplicationWindow { } } + background: Rectangle { + color: "transparent" + radius: root.windowRadius + border.width: parent.hovered ? Style.trayWindowBorderWidth : 0 + border.color: palette.dark + anchors.margins: Style.standardSpacing + height: parent.height + width: parent.width + } + MouseArea { id: fileActionMouseArea anchors.fill: parent + anchors.margins: Style.standardSpacing cursorShape: Qt.PointingHandCursor - onClicked: fileActionModel.createRequest(index) + onClicked: fileActionModel.createRequest(index) } } } diff --git a/src/gui/declarativeui/fileactionsmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp index 8d01e95359fbc..44ed83ad42c6c 100644 --- a/src/gui/declarativeui/fileactionsmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -207,8 +207,8 @@ void FileActionsModel::parseEndpoints() QString FileActionsModel::parseUrl(const QString &url) const { - auto unparsedUrl = url; - const auto parsedUrl = unparsedUrl.replace(QRegularExpression(fileIdUrlC), _fileId); + auto parsedUrl = url; + parsedUrl.replace(fileIdUrlC, _fileId); return parsedUrl; } @@ -249,18 +249,48 @@ void FileActionsModel::createRequest(const int row) } const auto verb = job->stringToVerb(_fileActions.at(row).method); job->setVerb(verb); + job->setProperty(rowC, row); job->start(); } void FileActionsModel::processRequest(const QJsonDocument &json, int statusCode) { - Q_UNUSED(json) - auto message = tr("File action succeded, access your instance for the result."); + const auto row = sender()->property(rowC).toInt(); + const auto fileAction = _fileActions.at(row).name; + const auto errorMessage = tr("%1 did not succeed, please try again later. " + "If you need help, contact your server administrator.", + "file action error message").arg(fileAction); if (statusCode != 200) { qCWarning(lcFileActions) << "File action did not succeed for" << _localPath; + setResponse({ errorMessage, _accountUrl }); + return; } + + const auto root = json.object().value(QStringLiteral("root")).toObject(); const auto folderForPath = FolderMan::instance()->folderForPath(_localPath); - setResponse({ message, _accountState->account()->url().toString() }); + const auto remoteFolderPath = _accountUrl + folderForPath->remotePath(); + const auto successMessage = tr("%1 done.", "file action success message").arg(fileAction); + if (root.empty()) { + setResponse({ successMessage, remoteFolderPath }); + return; + } + + const auto orientation = root.value(QStringLiteral("orientation")).toString(); + const auto rows = root.value(QStringLiteral("rows")).toArray(); + if (rows.empty()) { + setResponse({ successMessage, remoteFolderPath }); + return; + } + + for (const auto &rowValue : rows) { + const auto row = rowValue.toObject(); + const auto children = row.value("children").toArray(); + for (const auto &childValue : children) { + const auto child = childValue.toObject(); + setResponse({ child.value(QStringLiteral("element")).toString(), + _accountUrl + child.value(QStringLiteral("url")).toString() }); + } + } } } // namespace OCC diff --git a/src/gui/declarativeui/fileactionsmodel.h b/src/gui/declarativeui/fileactionsmodel.h index 37a4a9c1c5e2f..8b159d61cd363 100644 --- a/src/gui/declarativeui/fileactionsmodel.h +++ b/src/gui/declarativeui/fileactionsmodel.h @@ -97,6 +97,7 @@ public slots: static constexpr char fileIdUrlC[] = "{fileId}"; static constexpr char fileIdC[] = "fileId"; static constexpr char filePathC[] = "filePath"; + static constexpr char rowC[] = "row"; }; } From 538296c6a4c289e2be44428c590546f2dd6e18f1 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 1 Oct 2025 16:13:29 +0200 Subject: [PATCH 21/30] refactor: remove unused DeclarativeUi class. The declarative ui in fact will be returned in the response from file actions. Signed-off-by: Camila Ayres --- src/gui/application.cpp | 3 - src/gui/declarativeui/DeclarativeUiWindow.qml | 90 ------------------- src/gui/owncloudgui.cpp | 8 +- src/gui/owncloudgui.h | 1 - src/gui/systray.cpp | 47 ---------- src/gui/systray.h | 3 - 6 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 src/gui/declarativeui/DeclarativeUiWindow.qml diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 9f1e3234d7410..56f8f6b96f929 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -434,9 +434,6 @@ Application::Application(int &argc, char **argv) connect(FolderMan::instance()->socketApi(), &SocketApi::fileActionsCommandReceived, _gui.data(), &ownCloudGui::slotShowFileActionsDialog); - connect(FolderMan::instance()->socketApi(), &SocketApi::declarativeUiCommandReceived, - _gui.data(), &ownCloudGui::slotShowDeclarativeUiDialog); - // startup procedure. connect(&_checkConnectionTimer, &QTimer::timeout, this, &Application::slotCheckConnection); _checkConnectionTimer.setInterval(ConnectionValidator::DefaultCallingIntervalMsec); // check for connection every 32 seconds. diff --git a/src/gui/declarativeui/DeclarativeUiWindow.qml b/src/gui/declarativeui/DeclarativeUiWindow.qml deleted file mode 100644 index d08f05543e79d..0000000000000 --- a/src/gui/declarativeui/DeclarativeUiWindow.qml +++ /dev/null @@ -1,90 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -import QtQuick -import QtQuick.Window -import QtQuick.Layouts -import QtQuick.Controls - -import com.nextcloud.desktopclient -import Style - -ApplicationWindow { - id: root - width: 400 - height: 500 - minimumWidth: 300 - minimumHeight: 300 - LayoutMirroring.childrenInherit: true - LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft - - property var accountState: ({}) - property string localPath: "" - - title: qsTr("Declarative UI for %1").arg(root.localPath) - - Component { - id: declarativeUiDelegate - - Item { - id: declarativeUiItem - width: parent.width - height: 40 - - required property string name - required property string type - required property string label - required property string url - required property string text - - Row { - anchors.fill: parent - anchors.margins: 8 - spacing: 5 - height: implicitHeight - - Text { - text: declarativeUiItem.text - color: Style.accentColor - font.pixelSize: Style.pixelSize - verticalAlignment: Text.AlignVCenter - visible: declarativeUiItem.name == "Text" - } - - Image { - source: declarativeUiItem.url - width: 50 - height: 50 - verticalAlignment: Text.AlignVCenter - visible: declarativeUiItem.name == "Image" - } - - Button { - text: declarativeUiItem.label - width: 120 - height: 30 - visible: declarativeUiItem.name == "Button" - } - } - } - } - - DeclarativeUi { - id: declarativeUi - accountState: root.accountState - localPath: root.localPath - } - - ListView { - id: declarativeUiView - model: declarativeUi.declarativeUiModel - delegate: declarativeUiDelegate - - anchors.fill: parent - anchors.margins: 10 - } - - -} diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index eed41b9663dca..215a90237e3a2 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -33,7 +33,7 @@ #include "tray/sortedactivitylistmodel.h" #include "tray/syncstatussummary.h" #include "tray/unifiedsearchresultslistmodel.h" -#include "declarativeui/declarativeui.h" +#include "declarativeui/fileactionsmodel.h" #include "filesystem.h" #ifdef WITH_LIBCLOUDPROVIDERS @@ -135,7 +135,6 @@ ownCloudGui::ownCloudGui(Application *parent) qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "ShareeModel"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "SortedShareModel"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel"); - qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "DeclarativeUi"); qmlRegisterType("com.nextcloud.desktopclient", 1, 0, "FileActionsModel"); qmlRegisterUncreatableType("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel"); @@ -718,11 +717,6 @@ void ownCloudGui::slotShowFileActivityDialog(const QString &localPath) const _tray->createFileActivityDialog(localPath); } -void ownCloudGui::slotShowDeclarativeUiDialog(const QString &localPath) const -{ - _tray->showDeclarativeUiDialog(localPath); -} - void ownCloudGui::slotShowFileActionsDialog(const QString &localPath) const { _tray->showFileActionsDialog(localPath); diff --git a/src/gui/owncloudgui.h b/src/gui/owncloudgui.h index b069a900c2645..187fbbee0271e 100644 --- a/src/gui/owncloudgui.h +++ b/src/gui/owncloudgui.h @@ -95,7 +95,6 @@ public slots: */ void slotShowShareDialog(const QString &localPath) const; void slotShowFileActivityDialog(const QString &localPath) const; - void slotShowDeclarativeUiDialog(const QString &localPath) const; void slotShowFileActionsDialog(const QString &localPath) const; void slotNewAccountWizard(); diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 6be2fab4e833a..84e1707ec88e5 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -437,52 +437,11 @@ void Systray::createFileActivityDialog(const QString &localPath) Q_EMIT showFileDetailsPage(localPath, FileDetailsPage::Activity); } -void Systray::showDeclarativeUiDialog(const QString &localPath) -{ - createDeclarativeUiDialog(localPath); -} - void Systray::showFileActionsDialog(const QString &localPath) { createFileActionsDialog(localPath); } -void Systray::createDeclarativeUiDialog(const QString &localPath) -{ - if (!_trayEngine) { - qCWarning(lcSystray) << "Could not open declarative UI dialog for" << localPath << "as no tray engine was available"; - return; - } - - const auto folder = FolderMan::instance()->folderForPath(localPath); - if (!folder) { - qCWarning(lcSystray) << "Could not open declarative UI dialog for" << localPath << "no responsible folder found"; - return; - } - - QQmlComponent declarativeUiQml(trayEngine(), QStringLiteral("qrc:/qml/src/gui/declarativeui/DeclarativeUiWindow.qml")); - if (declarativeUiQml.isError()) { - qCWarning(lcSystray) << declarativeUiQml.errorString(); - qCWarning(lcSystray) << declarativeUiQml.errors(); - return; - } - - const QVariantMap initialProperties{ - {"accountState", QVariant::fromValue(folder->accountState())}, - {"localPath", localPath}, - }; - const auto declarativeUiDialog = declarativeUiQml.createWithInitialProperties(initialProperties); - const auto dialog = qobject_cast(declarativeUiDialog); - if (!dialog) { - qCWarning(lcSystray) << "Declarative UI dialog window resulted in creation of object that was not a window!"; - return; - } - - dialog->show(); - dialog->raise(); - dialog->requestActivate(); -} - void Systray::createFileActionsDialog(const QString &localPath) { if (!_trayEngine) { @@ -535,12 +494,6 @@ void Systray::presentShareViewInTray(const QString &localPath) Q_EMIT showFileDetails(folder->accountState(), localPath, FileDetailsPage::Sharing); } -void Systray::presentDeclarativeUiViewInSystray(const QString &localPath) -{ - qCDebug(lcSystray) << "Opening declarative ui view in tray for " << localPath; - createDeclarativeUiDialog(localPath); -} - void Systray::presentFileActionsViewInSystray(const QString &localPath) { qCDebug(lcSystray) << "Opening file actions view in tray for " << localPath; diff --git a/src/gui/systray.h b/src/gui/systray.h index cc17353503dce..4cc3e4b0a2b65 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -146,11 +146,9 @@ public slots: void createShareDialog(const QString &localPath); void createFileActivityDialog(const QString &localPath); - void showDeclarativeUiDialog(const QString &localPath); void showFileActionsDialog(const QString &localPath); void presentShareViewInTray(const QString &localPath); - void presentDeclarativeUiViewInSystray(const QString &localPath); void presentFileActionsViewInSystray(const QString &localPath); private slots: @@ -169,7 +167,6 @@ private slots: void setupContextMenu(); void createFileDetailsDialog(const QString &localPath); - void createDeclarativeUiDialog(const QString &localPath); void createFileActionsDialog(const QString &localPath); [[nodiscard]] QScreen *currentScreen() const; From ea43cd1645a3ea834d420ffdb9220c937fff2088 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 1 Oct 2025 16:35:08 +0200 Subject: [PATCH 22/30] fix: files license. Signed-off-by: Camila Ayres --- REUSE.toml | 2 +- src/gui/declarativeui/FileActionsWindow.qml | 2 +- src/gui/declarativeui/fileactionsmodel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index 01cee8866b8af..b2a3151cd9cf0 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -127,7 +127,7 @@ SPDX-FileCopyrightText = "2016 Nextcloud GmbH" SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks" [[annotations]] -path = ["theme/white/error.svg", "theme/black/error.svg","theme/white/warning.svg", "theme/black/warning.svg", "theme/white/info.svg", "theme/black/info.svg", "theme/info.svg", "theme/white/nextcloud/*.svg", "theme/black/nextcloud/*.svg", "theme/colored/nextcloud/*.svg", "theme/black/label.svg", "theme/white/label.svg", "theme/colored/user-status-*.svg", "theme/account.svg","theme/add.svg","theme/change.svg","theme/chevron-double-up.svg","theme/close.svg","theme/confirm.svg","theme/copy.svg","theme/delete.svg","theme/external.svg","theme/files.svg","theme/lock-broken.svg","theme/lock-http.svg","theme/lock-https.svg","theme/lock.svg","theme/magnifying-glass.svg","theme/more.svg","theme/network.svg","theme/public.svg","theme/reply.svg","theme/send.svg","theme/settings.svg","theme/share.svg","theme/sync-arrow.svg", "theme/black/account-group.svg","theme/black/clear.svg","theme/black/expand-less-black.svg","theme/black/folder-group.svg","theme/black/search.svg", "theme/colored/add-bordered.svg", "theme/colored/change-bordered.svg", "theme/colored/delete-bordered.svg", "theme/colored/delete.svg", "theme/*/activity.svg", "theme/*/add.svg","theme/*/bell.svg","theme/*/calendar.svg","theme/*/caret-down.svg","theme/*/change.svg","theme/*/close.svg","theme/*/comment.svg","theme/*/confirm.svg","theme/*/control-next.svg","theme/*/control-prev.svg","theme/*/edit.svg","theme/*/email.svg","theme/*/external.png","theme/*/external.svg","theme/*/external@2x.png","theme/*/folder.png","theme/*/folder.svg","theme/*/folder@2x.png","theme/*/more-apps.svg","theme/*/nc-assistant-app.svg","theme/*/settings.svg","theme/*/user.svg","theme/*/wizard-files.png","theme/*/wizard-files.svg","theme/*/wizard-files@2x.png","theme/*/wizard-groupware.png","theme/*/wizard-groupware.svg","theme/*/wizard-groupware@2x.png", "theme/cfapishellext_custom_states/0-locked.svg","theme/cfapishellext_custom_states/1-shared.svg","theme/cfapishellext_custom_states/1024-0-locked.png","theme/cfapishellext_custom_states/1024-1-shared.png","theme/cfapishellext_custom_states/128-0-locked.png","theme/cfapishellext_custom_states/128-1-shared.png","theme/cfapishellext_custom_states/24-0-locked.png","theme/cfapishellext_custom_states/24-1-shared.png","theme/cfapishellext_custom_states/256-0-locked.png","theme/cfapishellext_custom_states/256-1-shared.png","theme/cfapishellext_custom_states/32-0-locked.png","theme/cfapishellext_custom_states/32-1-shared.png","theme/cfapishellext_custom_states/40-0-locked.png","theme/cfapishellext_custom_states/40-1-shared.png","theme/cfapishellext_custom_states/48-0-locked.png","theme/cfapishellext_custom_states/48-1-shared.png","theme/cfapishellext_custom_states/512-0-locked.png","theme/cfapishellext_custom_states/512-1-shared.png","theme/cfapishellext_custom_states/64-0-locked.png","theme/cfapishellext_custom_states/64-1-shared.png"] +path = ["theme/white/error.svg", "theme/black/error.svg","theme/white/warning.svg", "theme/black/warning.svg", "theme/white/info.svg", "theme/black/info.svg", "theme/info.svg", "theme/white/nextcloud/*.svg", "theme/black/nextcloud/*.svg", "theme/colored/nextcloud/*.svg", "theme/black/label.svg", "theme/white/label.svg", "theme/colored/user-status-*.svg", "theme/account.svg","theme/add.svg","theme/change.svg","theme/chevron-double-up.svg","theme/close.svg","theme/confirm.svg","theme/copy.svg","theme/delete.svg","theme/external.svg","theme/files.svg","theme/lock-broken.svg","theme/lock-http.svg","theme/lock-https.svg","theme/lock.svg","theme/magnifying-glass.svg","theme/more.svg","theme/network.svg","theme/public.svg","theme/reply.svg","theme/send.svg","theme/settings.svg","theme/share.svg","theme/sync-arrow.svg", "theme/black/account-group.svg","theme/black/clear.svg","theme/black/expand-less-black.svg","theme/black/folder-group.svg","theme/black/search.svg", "theme/colored/add-bordered.svg", "theme/colored/change-bordered.svg", "theme/colored/delete-bordered.svg", "theme/colored/delete.svg", "theme/*/activity.svg", "theme/*/add.svg","theme/*/bell.svg","theme/*/calendar.svg","theme/*/caret-down.svg","theme/*/change.svg","theme/*/close.svg","theme/*/comment.svg","theme/*/confirm.svg","theme/*/control-next.svg","theme/*/control-prev.svg","theme/*/edit.svg","theme/*/email.svg","theme/*/external.png","theme/*/external.svg","theme/*/external@2x.png","theme/*/folder.png","theme/*/folder.svg","theme/*/folder@2x.png","theme/*/more-apps.svg","theme/*/nc-assistant-app.svg","theme/*/settings.svg","theme/*/user.svg","theme/*/wizard-files.png","theme/*/wizard-files.svg","theme/*/wizard-files@2x.png","theme/*/wizard-groupware.png","theme/*/wizard-groupware.svg","theme/*/wizard-groupware@2x.png", "theme/cfapishellext_custom_states/0-locked.svg","theme/cfapishellext_custom_states/1-shared.svg","theme/cfapishellext_custom_states/1024-0-locked.png","theme/cfapishellext_custom_states/1024-1-shared.png","theme/cfapishellext_custom_states/128-0-locked.png","theme/cfapishellext_custom_states/128-1-shared.png","theme/cfapishellext_custom_states/24-0-locked.png","theme/cfapishellext_custom_states/24-1-shared.png","theme/cfapishellext_custom_states/256-0-locked.png","theme/cfapishellext_custom_states/256-1-shared.png","theme/cfapishellext_custom_states/32-0-locked.png","theme/cfapishellext_custom_states/32-1-shared.png","theme/cfapishellext_custom_states/40-0-locked.png","theme/cfapishellext_custom_states/40-1-shared.png","theme/cfapishellext_custom_states/48-0-locked.png","theme/cfapishellext_custom_states/48-1-shared.png","theme/cfapishellext_custom_states/512-0-locked.png","theme/cfapishellext_custom_states/512-1-shared.png","theme/cfapishellext_custom_states/64-0-locked.png","theme/cfapishellext_custom_states/64-1-shared.png", "theme/backup.svg", "theme/convert_to_text.svg", "theme/file-open.svg"] precedence = "aggregate" SPDX-FileCopyrightText = "2018-2025 Google LLC" SPDX-License-Identifier = "Apache-2.0" diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 420c7e6d98a3b..871c2a89d886f 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/src/gui/declarativeui/fileactionsmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp index 44ed83ad42c6c..4e46019f04bcb 100644 --- a/src/gui/declarativeui/fileactionsmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: GPL-2.0-or-later */ From fa0b1ddd6bfe5317d9ccff34cfed2e8307a7ffa2 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 1 Oct 2025 17:23:24 +0200 Subject: [PATCH 23/30] refactor: remove Declarative UI menu item. Signed-off-by: Camila Ayres --- src/gui/tray/ActivityItemContent.qml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 6bbf27ae5e95e..747483b9a7897 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -206,14 +206,6 @@ RowLayout { hoverEnabled: true onClicked: Systray.presentFileActionsViewInSystray(model.openablePath) } - - MenuItem { - height: visible ? implicitHeight : 0 - text: qsTr("Declarative UI") - font.pixelSize: Style.topLinePixelSize - hoverEnabled: true - onClicked: Systray.presentDeclarativeUiViewInSystray(model.openablePath) - } } } From e1c82dfe5a9144dd51141ff3802afc8db0cf0bd5 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 1 Oct 2025 17:29:07 +0200 Subject: [PATCH 24/30] fix: use reference type in for loop. Signed-off-by: Camila Ayres --- src/libsync/capabilities.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index f2aff98165705..b999a797f8fa1 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -446,7 +446,7 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT { const auto declarativeUiMap = _capabilities.value("declarativeui").toMap(); QVariantList contextMenuMapList; - for (auto declarativeUiApp : std::as_const(declarativeUiMap)) { + for (const auto &declarativeUiApp : std::as_const(declarativeUiMap)) { const auto declarativeUiContextMenuMap = declarativeUiApp.toMap(); if (!declarativeUiContextMenuMap.contains("context-menu")) { continue; @@ -466,12 +466,12 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT qCDebug(lcServerCapabilities) << "File actions mimeType aliases:" << fileMimeTypeAliases; QList contextMenuByMimeType; - for (const auto &contextMenu : contextMenuMapList) { + for (const auto &contextMenu : std::as_const(contextMenuMapList)) { const auto contextMenuMap = contextMenu.toMap(); const auto mimetypeFilters = contextMenuMap.value("mimetype_filters").toString(); const auto filesMimeTypeFilterList = mimetypeFilters.split(",", Qt::SkipEmptyParts); - for (const auto mimeType : filesMimeTypeFilterList) { + for (const auto &mimeType : std::as_const(filesMimeTypeFilterList)) { auto capabilitiesMimeTypeName = mimeType.trimmed(); qCDebug(lcServerCapabilities) << "Context menu for mimeType:" << capabilitiesMimeTypeName; From c1df9388500ac17201621fce83ba55f0517e78a3 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 1 Oct 2025 18:26:09 +0200 Subject: [PATCH 25/30] fix: spaces and sizes in the file actions window. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 55 ++++++++++++--------- theme/Style/Style.qml | 2 + 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 871c2a89d886f..47280fff6cff6 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -3,6 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +pragma ComponentBehavior: Bound + import QtQuick import QtQuick.Window import QtQuick.Layouts @@ -13,8 +15,8 @@ import Style ApplicationWindow { id: root - height: Style.trayWindowWidth - width: Systray.useNormalWindow ? Style.trayWindowHeight : Style.trayWindowWidth + height: Style.filesActionsHeight + width: Style.filesActionsWidth flags: Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint visible: true color: "transparent" @@ -69,8 +71,8 @@ ApplicationWindow { Image { source: "image://svgimage-custom-color/file-open.svg/" + palette.windowText - width: Style.minimumActivityItemHeight - height: Style.minimumActivityItemHeight + Layout.maximumWidth: Style.minimumActivityItemHeight + Layout.maximumHeight: Style.minimumActivityItemHeight Layout.alignment: Qt.AlignVCenter Layout.margins: Style.extraSmallSpacing } @@ -112,7 +114,7 @@ ApplicationWindow { Rectangle { id: lineTop Layout.fillWidth: true - height: Style.extraExtraSmallSpacing + Layout.minimumHeight: Style.extraExtraSmallSpacing color: palette.dark } @@ -131,7 +133,7 @@ ApplicationWindow { visible: responseText.text !== "" flat: true Layout.fillWidth: true - implicitHeight: Style.activityListButtonHeight + implicitHeight: responseContent.implicitHeight padding: Style.standardSpacing leftPadding: Style.standardSpacing @@ -139,26 +141,31 @@ ApplicationWindow { spacing: Style.standardSpacing background: Rectangle { + id: responseBorder radius: root.windowRadius border.width: Style.trayWindowBorderWidth border.color: palette.dark color: palette.window + Layout.fillWidth: true } - contentItem: Row { + contentItem: RowLayout { id: responseContent anchors.fill: parent anchors.margins: Style.smallSpacing spacing: Style.standardSpacing - padding: Style.standardSpacing Layout.fillWidth: true + Layout.minimumHeight: Style.accountAvatarStateIndicatorSize Image { source: "image://svgimage-custom-color/backup.svg/" + palette.windowText - width: Style.accountAvatarStateIndicatorSize - height: Style.accountAvatarStateIndicatorSize + // Layout.preferredWidth: Style.accountAvatarStateIndicatorSize + // Layout.preferredHeight: Style.accountAvatarStateIndicatorSize + Layout.minimumWidth: Style.accountAvatarStateIndicatorSize + Layout.minimumHeight: Style.accountAvatarStateIndicatorSize fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + Layout.leftMargin: Style.standardSpacing } Text { @@ -168,7 +175,10 @@ ApplicationWindow { color: palette.text font.pointSize: Style.pixelSize font.underline: true - anchors.verticalCenter: parent.verticalCenter + wrapMode: Text.WordWrap + Layout.fillWidth: true + bottomPadding: Style.standardSpacing + Layout.alignment: Qt.AlignVCenter } } @@ -186,9 +196,8 @@ ApplicationWindow { id: fileActionsDelegate RowLayout { + id: fileAction Layout.fillWidth: true - Layout.margins: Style.standardSpacing - spacing: Style.standardSpacing height: implicitHeight width: parent.width @@ -203,25 +212,27 @@ ApplicationWindow { implicitHeight: Style.activityListButtonHeight padding: Style.standardSpacing - spacing: Style.standardSpacing contentItem: Row { id: fileActionsContent anchors.fill: parent - anchors.margins: Style.standardSpacing + anchors.topMargin: Style.standardSpacing + anchors.rightMargin: Style.standardSpacing + anchors.bottomMargin: Style.standardSpacing + anchors.leftMargin: Style.smallSpacing spacing: Style.standardSpacing Layout.fillWidth: true Image { - source: icon + palette.windowText - width: Style.activityListButtonHeight - height: Style.activityListButtonHeight + source: fileAction.icon + palette.windowText + width: Style.activityListButtonIconSize + height: Style.activityListButtonIconSize fillMode: Image.PreserveAspectFit anchors.verticalCenter: parent.verticalCenter } Label { - text: name + text: fileAction.name color: palette.text font.pixelSize: Style.defaultFontPtSize verticalAlignment: Text.AlignVCenter @@ -232,7 +243,7 @@ ApplicationWindow { background: Rectangle { color: "transparent" radius: root.windowRadius - border.width: parent.hovered ? Style.trayWindowBorderWidth : 0 + border.width: fileActionButton.hovered ? Style.trayWindowBorderWidth : 0 border.color: palette.dark anchors.margins: Style.standardSpacing height: parent.height @@ -244,7 +255,7 @@ ApplicationWindow { anchors.fill: parent anchors.margins: Style.standardSpacing cursorShape: Qt.PointingHandCursor - onClicked: fileActionModel.createRequest(index) + onClicked: fileActionModel.createRequest(fileAction.index) } } } diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml index 98856f8c8e126..07d80f19e53f7 100644 --- a/theme/Style/Style.qml +++ b/theme/Style/Style.qml @@ -50,6 +50,8 @@ QtObject { property int trayHorizontalMargin: 10 property int trayModalWidth: 380 property int trayModalHeight: 490 + property int filesActionsWidth: 380 + property int filesActionsHeight: 350 property int trayListItemIconSize: accountAvatarSize property int trayDrawerMargin: trayWindowHeaderHeight property real thumbnailImageSizeReduction: 0.2 // We reserve some space within the thumbnail "item", here about 20%. From f1caf41b2db5ae640aa807764a1b6299da2bc97d Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 20 Jan 2026 13:30:43 +0100 Subject: [PATCH 26/30] fix: remove missing file from resources. Signed-off-by: Camila Ayres --- resources.qrc | 1 - 1 file changed, 1 deletion(-) diff --git a/resources.qrc b/resources.qrc index 0ce9ba9810fd4..4d6ff74aef0c3 100644 --- a/resources.qrc +++ b/resources.qrc @@ -61,7 +61,6 @@ src/gui/ConflictItemFileInfo.qml src/gui/macOS/ui/FileProviderSettings.qml src/gui/macOS/ui/FileProviderFileDelegate.qml - src/gui/declarativeui/DeclarativeUiWindow.qml src/gui/declarativeui/FileActionsWindow.qml From 3c3dd1f6d21971273cce69614dcb4a6d000adccb Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 20 Jan 2026 20:10:29 +0100 Subject: [PATCH 27/30] fix: update capabilities with new json key + adjust mimetype check. Signed-off-by: Camila Ayres --- src/libsync/capabilities.cpp | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index b999a797f8fa1..1091a2f7e07b9 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -439,12 +439,12 @@ QStringList Capabilities::forbiddenFilenameExtensions() const bool Capabilities::serverHasDeclarativeUi() const { - return _capabilities[QStringLiteral("declarativeui")].toMap().isEmpty(); + return _capabilities[QStringLiteral("client_integration")].toMap().isEmpty(); } QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeType) const { - const auto declarativeUiMap = _capabilities.value("declarativeui").toMap(); + const auto declarativeUiMap = _capabilities.value("client_integration").toMap(); QVariantList contextMenuMapList; for (const auto &declarativeUiApp : std::as_const(declarativeUiMap)) { const auto declarativeUiContextMenuMap = declarativeUiApp.toMap(); @@ -464,6 +464,8 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT qCDebug(lcServerCapabilities) << "Filtering file actions by mimeType:" << fileMimeTypeName; const auto fileMimeTypeAliases = fileMimeType.aliases(); qCDebug(lcServerCapabilities) << "File actions mimeType aliases:" << fileMimeTypeAliases; + const auto fileMimeTypeParents = fileMimeType.parentMimeTypes(); + qCDebug(lcServerCapabilities) << "File actions parent mimeTypes:" << fileMimeTypeParents; QList contextMenuByMimeType; for (const auto &contextMenu : std::as_const(contextMenuMapList)) { @@ -472,10 +474,24 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT const auto filesMimeTypeFilterList = mimetypeFilters.split(",", Qt::SkipEmptyParts); for (const auto &mimeType : std::as_const(filesMimeTypeFilterList)) { - auto capabilitiesMimeTypeName = mimeType.trimmed(); - qCDebug(lcServerCapabilities) << "Context menu for mimeType:" << capabilitiesMimeTypeName; + auto capabilitiesMimeType = mimeType.trimmed(); + QString mimeTypeAlias; + if(const auto capabilitiesMimeTypeSplit = capabilitiesMimeType.split("/"); + !capabilitiesMimeTypeSplit.isEmpty()){ + mimeTypeAlias = capabilitiesMimeTypeSplit.last(); + } + + qCDebug(lcServerCapabilities) << "Context menu for mimeType:" << mimeTypeAlias << capabilitiesMimeType; + + qCDebug(lcServerCapabilities) << fileMimeTypeName << "inherits" << capabilitiesMimeType << "?" + << fileMimeType.inherits(capabilitiesMimeType); - if (!fileMimeTypeName.startsWith(capabilitiesMimeTypeName) && !fileMimeTypeAliases.contains(capabilitiesMimeTypeName)) { + if (!fileMimeTypeName.startsWith(capabilitiesMimeType) + && !fileMimeTypeName.contains(capabilitiesMimeType) + && !fileMimeType.inherits(capabilitiesMimeType) && + !fileMimeTypeName.startsWith(mimeTypeAlias) + && !fileMimeTypeName.contains(mimeTypeAlias) + && !fileMimeType.inherits(mimeTypeAlias)) { continue; } From 1e4b1ef037c5e9655c3a4291b96ca6be7833831b Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 21 Jan 2026 12:12:11 +0100 Subject: [PATCH 28/30] fix: use EnforcedPlainTextLabel instead of Label. Signed-off-by: Camila Ayres --- src/gui/declarativeui/FileActionsWindow.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/declarativeui/FileActionsWindow.qml b/src/gui/declarativeui/FileActionsWindow.qml index 47280fff6cff6..2ef9f9987b15a 100644 --- a/src/gui/declarativeui/FileActionsWindow.qml +++ b/src/gui/declarativeui/FileActionsWindow.qml @@ -12,6 +12,7 @@ import QtQuick.Controls import Qt5Compat.GraphicalEffects import com.nextcloud.desktopclient import Style +import "./../tray" ApplicationWindow { id: root @@ -77,7 +78,7 @@ ApplicationWindow { Layout.margins: Style.extraSmallSpacing } - Label { + EnforcedPlainTextLabel { id: headerLocalPath text: root.shortLocalPath elide: Text.ElideRight @@ -231,7 +232,7 @@ ApplicationWindow { anchors.verticalCenter: parent.verticalCenter } - Label { + EnforcedPlainTextLabel { text: fileAction.name color: palette.text font.pixelSize: Style.defaultFontPtSize From 3522e4767b249ad85592f6efdf42fb46a7cfebc6 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 21 Jan 2026 12:20:32 +0100 Subject: [PATCH 29/30] fix: an empty mimetype_filters means the action is available to all mimetypes. Signed-off-by: Camila Ayres --- src/libsync/capabilities.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 1091a2f7e07b9..32a188e911b4c 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -473,6 +473,12 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT const auto mimetypeFilters = contextMenuMap.value("mimetype_filters").toString(); const auto filesMimeTypeFilterList = mimetypeFilters.split(",", Qt::SkipEmptyParts); + if (filesMimeTypeFilterList.isEmpty()) { + qCDebug(lcServerCapabilities) << "Found file action for all mimetypes:" << contextMenuMap; + contextMenuByMimeType.append(contextMenuMap); + continue; + } + for (const auto &mimeType : std::as_const(filesMimeTypeFilterList)) { auto capabilitiesMimeType = mimeType.trimmed(); QString mimeTypeAlias; @@ -486,7 +492,8 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT qCDebug(lcServerCapabilities) << fileMimeTypeName << "inherits" << capabilitiesMimeType << "?" << fileMimeType.inherits(capabilitiesMimeType); - if (!fileMimeTypeName.startsWith(capabilitiesMimeType) + if (!capabilitiesMimeType.isEmpty() + && !fileMimeTypeName.startsWith(capabilitiesMimeType) && !fileMimeTypeName.contains(capabilitiesMimeType) && !fileMimeType.inherits(capabilitiesMimeType) && !fileMimeTypeName.startsWith(mimeTypeAlias) @@ -497,7 +504,6 @@ QList Capabilities::contextMenuByMimeType(const QMimeType fileMimeT qCDebug(lcServerCapabilities) << "Found file action:" << contextMenuMap; contextMenuByMimeType.append(contextMenuMap); - break; } } From 2554ede2ab4cd2743f96e43c16e250821a6f0f66 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 21 Jan 2026 15:49:28 +0100 Subject: [PATCH 30/30] fix: handle the new params format. Signed-off-by: Camila Ayres --- src/gui/declarativeui/fileactionsmodel.cpp | 34 +++++++++++++--------- src/gui/declarativeui/fileactionsmodel.h | 12 ++++++-- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/gui/declarativeui/fileactionsmodel.cpp b/src/gui/declarativeui/fileactionsmodel.cpp index 4e46019f04bcb..ffb32e25da8d9 100644 --- a/src/gui/declarativeui/fileactionsmodel.cpp +++ b/src/gui/declarativeui/fileactionsmodel.cpp @@ -31,7 +31,7 @@ QVariant FileActionsModel::data(const QModelIndex &index, int role) const case FileActionMethodRole: return _fileActions.at(row).method; // GET case FileActionParamsRole: - return _fileActions.at(row).params; // filePath + return QVariant::fromValue>(_fileActions.at(row).params); } return {}; @@ -194,11 +194,29 @@ void FileActionsModel::parseEndpoints() } for (const auto &contextMenu : contextMenuList) { + ParamsList queryParams; + const auto paramsMap = contextMenu.value("params").toMap(); + for (auto param = paramsMap.cbegin(), end = paramsMap.cend(); param != end; ++param) { + const auto name = param.key(); + QByteArray value; + if (name == fileIdC) { + value = _fileId; + } + + if (param.key() == filePathC) { + value = _filePath.toUtf8(); + } + + if (!value.isEmpty()) { + queryParams.append( QueryItem{ name, value } ); + } + } + _fileActions.append({ parseIcon(contextMenu.value("icon").toString()), contextMenu.value("name").toString(), contextMenu.value("url").toString(), contextMenu.value("method").toString(), - contextMenu.value("params").toStringList() }); + queryParams }); } qCDebug(lcFileActions) << "File" << _localPath << "has" << _fileActions.size() << "actions available."; @@ -234,18 +252,8 @@ void FileActionsModel::createRequest(const int row) this); connect(job, &JsonApiJob::jsonReceived, this, &FileActionsModel::processRequest); - QUrlQuery params; for (const auto ¶m : _fileActions.at(row).params) { - if (param == fileIdC) { - params.addQueryItem(param, _fileId); - } - - if (param == filePathC) { - params.addQueryItem(param, _filePath); - } - } - if (!params.isEmpty()) { - job->addQueryParams(params); + job->addQueryParams(param.name, param.value); } const auto verb = job->stringToVerb(_fileActions.at(row).method); job->setVerb(verb); diff --git a/src/gui/declarativeui/fileactionsmodel.h b/src/gui/declarativeui/fileactionsmodel.h index 8b159d61cd363..0545eafdfae5f 100644 --- a/src/gui/declarativeui/fileactionsmodel.h +++ b/src/gui/declarativeui/fileactionsmodel.h @@ -43,6 +43,12 @@ class FileActionsModel : public QAbstractListModel { QString url; }; + struct QueryItem { + QString name; + QByteArray value; + }; + using ParamsList = QList; + [[nodiscard]] AccountState *accountState() const; void setAccountState(AccountState *accountState); @@ -83,7 +89,7 @@ public slots: QString name; QString url; QString method; - QList params; + ParamsList params; }; QList _fileActions; AccountState *_accountState; @@ -99,5 +105,7 @@ public slots: static constexpr char filePathC[] = "filePath"; static constexpr char rowC[] = "row"; }; - } + +Q_DECLARE_METATYPE(OCC::FileActionsModel::ParamsList) +Q_DECLARE_METATYPE(OCC::FileActionsModel::QueryItem)