mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 06:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Camila Ayres <hello@camilasan.com>
This commit is contained in:
Camila Ayres 2024-08-28 19:41:12 +02:00 committed by Matthieu Gallien
parent 40e2f69968
commit 1aa27872aa
No known key found for this signature in database
GPG key ID: 7D0F74F05C22F553
11 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/filedetails/ShareDelegate.qml
View file

@ -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

8
src/gui/filedetails/ShareDetailsPage.qml
View file

@ -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

3
src/gui/macOS/ui/FileProviderEvictionDialog.qml
View file

@ -54,9 +54,6 @@ ApplicationWindow {
CustomButton {
padding: Style.smallSpacing
textColor: Style.ncTextColor
textColorHovered: Style.ncHeaderTextColor
contentsFont.bold: true
text: qsTr("Reload")
onClicked: reloadMaterialisedItems(accountUserIdAtHost)
}

2
src/gui/macOS/ui/FileProviderFileDelegate.qml
View file

@ -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)
}
}

5
src/gui/tray/ActivityActionButton.qml
View file

@ -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
}
}

4
src/gui/tray/ActivityItemActions.qml
View file

@ -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)
}
}

6
src/gui/tray/CallNotificationDialog.qml
View file

@ -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"

7
src/gui/tray/CustomButton.qml
View file

@ -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
}
}

4
src/gui/tray/NCButtonContents.qml
View file

@ -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

6
src/gui/tray/SyncStatus.qml
View file

@ -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 &&

4
src/gui/tray/Window.qml
View file

@ -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")