From d428915d35aedcf8d11610519af74f6df127edfa Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 11 Aug 2023 07:33:49 +0800 Subject: [PATCH] More distinctly name server allowing resharing property Signed-off-by: Claudio Cambra --- src/gui/filedetails/ShareDelegate.qml | 4 ++-- src/gui/filedetails/ShareDetailsPage.qml | 6 +++--- src/gui/filedetails/ShareView.qml | 4 ++-- src/gui/filedetails/sharemodel.cpp | 4 ++-- src/gui/filedetails/sharemodel.h | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml index 26a4db206..0974c92d5 100644 --- a/src/gui/filedetails/ShareDelegate.qml +++ b/src/gui/filedetails/ShareDelegate.qml @@ -52,7 +52,7 @@ GridLayout { property bool backgroundsVisible: true property bool canCreateLinkShares: true - property bool canReshare: true + property bool serverAllowsResharing: true readonly property bool isLinkShare: model.shareType === ShareModel.ShareTypeLink readonly property bool isPlaceholderLinkShare: model.shareType === ShareModel.ShareTypePlaceholderLink @@ -269,7 +269,7 @@ GridLayout { shareModelData: model canCreateLinkShares: root.canCreateLinkShares - canReshare: root.canReshare + serverAllowsResharing: root.serverAllowsResharing onCloseShareDetails: root.rootStackView.pop(root.rootStackView.initialItem, StackView.PopTransition) diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 3d908a17c..41bc8deb9 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -49,7 +49,7 @@ Page { property var shareModelData: ({}) property bool canCreateLinkShares: true - property bool canReshare: true + property bool serverAllowsResharing: true readonly property var share: shareModelData.share ?? ({}) @@ -448,8 +448,8 @@ Page { checkable: true checked: root.resharingAllowed text: qsTr("Allow resharing") - enabled: !root.isSharePermissionChangeInProgress && root.canReshare - visible: root.canReshare + enabled: !root.isSharePermissionChangeInProgress && root.serverAllowsResharing + visible: root.serverAllowsResharing onClicked: root.toggleAllowResharing(checked); Connections { diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml index 5b9ce77b6..3a89dc4eb 100644 --- a/src/gui/filedetails/ShareView.qml +++ b/src/gui/filedetails/ShareView.qml @@ -35,7 +35,7 @@ ColumnLayout { readonly property bool sharingPossible: shareModel && shareModel.canShare && shareModel.sharingEnabled readonly property bool userGroupSharingPossible: sharingPossible && shareModel.userGroupSharingEnabled readonly property bool publicLinkSharingPossible: sharingPossible && shareModel.publicLinkSharesEnabled - readonly property bool resharingAllowed: shareModel && shareModel.resharingAllowed + readonly property bool serverAllowsResharing: shareModel && shareModel.serverAllowsResharing readonly property bool loading: sharingPossible && (!shareModel || shareModel.fetchOngoing || @@ -215,7 +215,7 @@ ColumnLayout { rootStackView: root.rootStackView backgroundsVisible: root.backgroundsVisible canCreateLinkShares: root.publicLinkSharingPossible - canReshare: root.resharingAllowed + serverAllowsResharing: root.serverAllowsResharing onCreateNewLinkShare: { root.waitingForSharesToChange = true; diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp index 3205b7041..9b748fa73 100644 --- a/src/gui/filedetails/sharemodel.cpp +++ b/src/gui/filedetails/sharemodel.cpp @@ -1251,7 +1251,7 @@ void ShareModel::setAccountState(AccountState *accountState) Q_EMIT sharingEnabledChanged(); Q_EMIT publicLinkSharesEnabledChanged(); Q_EMIT userGroupSharingEnabledChanged(); - Q_EMIT resharingAllowedChanged(); + Q_EMIT serverAllowsResharingChanged(); updateData(); } @@ -1311,7 +1311,7 @@ bool ShareModel::canShare() const return _maxSharingPermissions & SharePermissionShare; } -bool ShareModel::resharingAllowed() const +bool ShareModel::serverAllowsResharing() const { return _accountState && _accountState->account() && _accountState->account()->capabilities().isValid() && _accountState->account()->capabilities().shareResharing(); diff --git a/src/gui/filedetails/sharemodel.h b/src/gui/filedetails/sharemodel.h index b38499d27..896c9029e 100644 --- a/src/gui/filedetails/sharemodel.h +++ b/src/gui/filedetails/sharemodel.h @@ -35,7 +35,7 @@ class ShareModel : public QAbstractListModel Q_PROPERTY(bool canShare READ canShare NOTIFY sharePermissionsChanged) Q_PROPERTY(bool fetchOngoing READ fetchOngoing NOTIFY fetchOngoingChanged) Q_PROPERTY(bool hasInitialShareFetchCompleted READ hasInitialShareFetchCompleted NOTIFY hasInitialShareFetchCompletedChanged) - Q_PROPERTY(bool resharingAllowed READ resharingAllowed NOTIFY resharingAllowedChanged) + Q_PROPERTY(bool serverAllowsResharing READ serverAllowsResharing NOTIFY serverAllowsResharingChanged) Q_PROPERTY(QVariantList sharees READ sharees NOTIFY shareesChanged) public: @@ -117,7 +117,7 @@ public: [[nodiscard]] bool publicLinkSharesEnabled() const; [[nodiscard]] bool userGroupSharingEnabled() const; [[nodiscard]] bool canShare() const; - [[nodiscard]] bool resharingAllowed() const; + [[nodiscard]] bool serverAllowsResharing() const; [[nodiscard]] bool fetchOngoing() const; [[nodiscard]] bool hasInitialShareFetchCompleted() const; @@ -137,7 +137,7 @@ signals: void hasInitialShareFetchCompletedChanged(); void shareesChanged(); void internalLinkReady(); - void resharingAllowedChanged(); + void serverAllowsResharingChanged(); void serverError(const int code, const QString &message); void passwordSetError(const QString &shareId, const int code, const QString &message);