Give sync progress bar expected fill colour

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
f p

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index 1b74eb0b1b3603a37e462580916eb4ce06093b4f..f14fa49287d3cdde345bd890efcde7e9f06c6c7f 100644 (file)
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -708,6 +708,7 @@ ApplicationWindow {
         SyncStatus {\r
             id: syncStatus\r
 \r
+            accentColor: Style.accentColor\r
             visible: !trayWindowMainItem.isUnifiedSearchActive\r
 \r
             anchors.top: trayWindowUnifiedSearchInputContainer.bottom\r

diff --git a/src/gui/tray/NCProgressBar.qml b/src/gui/tray/NCProgressBar.qml
index 93b4d771c58e9c336670b4a97766bad4cf269efd..b86d0faf30660c63ad8c22e54184f81146de2dbb 100644 (file)
--- a/src/gui/tray/NCProgressBar.qml
+++ b/src/gui/tray/NCProgressBar.qml
@@ -16,9 +16,12 @@ import QtQuick
 import QtQuick.Controls
 import Style
 
+// TODO: the current style does not support customization of this control
 ProgressBar {
     id: control
 
+    property color fillColor: Style.ncBlue
+
     background: Rectangle {
         implicitWidth: Style.progressBarWidth
         implicitHeight: Style.progressBarBackgroundHeight
@@ -36,7 +39,7 @@ ProgressBar {
             width: control.visualPosition * parent.width
             height: parent.height
             radius: Style.progressBarRadius
-            color: palette.dark
+            color: control.fillColor
             border.color: palette.dark
             border.width: Style.progressBarContentBorderWidth
         }

diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml
index e30c6eb63326c15b071975bc9ad70cc1b169fe25..b482c5586dab79e82da2d50c152da379352eadf7 100644 (file)
--- a/src/gui/tray/SyncStatus.qml
+++ b/src/gui/tray/SyncStatus.qml
@@ -10,6 +10,7 @@ RowLayout {
     id: root
 
     property alias model: syncStatus
+    property color accentColor: Style.ncBlue
 
     spacing: Style.trayHorizontalMargin
 
@@ -69,6 +70,7 @@ RowLayout {
             sourceComponent: NCProgressBar {
                 id: syncProgressBar
                 value: syncStatus.syncProgress
+                fillColor: root.accentColor
             }
         }
 

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 5e8f83a1cdc9d2da213c1cad5276c200dcad6cf1..04dcd57dc2946db02b130796a6dcdc584a3ea617 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -185,7 +185,6 @@ QtObject {
     property int progressBarRadius: 4\r
     property int progressBarContentBorderWidth: 1\r
     property int progressBarBackgroundBorderWidth: 1\r
-    property color progressBarContentColor: ncBlue\r
 \r
     property int newActivitiesButtonWidth: 150\r
     property int newActivitiesButtonHeight: 40\r