From 8bda3fdce743278c45ce931fec5aecd3f7ec137a Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 2 Aug 2023 17:01:01 +0800 Subject: [PATCH] Hide password field in share settings when share type does not support passwords Signed-off-by: Claudio Cambra --- src/gui/filedetails/ShareDetailsPage.qml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 41bc8deb9f1b6..bc37bb6fdbad6 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -80,6 +80,8 @@ Page { readonly property int currentPermissionMode: shareModelData.currentPermissionMode readonly property bool isLinkShare: shareModelData.shareType === ShareModel.ShareTypeLink + readonly property bool isEmailShare: shareModelData.shareType === ShareModel.ShareTypeEmail + readonly property bool shareSupportsPassword: isLinkShare || isEmailShare readonly property bool isFolderItem: shareModelData.sharedItemType === ShareModel.SharedItemTypeFolder readonly property bool isEncryptedItem: shareModelData.sharedItemType === ShareModel.SharedItemTypeEncryptedFile || shareModelData.sharedItemType === ShareModel.SharedItemTypeEncryptedFolder || shareModelData.sharedItemType === ShareModel.SharedItemTypeEncryptedTopLevelFolder @@ -560,7 +562,10 @@ Page { checkable: true checked: root.passwordProtectEnabled text: qsTr("Password protect") - enabled: !root.waitingForPasswordProtectEnabledChange && !root.passwordEnforced + visible: root.shareSupportsPassword + enabled: visible && + !root.waitingForPasswordProtectEnabledChange && + !root.passwordEnforced onClicked: { root.togglePasswordProtect(checked); @@ -581,7 +586,7 @@ Page { height: visible ? implicitHeight : 0 spacing: scrollContentsColumn.indicatorSpacing - visible: root.passwordProtectEnabled + visible: root.shareSupportsPassword && root.passwordProtectEnabled Image { Layout.preferredWidth: scrollContentsColumn.indicatorItemWidth @@ -603,7 +608,8 @@ Page { height: visible ? implicitHeight : 0 text: root.password !== "" ? root.password : root.passwordPlaceholder - enabled: root.passwordProtectEnabled && + enabled: visible && + root.passwordProtectEnabled && !root.waitingForPasswordChange && !root.waitingForPasswordProtectEnabledChange