Merge pull request #6691 from nextcloud/bugfix/slow-sync-with-tray-open

Bugfix/slow sync with tray open

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
 

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

src/gui/tray/SyncStatus.qml

@@ -34,7 +34,7 @@ RowLayout {
         padding: 0
 
         imageSource: syncStatus.syncIcon
-        running: syncStatus.syncing
+        running: false // hotfix for download speed slowdown when tray is open
     }
 
     ColumnLayout {