From: Camila Ayres Date: Wed, 28 Aug 2024 17:41:12 +0000 (+0200) Subject: Remove custom properties for text color/hover from CustomButton and NCButtonContents... X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~34^2~25 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1aa27872aa32844371f4a27259fa9b913edf836b;p=nextcloud-desktop.git Remove custom properties for text color/hover from CustomButton and NCButtonContents components. Signed-off-by: Camila Ayres --- diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml index 592f4f745..75ba6eab3 100644 --- a/src/gui/filedetails/ShareDelegate.qml +++ b/src/gui/filedetails/ShareDelegate.qml @@ -194,8 +194,6 @@ GridLayout { toolTipText: qsTr("Copy share link location") text: shareLinkCopied ? qsTr("Copied!") : "" - textColor: palette.brightText - contentsFont.bold: true icon.source: shareLinkCopied ? "image://svgimage-custom-color/copy.svg/" + palette.brightText : "image://svgimage-custom-color/copy.svg/" + palette.buttonText diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 4866dfe60..e98858e77 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -726,9 +726,6 @@ Page { icon.source: "image://svgimage-custom-color/close.svg/" + Style.errorBoxBackgroundColor imageSourceHover: "image://svgimage-custom-color/close.svg/" + palette.brightText text: qsTr("Unshare") - textColor: Style.errorBoxBackgroundColor - textColorHovered: "white" - contentsFont.bold: true onClicked: root.deleteShare() } @@ -739,9 +736,6 @@ Page { icon.source: "image://svgimage-custom-color/add.svg/" + root.accentColor imageSourceHover: "image://svgimage-custom-color/add.svg/" + palette.brightText text: qsTr("Add another link") - textColor: root.accentColor - textColorHovered: palette.brightText - contentsFont.bold: true visible: root.isLinkShare && root.canCreateLinkShares enabled: visible @@ -779,8 +773,6 @@ Page { icon.source: "image://svgimage-custom-color/copy.svg/" + palette.brightText text: shareLinkCopied ? qsTr("Share link copied!") : qsTr("Copy share link") - textColor: palette.brightText - contentsFont.bold: true visible: root.isLinkShare enabled: visible diff --git a/src/gui/macOS/ui/FileProviderEvictionDialog.qml b/src/gui/macOS/ui/FileProviderEvictionDialog.qml index 4d5fecd25..4d94affa7 100644 --- a/src/gui/macOS/ui/FileProviderEvictionDialog.qml +++ b/src/gui/macOS/ui/FileProviderEvictionDialog.qml @@ -54,9 +54,6 @@ ApplicationWindow { CustomButton { padding: Style.smallSpacing - textColor: Style.ncTextColor - textColorHovered: Style.ncHeaderTextColor - contentsFont.bold: true text: qsTr("Reload") onClicked: reloadMaterialisedItems(accountUserIdAtHost) } diff --git a/src/gui/macOS/ui/FileProviderFileDelegate.qml b/src/gui/macOS/ui/FileProviderFileDelegate.qml index 92231a6aa..731c8f4a6 100644 --- a/src/gui/macOS/ui/FileProviderFileDelegate.qml +++ b/src/gui/macOS/ui/FileProviderFileDelegate.qml @@ -93,8 +93,6 @@ Item { Layout.alignment: Qt.AlignRight | Qt.AlignVCenter text: qsTr("Delete") - textColorHovered: Style.ncHeaderTextColor - contentsFont.bold: true onClicked: root.evictItem(root.identifier, root.domainIdentifier) } } diff --git a/src/gui/tray/ActivityActionButton.qml b/src/gui/tray/ActivityActionButton.qml index b7089a42c..ceb9a435f 100644 --- a/src/gui/tray/ActivityActionButton.qml +++ b/src/gui/tray/ActivityActionButton.qml @@ -48,9 +48,6 @@ AbstractButton { anchors.fill: parent hovered: root.hovered text: root.text - textColor: root.textColor - textColorHovered: root.textColorHovered - bold: root.primaryButton } } @@ -63,8 +60,6 @@ AbstractButton { imageSourceHover: root.imageSourceHover imageSource: root.icon.source text: root.text - textColor: root.textColor - textColorHovered: root.textColorHovered font.bold: root.primaryButton } } diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml index 3a4bad498..0795ef3b8 100644 --- a/src/gui/tray/ActivityItemActions.qml +++ b/src/gui/tray/ActivityItemActions.qml @@ -44,10 +44,6 @@ Repeater { onClicked: isTalkReplyButton ? root.showReplyField() : root.triggerAction(model.index) - textColor: Style.adjustedCurrentUserHeaderColor - textColorHovered: Style.currentUserHeaderTextColor - contentsFont.bold: true - visible: verb !== "REPLY" || (verb === "REPLY" && root.talkReplyButtonVisible) } } diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml index 825045950..2eb297a26 100644 --- a/src/gui/tray/CallNotificationDialog.qml +++ b/src/gui/tray/CallNotificationDialog.qml @@ -219,9 +219,6 @@ ApplicationWindow { visible: isAnswerCallButton text: modelData.label - contentsFont.bold: true - - textColor: palette.brightText icon.source: root.talkIcon + palette.brightText imageSourceHover: root.talkIcon + palette.brightText @@ -244,9 +241,6 @@ ApplicationWindow { CustomButton { id: declineCall text: qsTr("Decline") - contentsFont.bold: true - - textColor: palette.brightText icon.source: root.deleteIcon + "white" imageSourceHover: root.deleteIcon + "white" diff --git a/src/gui/tray/CustomButton.qml b/src/gui/tray/CustomButton.qml index 9ec4a0ee9..ba0d70ed4 100644 --- a/src/gui/tray/CustomButton.qml +++ b/src/gui/tray/CustomButton.qml @@ -25,11 +25,6 @@ Button { property string toolTipText: "" - property color textColor: palette.buttonText - property color textColorHovered: textColor - - property alias contentsFont: contents.font - leftPadding: root.text === "" ? Style.smallSpacing : Style.standardSpacing rightPadding: root.text === "" ? Style.smallSpacing : Style.standardSpacing implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding @@ -50,7 +45,5 @@ Button { imageSourceWidth: root.icon.width imageSourceHeight: root.icon.height text: root.text - textColor: root.textColor - textColorHovered: root.textColorHovered } } diff --git a/src/gui/tray/NCButtonContents.qml b/src/gui/tray/NCButtonContents.qml index 243b1225c..dee155083 100644 --- a/src/gui/tray/NCButtonContents.qml +++ b/src/gui/tray/NCButtonContents.qml @@ -29,8 +29,6 @@ RowLayout { property string text: "" property var display - property color textColor: palette.buttonText - property color textColorHovered: textColor property alias font: buttonLabel.font Image { @@ -62,8 +60,6 @@ RowLayout { visible: root.text !== "" - color: root.hovered ? root.textColorHovered : root.textColor - horizontalAlignment: icon.visible ? Text.AlignLeft : Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml index 1cbff3062..a1c4d1257 100644 --- a/src/gui/tray/SyncStatus.qml +++ b/src/gui/tray/SyncStatus.qml @@ -98,9 +98,6 @@ RowLayout { text: qsTr("Sync now") padding: Style.smallSpacing - textColor: Style.adjustedCurrentUserHeaderColor - textColorHovered: Style.currentUserHeaderTextColor - contentsFont.bold: true visible: !activityModel.hasSyncConflicts && !syncStatus.syncing && @@ -122,9 +119,6 @@ RowLayout { Layout.rightMargin: Style.trayHorizontalMargin text: qsTr("Resolve conflicts") - textColor: Style.adjustedCurrentUserHeaderColor - textColorHovered: Style.currentUserHeaderTextColor - contentsFont.bold: true visible: activityModel.hasSyncConflicts && !syncStatus.syncing && diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 209942ed2..83acce6fe 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -863,10 +863,6 @@ ApplicationWindow { hoverEnabled: true padding: Style.smallSpacing - textColor: Style.currentUserHeaderTextColor - textColorHovered: Style.currentUserHeaderTextColor - contentsFont.bold: true - anchors.fill: parent text: qsTr("New activities")