Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui/macOS: Remove "advanced settings" section for macOS VFS settings #7928

Merged
merged 4 commits into from
Mar 3, 2025
Merged

gui/macOS: Remove "advanced settings" section for macOS VFS settings #7928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a7fed4
gui/macOS: Remove "Advanced" settings from File Provider settings
claucambra Feb 26, 2025
782ef27
gui/macOS: Reimplement sync button more subtly within the sync status…
claucambra Feb 26, 2025
dfd7ae8
gui/macOS: Add tooltip explaining the "request sync" action in the Fi…
claucambra Feb 26, 2025
e7fcb91
gui/macOS: Use attached tooltip properties rather than creating a new…
claucambra Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions src/gui/macOS/ui/FileProviderSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Page {

FileProviderSyncStatus {
syncStatus: root.controller.domainSyncStatusForAccount(root.accountUserIdAtHost)
onDomainSignalRequested: root.controller.signalFileProviderDomain(root.accountUserIdAtHost)
}

FileProviderFastEnumerationSettings {
Expand Down Expand Up @@ -139,20 +140,6 @@ Page {
}
}
}

EnforcedPlainTextLabel {
Layout.fillWidth: true
Layout.topMargin: Style.standardSpacing
text: qsTr("Advanced")
font.bold: true
font.pointSize: Style.subheaderFontPtSize
elide: Text.ElideRight
}

Button {
text: qsTr("Signal file provider domain")
onClicked: root.controller.signalFileProviderDomain(root.accountUserIdAtHost)
}
}
}
}
Expand Down
13 changes: 13 additions & 0 deletions src/gui/macOS/ui/FileProviderSyncStatus.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.nextcloud.desktopclient 1.0
GridLayout {
id: root

signal domainSignalRequested
required property var syncStatus

rows: syncStatus.syncing ? 2 : 1
Expand Down Expand Up @@ -64,4 +65,16 @@ GridLayout {
value: root.syncStatus.fractionCompleted
visible: root.syncStatus.syncing
}

Button {
id: requestSyncButton
text: qsTr("Request sync")
visible: !root.syncStatus.syncing
hoverEnabled: true
onClicked: root.controller.signalFileProviderDomain(root.accountUserIdAtHost)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you meant to emit the domainSignalRequested signal here


ToolTip.visible: hovered
ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval
ToolTip.text: qsTr("Request a sync of changes for the VFS environment.\nmacOS may ignore or delay this request.")
}
}
Loading