From 19d1971612252b9fb6cd628225427a800a1fe3c5 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 20 Feb 2024 16:56:14 +0800 Subject: [PATCH] Enable reloading of materialised items model from within file provider eviction dialog Signed-off-by: Claudio Cambra --- src/gui/macOS/fileprovidersettingscontroller_mac.mm | 5 ++++- src/gui/macOS/ui/FileProviderEvictionDialog.qml | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gui/macOS/fileprovidersettingscontroller_mac.mm b/src/gui/macOS/fileprovidersettingscontroller_mac.mm index 87be8bd03..5e6f89241 100644 --- a/src/gui/macOS/fileprovidersettingscontroller_mac.mm +++ b/src/gui/macOS/fileprovidersettingscontroller_mac.mm @@ -442,7 +442,8 @@ QAbstractListModel *FileProviderSettingsController::materialisedItemsModelForAcc const auto model = new FileProviderMaterialisedItemsModel(this); model->setItems(items); - connect(this, &FileProviderSettingsController::materialisedItemsForAccountChanged, model, [this, model, userIdAtHost](const QString &accountUserIdAtHost) { + connect(this, &FileProviderSettingsController::materialisedItemsForAccountChanged, + model, [this, model, userIdAtHost](const QString &accountUserIdAtHost) { if (accountUserIdAtHost != userIdAtHost) { return; } @@ -464,6 +465,8 @@ void FileProviderSettingsController::createEvictionWindowForAccount(const QStrin {fpMaterialisedItemsModelProp, QVariant::fromValue(model)}, }); const auto dialog = qobject_cast(genericDialog); + QObject::connect(dialog, SIGNAL(reloadMaterialisedItems(QString)), + this, SLOT(refreshMaterialisedItemsForAccount(QString))); Q_ASSERT(dialog); dialog->show(); } diff --git a/src/gui/macOS/ui/FileProviderEvictionDialog.qml b/src/gui/macOS/ui/FileProviderEvictionDialog.qml index b1d1d5dec..15e2b2056 100644 --- a/src/gui/macOS/ui/FileProviderEvictionDialog.qml +++ b/src/gui/macOS/ui/FileProviderEvictionDialog.qml @@ -25,6 +25,8 @@ import com.nextcloud.desktopclient 1.0 ApplicationWindow { id: root + signal reloadMaterialisedItems(string accountUserIdAtHost) + property var materialisedItemsModel: null property string accountUserIdAtHost: "" @@ -33,6 +35,8 @@ ApplicationWindow { width: 640 height: 480 + Component.onCompleted: reloadMaterialisedItems(accountUserIdAtHost) + ColumnLayout { anchors.fill: parent @@ -54,6 +58,7 @@ ApplicationWindow { contentsFont.bold: true bgColor: Style.ncBlue text: qsTr("Reload") + onClicked: reloadMaterialisedItems(accountUserIdAtHost) } } -- 2.39.5