From e55dae140f3e9cedee2e84c4efc35334d33c017c Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Tue, 3 Sep 2024 20:11:18 +0200 Subject: [PATCH] Remove customization for font color from EnforcedPlainTextLabel. Signed-off-by: Camila Ayres --- src/gui/EmojiPicker.qml | 1 - src/gui/UserStatusSelectorButton.qml | 2 -- src/gui/filedetails/FileDetailsPage.qml | 2 -- src/gui/filedetails/FileTag.qml | 1 - src/gui/filedetails/NCTabButton.qml | 1 - src/gui/filedetails/ShareDelegate.qml | 1 - src/gui/filedetails/ShareDetailsPage.qml | 1 - src/gui/filedetails/ShareView.qml | 3 --- src/gui/tray/ActivityItemContent.qml | 1 - src/gui/tray/ActivityList.qml | 1 - src/gui/tray/CallNotificationDialog.qml | 1 - src/gui/tray/ListItemLineAndSubline.qml | 2 -- src/gui/tray/NCToolTip.qml | 1 - src/gui/tray/SyncStatus.qml | 1 - src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml | 1 - src/gui/tray/UnifiedSearchResultNothingFound.qml | 1 - src/gui/tray/UnifiedSearchResultSectionItem.qml | 1 - src/gui/tray/Window.qml | 3 --- 18 files changed, 25 deletions(-) diff --git a/src/gui/EmojiPicker.qml b/src/gui/EmojiPicker.qml index bf3a0dfd0..486965ebd 100644 --- a/src/gui/EmojiPicker.qml +++ b/src/gui/EmojiPicker.qml @@ -134,7 +134,6 @@ ColumnLayout { width: parent.width * 0.8 anchors.centerIn: parent text: qsTr("No recent emojis") - color: palette.midlight wrapMode: Text.Wrap font.bold: true visible: emojiView.count === 0 diff --git a/src/gui/UserStatusSelectorButton.qml b/src/gui/UserStatusSelectorButton.qml index 01b499daf..db622f917 100644 --- a/src/gui/UserStatusSelectorButton.qml +++ b/src/gui/UserStatusSelectorButton.qml @@ -71,7 +71,6 @@ AbstractButton { text: root.text wrapMode: Text.Wrap - color: root.colored ? palette.brightText : palette.buttonText font.bold: root.primary } @@ -85,7 +84,6 @@ AbstractButton { text: root.secondaryText wrapMode: Text.Wrap - color: palette.midlight visible: root.secondaryText !== "" } } diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml index 86b3d59d6..231d4fc9e 100644 --- a/src/gui/filedetails/FileDetailsPage.qml +++ b/src/gui/filedetails/FileDetailsPage.qml @@ -153,7 +153,6 @@ Page { Layout.rightMargin: headerGridLayout.textRightMargin text: `${root.fileDetails.sizeString} · ${root.fileDetails.lastChangedString}` - color: palette.midlight wrapMode: Text.Wrap } @@ -164,7 +163,6 @@ Page { Layout.rightMargin: headerGridLayout.textRightMargin text: root.fileDetails.lockExpireString - color: palette.midlight wrapMode: Text.Wrap visible: headerGridLayout.showFileLockedString } diff --git a/src/gui/filedetails/FileTag.qml b/src/gui/filedetails/FileTag.qml index 67903b3f8..425c1024b 100644 --- a/src/gui/filedetails/FileTag.qml +++ b/src/gui/filedetails/FileTag.qml @@ -27,7 +27,6 @@ EnforcedPlainTextLabel { color: palette.base } - color: palette.midlight elide: Text.ElideRight padding: Style.smallSpacing } diff --git a/src/gui/filedetails/NCTabButton.qml b/src/gui/filedetails/NCTabButton.qml index 53091974e..c06f73ff2 100644 --- a/src/gui/filedetails/NCTabButton.qml +++ b/src/gui/filedetails/NCTabButton.qml @@ -64,7 +64,6 @@ TabButton { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: tabButtonLayout.elementColors text: tabButton.text font.bold: tabButton.checked } diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml index 20faca9ea..45838ae44 100644 --- a/src/gui/filedetails/ShareDelegate.qml +++ b/src/gui/filedetails/ShareDelegate.qml @@ -140,7 +140,6 @@ GridLayout { Layout.column: 1 text: root.detailText - color: palette.midlight elide: Text.ElideRight visible: text !== "" } diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 8df4e60c4..223468ee9 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -241,7 +241,6 @@ Page { Layout.rightMargin: root.padding text: root.fileDetails.name - color: palette.midlight wrapMode: Text.Wrap } } diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml index ef8500601..425e44280 100644 --- a/src/gui/filedetails/ShareView.qml +++ b/src/gui/filedetails/ShareView.qml @@ -282,7 +282,6 @@ ColumnLayout { id: sharingDisabledLabel width: parent.width text: qsTr("Sharing is disabled") - color: palette.midlight wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -290,7 +289,6 @@ ColumnLayout { EnforcedPlainTextLabel { width: parent.width text: qsTr("This item cannot be shared.") - color: palette.midlight wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -299,7 +297,6 @@ ColumnLayout { EnforcedPlainTextLabel { width: parent.width text: qsTr("Sharing is disabled.") - color: palette.midlight wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 00599b0b7..afd7a6dbf 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -244,7 +244,6 @@ RowLayout { wrapMode: Text.Wrap maximumLineCount: 2 font.pixelSize: Style.topLinePixelSize - color: palette.midlight visible: text !== "" } diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml index 1a97ebc02..0e57289f8 100644 --- a/src/gui/tray/ActivityList.qml +++ b/src/gui/tray/ActivityList.qml @@ -132,7 +132,6 @@ ScrollView { EnforcedPlainTextLabel { width: parent.width text: qsTr("No activities yet") - color: palette.midlight font.bold: true wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml index 2eb297a26..0ea9cb0f8 100644 --- a/src/gui/tray/CallNotificationDialog.qml +++ b/src/gui/tray/CallNotificationDialog.qml @@ -195,7 +195,6 @@ ApplicationWindow { EnforcedPlainTextLabel { id: message text: root.subject - color: root.usingUserAvatar ? palette.brightText : palette.windowText font.pixelSize: Style.topLinePixelSize wrapMode: Text.WordWrap horizontalAlignment: Text.AlignHCenter diff --git a/src/gui/tray/ListItemLineAndSubline.qml b/src/gui/tray/ListItemLineAndSubline.qml index 56b962946..84a0f1c6a 100644 --- a/src/gui/tray/ListItemLineAndSubline.qml +++ b/src/gui/tray/ListItemLineAndSubline.qml @@ -38,7 +38,6 @@ ColumnLayout { text: root.lineText elide: Text.ElideRight font.pixelSize: root.titleFontSize - color: root.titleColor } EnforcedPlainTextLabel { id: subline @@ -47,6 +46,5 @@ ColumnLayout { visible: text !== "" elide: Text.ElideRight font.pixelSize: root.sublineFontSize - color: root.sublineColor } } diff --git a/src/gui/tray/NCToolTip.qml b/src/gui/tray/NCToolTip.qml index c953ad7a7..ab27a57b4 100644 --- a/src/gui/tray/NCToolTip.qml +++ b/src/gui/tray/NCToolTip.qml @@ -25,6 +25,5 @@ ToolTip { contentItem: EnforcedPlainTextLabel { text: toolTip.text wrapMode: Text.Wrap - color: palette.toolTipText } } diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml index 7b1f20f2e..e8bb97518 100644 --- a/src/gui/tray/SyncStatus.qml +++ b/src/gui/tray/SyncStatus.qml @@ -79,7 +79,6 @@ RowLayout { text: syncStatus.syncStatusDetailString visible: syncStatus.syncStatusDetailString !== "" - color: palette.midlight font.pixelSize: Style.subLinePixelSize wrapMode: Text.Wrap } diff --git a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml index 152b2805a..7a39991cc 100644 --- a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml +++ b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml @@ -45,7 +45,6 @@ ColumnLayout { text: qsTr("Load more results") wrapMode: Text.Wrap font.pixelSize: unifiedSearchResultItemFetchMore.fontSize - color: unifiedSearchResultItemFetchMore.textColor visible: !unifiedSearchResultItemFetchMore.isFetchMoreInProgress } diff --git a/src/gui/tray/UnifiedSearchResultNothingFound.qml b/src/gui/tray/UnifiedSearchResultNothingFound.qml index 79a2aee12..281d20e12 100644 --- a/src/gui/tray/UnifiedSearchResultNothingFound.qml +++ b/src/gui/tray/UnifiedSearchResultNothingFound.qml @@ -38,7 +38,6 @@ ColumnLayout { EnforcedPlainTextLabel { id: unifiedSearchResultsNoResultsLabel text: qsTr("No results for") - color: palette.dark font.pixelSize: Style.subLinePixelSize * 1.25 wrapMode: Text.Wrap Layout.fillWidth: true diff --git a/src/gui/tray/UnifiedSearchResultSectionItem.qml b/src/gui/tray/UnifiedSearchResultSectionItem.qml index c9bbf151e..31acaf202 100644 --- a/src/gui/tray/UnifiedSearchResultSectionItem.qml +++ b/src/gui/tray/UnifiedSearchResultSectionItem.qml @@ -28,7 +28,6 @@ EnforcedPlainTextLabel { text: section font.pixelSize: Style.unifiedSearchResultTitleFontSize - color: UserModel.currentUser.accentColor Accessible.role: Accessible.Separator Accessible.name: qsTr("Search results section %1").arg(section) diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 55bd53f6c..2d85816e1 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -463,7 +463,6 @@ ApplicationWindow { width: Style.currentAccountLabelWidth text: UserModel.currentUser ? UserModel.currentUser.name : "" elide: Text.ElideRight - color: Style.currentUserHeaderTextColor font.pixelSize: Style.topLinePixelSize font.bold: true @@ -475,7 +474,6 @@ ApplicationWindow { width: Style.currentAccountLabelWidth text: UserModel.currentUser ? UserModel.currentUser.server : "" elide: Text.ElideRight - color: Style.currentUserHeaderTextColor visible: UserModel.numUsers() > 1 } @@ -502,7 +500,6 @@ ApplicationWindow { ? UserModel.currentUser.statusMessage : UserModel.currentUser ? UserModel.currentUser.server : "" elide: Text.ElideRight - color: Style.currentUserHeaderTextColor font.pixelSize: Style.subLinePixelSize } } -- 2.30.2