Remove custom properties for text color/hover from CustomButton and NCButtonContents...

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml
index 592f4f74533b2aa2574045c82cb524f58c1e28ad..75ba6eab3410b9715c8b1133dfd57c26eaa35d50 100644 (file)
--- 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 4866dfe60dd9e9f3ada3e4cc08c217fc541572a6..e98858e77cb89cf2816f6e870e27d3e2f6edebde 100644 (file)
--- 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 4d5fecd2574dec575ae64c7a9c8fab1847757ff7..4d94affa725da17960a480a277e0585cd44a22d7 100644 (file)
--- 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 92231a6aa6876277e75d7cd2b9880f6daae59fcd..731c8f4a64f1131ccb22184a8fdbfde086718f04 100644 (file)
--- 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 b7089a42c77d3e87741de1028803d00cd97119d3..ceb9a435fa6e927c0ca4169dce58c50044b82079 100644 (file)
--- 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 3a4bad498e027dc5b5b63a881bc6b094f6f15cd0..0795ef3b83b6c8e101ac5d06c4c14582bf5aae7f 100644 (file)
--- 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 82504595099aa5159cc168cbe7b5d4404d3d7960..2eb297a269775bc37685c1ccb9508087ecf8c704 100644 (file)
--- 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 9ec4a0ee99dc9b5e2b1632cccc4bbf315b516680..ba0d70ed4327f22bb7b075497f18edc63b2135d6 100644 (file)
--- 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 243b1225c64c3e97533d565585ef372d634f7ddc..dee1550837684d97e3f6b5169cf26f47bfc83d26 100644 (file)
--- 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 1cbff3062e5450df7fe27fb8a06d7401cab8f518..a1c4d125741d57a06037faa685b2e79b4bafdb4b 100644 (file)
--- 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 209942ed24c94ebb9a8737cb8ef99fbe33296b11..83acce6feb16b18637b0f7ec24089ba75f34c35f 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -863,10 +863,6 @@ ApplicationWindow {
                 hoverEnabled: true\r
                 padding: Style.smallSpacing\r
 \r
-                textColor: Style.currentUserHeaderTextColor\r
-                textColorHovered: Style.currentUserHeaderTextColor\r
-                contentsFont.bold: true\r
-\r
                 anchors.fill: parent\r
 \r
                 text: qsTr("New activities")\r