From 54acd3498f92e9bbdd62c000d2ca127b1dff5e48 Mon Sep 17 00:00:00 2001 From: alex-z Date: Thu, 25 Apr 2024 00:43:01 +0200 Subject: [PATCH] Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows. Signed-off-by: alex-z --- src/gui/ConflictItemFileInfo.qml | 18 +++++++++++++++ src/gui/ResolveConflictsDialog.qml | 36 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/src/gui/ConflictItemFileInfo.qml b/src/gui/ConflictItemFileInfo.qml index be345f7e8a945..7a706f7b7fc02 100644 --- a/src/gui/ConflictItemFileInfo.qml +++ b/src/gui/ConflictItemFileInfo.qml @@ -31,6 +31,24 @@ Item { CheckBox { id: selectItem + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index 823c4d0b25db8..285bd8c038a27 100644 --- a/src/gui/ResolveConflictsDialog.qml +++ b/src/gui/ResolveConflictsDialog.qml @@ -94,6 +94,24 @@ ApplicationWindow { Layout.fillWidth: true + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + text: qsTr('All local versions') leftPadding: 0 @@ -112,6 +130,24 @@ ApplicationWindow { Layout.fillWidth: true + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + text: qsTr('All server versions') leftPadding: 0