From b97ee9a61ed282d4e0a959efa5db2e7dc8071eb5 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 25 Nov 2022 12:53:56 +0100 Subject: [PATCH] Replace use of CustomButton with standard Button Signed-off-by: Claudio Cambra --- src/gui/filedetails/FileDetailsPage.qml | 5 +--- src/gui/filedetails/ShareDelegate.qml | 11 +++------ src/gui/filedetails/ShareDetailsPage.qml | 23 ++++++++----------- .../macOS/ui/FileProviderEvictionDialog.qml | 2 +- src/gui/macOS/ui/FileProviderFileDelegate.qml | 2 +- src/gui/macOS/ui/FileProviderSettings.qml | 4 ++-- src/gui/macOS/ui/FileProviderStorageInfo.qml | 2 +- src/gui/tray/ActivityItemActions.qml | 2 +- src/gui/tray/ActivityItemContent.qml | 4 ++-- src/gui/tray/CallNotificationDialog.qml | 7 ++---- src/gui/tray/MainWindow.qml | 8 +++---- src/gui/tray/SyncStatus.qml | 12 ++-------- 12 files changed, 29 insertions(+), 53 deletions(-) diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml index de3bdb980..5b281720e 100644 --- a/src/gui/filedetails/FileDetailsPage.qml +++ b/src/gui/filedetails/FileDetailsPage.qml @@ -130,7 +130,7 @@ Page { wrapMode: Text.Wrap } - CustomButton { + Button { id: closeButton Layout.rowSpan: headerGridLayout.rows @@ -142,10 +142,7 @@ Page { icon.source: "image://svgimage-custom-color/clear.svg" + "/" + palette.buttonText icon.width: Style.activityListButtonIconSize icon.height: Style.activityListButtonIconSize - toolTipText: qsTr("Dismiss") - visible: root.showCloseButton - onClicked: root.closeButtonClicked() } diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml index e5762c54f..895153fba 100644 --- a/src/gui/filedetails/ShareDelegate.qml +++ b/src/gui/filedetails/ShareDelegate.qml @@ -152,11 +152,10 @@ GridLayout { spacing: 0 - CustomButton { + Button { id: createLinkButton Layout.alignment: Qt.AlignCenter - toolTipText: qsTr("Create a new share link") Layout.preferredWidth: Style.activityListButtonWidth Layout.preferredHeight: Style.activityListButtonHeight @@ -171,7 +170,7 @@ GridLayout { onClicked: root.createNewLinkShare() } - CustomButton { + Button { id: copyLinkButton function copyShareLink() { @@ -190,8 +189,6 @@ GridLayout { Layout.preferredWidth: shareLinkCopied ? implicitWidth : Style.activityListButtonWidth Layout.preferredHeight: Style.activityListButtonHeight - toolTipText: qsTr("Copy share link location") - text: shareLinkCopied ? qsTr("Copied!") : "" icon.source: shareLinkCopied ? "image://svgimage-custom-color/copy.svg/" + palette.brightText : @@ -219,11 +216,9 @@ GridLayout { } } - CustomButton { + Button { id: moreButton - toolTipText: qsTr("Share options") - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.preferredWidth: Style.activityListButtonWidth Layout.preferredHeight: Style.activityListButtonHeight diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 72ca1c202..c2b8b95ba 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -220,7 +220,7 @@ Page { elide: Text.ElideRight } - CustomButton { + Button { id: closeButton Layout.rowSpan: headerGridLayout.rows @@ -232,8 +232,6 @@ Page { icon.source: "image://svgimage-custom-color/clear.svg" + "/" + palette.buttonText icon.width: Style.activityListButtonIconSize icon.height: Style.activityListButtonIconSize - toolTipText: qsTr("Dismiss") - onClicked: root.closeShareDetails() } @@ -716,26 +714,23 @@ Page { } } - CustomButton { + Button { height: Style.standardPrimaryButtonHeight - - icon.source: "image://svgimage-custom-color/close.svg/" + Style.errorBoxBackgroundColor - imageSourceHover: "image://svgimage-custom-color/close.svg/" + palette.brightText + icon.source: hovered + ? "image://svgimage-custom-color/close.svg/" + palette.brightText + : "image://svgimage-custom-color/close.svg/" + Style.errorBoxBackgroundColor text: qsTr("Unshare") - onClicked: root.deleteShare() } - CustomButton { + Button { height: Style.standardPrimaryButtonHeight - - icon.source: "image://svgimage-custom-color/add.svg/" + root.accentColor - imageSourceHover: "image://svgimage-custom-color/add.svg/" + palette.brightText + icon.source: hovered + ? "image://svgimage-custom-color/add.svg/" + palette.brightText + : "image://svgimage-custom-color/add.svg/" + root.accentColor text: qsTr("Add another link") - visible: root.isLinkShare && root.canCreateLinkShares enabled: visible - onClicked: root.createNewLinkShare() } } diff --git a/src/gui/macOS/ui/FileProviderEvictionDialog.qml b/src/gui/macOS/ui/FileProviderEvictionDialog.qml index 4d94affa7..87b4c5e98 100644 --- a/src/gui/macOS/ui/FileProviderEvictionDialog.qml +++ b/src/gui/macOS/ui/FileProviderEvictionDialog.qml @@ -52,7 +52,7 @@ ApplicationWindow { Layout.fillWidth: true } - CustomButton { + Button { padding: Style.smallSpacing text: qsTr("Reload") onClicked: reloadMaterialisedItems(accountUserIdAtHost) diff --git a/src/gui/macOS/ui/FileProviderFileDelegate.qml b/src/gui/macOS/ui/FileProviderFileDelegate.qml index 731c8f4a6..7f59c7e89 100644 --- a/src/gui/macOS/ui/FileProviderFileDelegate.qml +++ b/src/gui/macOS/ui/FileProviderFileDelegate.qml @@ -86,7 +86,7 @@ Item { } } - CustomButton { + Button { id: deleteButton Layout.minimumWidth: implicitWidth diff --git a/src/gui/macOS/ui/FileProviderSettings.qml b/src/gui/macOS/ui/FileProviderSettings.qml index 1cf4d7ec8..b49288a20 100644 --- a/src/gui/macOS/ui/FileProviderSettings.qml +++ b/src/gui/macOS/ui/FileProviderSettings.qml @@ -149,12 +149,12 @@ Page { elide: Text.ElideRight } - CustomButton { + Button { text: qsTr("Signal file provider domain") onClicked: root.controller.signalFileProviderDomain(root.accountUserIdAtHost) } - CustomButton { + Button { text: qsTr("Create debug archive") onClicked: root.controller.createDebugArchive(root.accountUserIdAtHost) } diff --git a/src/gui/macOS/ui/FileProviderStorageInfo.qml b/src/gui/macOS/ui/FileProviderStorageInfo.qml index 3ef4d9274..b84991d2d 100644 --- a/src/gui/macOS/ui/FileProviderStorageInfo.qml +++ b/src/gui/macOS/ui/FileProviderStorageInfo.qml @@ -52,7 +52,7 @@ GridLayout { horizontalAlignment: Text.AlignRight } - CustomButton { + Button { Layout.row: 0 Layout.column: 2 Layout.alignment: Layout.AlignRight | Layout.AlignVCenter diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml index 0795ef3b8..873da5830 100644 --- a/src/gui/tray/ActivityItemActions.qml +++ b/src/gui/tray/ActivityItemActions.qml @@ -26,7 +26,7 @@ Repeater { model: root.linksForActionButtons - CustomButton { + Button { id: activityActionButton property string verb: model.modelData.verb diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 146a22ef3..cc56103e4 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -158,7 +158,7 @@ RowLayout { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter spacing: Style.extraSmallSpacing - CustomButton { + Button { id: fileDetailsButton width: Style.activityListButtonWidth @@ -178,7 +178,7 @@ RowLayout { onClicked: Systray.presentShareViewInTray(model.openablePath) } - CustomButton { + Button { id: dismissActionButton width: Style.activityListButtonWidth diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml index c5a9c3cd1..6524c105b 100644 --- a/src/gui/tray/CallNotificationDialog.qml +++ b/src/gui/tray/CallNotificationDialog.qml @@ -210,7 +210,7 @@ ApplicationWindow { id: linksRepeater model: root.links - CustomButton { + Button { id: answerCall readonly property string verb: modelData.verb readonly property bool isAnswerCallButton: verb === "WEB" @@ -219,7 +219,6 @@ ApplicationWindow { text: modelData.label icon.source: root.talkIcon + palette.brightText - imageSourceHover: root.talkIcon + palette.brightText Layout.fillWidth: true Layout.preferredHeight: Style.callNotificationPrimaryButtonMinHeight @@ -233,15 +232,13 @@ ApplicationWindow { Accessible.name: qsTr("Answer Talk call notification") Accessible.onPressAction: answerCall.clicked() } - } - CustomButton { + Button { id: declineCall text: qsTr("Decline") icon.source: root.deleteIcon + "white" - imageSourceHover: root.deleteIcon + "white" Layout.fillWidth: true Layout.preferredHeight: Style.callNotificationPrimaryButtonMinHeight diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index 4a421d9ad..83565fb52 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -739,7 +739,7 @@ ApplicationWindow { active: false - sourceComponent: CustomButton { + sourceComponent: Button { id: newActivitiesButton hoverEnabled: true padding: Style.smallSpacing @@ -767,9 +767,9 @@ ApplicationWindow { OpacityAnimator { id: fadeoutActivitiesButtonDisappear - target: newActivitiesButton; - from: 1; - to: 0; + target: newActivitiesButton + from: 1 + to: 0 duration: Style.newActivityButtonDisappearFadeTimeout loops: 1 running: false diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml index e8bb97518..9dc67eda3 100644 --- a/src/gui/tray/SyncStatus.qml +++ b/src/gui/tray/SyncStatus.qml @@ -84,13 +84,9 @@ RowLayout { } } - CustomButton { + Button { id: syncNowButton - FontMetrics { - id: syncNowFm - } - Layout.rightMargin: Style.trayHorizontalMargin text: qsTr("Sync now") @@ -109,11 +105,7 @@ RowLayout { } } - CustomButton { - Layout.preferredWidth: syncNowFm.boundingRect(text).width + - leftPadding + - rightPadding + - Style.standardSpacing * 2 + Button { Layout.rightMargin: Style.trayHorizontalMargin text: qsTr("Resolve conflicts") -- 2.30.2