Remove background color from Style, use palette base in its place

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

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index af404fba41fd60fd72e9c674981986bba9d05608..a4b8474cd47f1338d6beb7dbd84d6345a07f49e7 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -167,7 +167,7 @@ ApplicationWindow {
     }
 
     Rectangle {
-        color: Style.backgroundColor
+        color: palette.base
         anchors.fill: parent
         z: 1
     }

diff --git a/src/gui/macOS/ui/FileProviderEvictionDialog.qml b/src/gui/macOS/ui/FileProviderEvictionDialog.qml
index 87b4c5e98b529a73d46f7ab0594815eb22db4adf..c62363b6593153971535df2cd343b5f1c143f9fa 100644 (file)
--- a/src/gui/macOS/ui/FileProviderEvictionDialog.qml
+++ b/src/gui/macOS/ui/FileProviderEvictionDialog.qml
@@ -31,7 +31,7 @@ ApplicationWindow {
     property string accountUserIdAtHost: ""
 
     title: qsTr("Evict materialised files")
-    color: Style.backgroundColor
+    color: palette.base
     flags: Qt.Dialog | Qt.WindowStaysOnTopHint
     width: 640
     height: 480

diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml
index 6524c105ba41261ca2c7be1bced5cced873ef803..22f11da71fb5e277d6fdd125fb691da92407e1b8 100644 (file)
--- a/src/gui/tray/CallNotificationDialog.qml
+++ b/src/gui/tray/CallNotificationDialog.qml
@@ -86,7 +86,7 @@ ApplicationWindow {
         width: parent.width
         height: contentLayout.height + (root.windowSpacing * 2)
         radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
-        color: Style.backgroundColor
+        color: palette.base
         border.width: Style.trayWindowBorderWidth
         border.color: palette.dark
         clip: true

diff --git a/src/gui/tray/EditFileLocallyLoadingDialog.qml b/src/gui/tray/EditFileLocallyLoadingDialog.qml
index 0696c302a0840ffee632f6d06d90eb9c6c325f08..47dd20d09aa7731cfcab58bc75345751dc0761c7 100644 (file)
--- a/src/gui/tray/EditFileLocallyLoadingDialog.qml
+++ b/src/gui/tray/EditFileLocallyLoadingDialog.qml
@@ -30,7 +30,7 @@ ApplicationWindow {
 
     Rectangle {
         id: windowBackground
-        color: Style.backgroundColor
+        color: palette.base
         radius: Style.trayWindowRadius
         border.color: palette.dark
         anchors.fill: parent

diff --git a/src/gui/tray/NCProgressBar.qml b/src/gui/tray/NCProgressBar.qml
index 5c0d2afb3d59b733b884df31fbac52526afe42ef..93b4d771c58e9c336670b4a97766bad4cf269efd 100644 (file)
--- a/src/gui/tray/NCProgressBar.qml
+++ b/src/gui/tray/NCProgressBar.qml
@@ -23,7 +23,7 @@ ProgressBar {
         implicitWidth: Style.progressBarWidth
         implicitHeight: Style.progressBarBackgroundHeight
         radius: Style.progressBarRadius
-        color: Style.progressBarBackgroundColor
+        color: palette.base
         border.color: palette.dark
         border.width: Style.progressBarBackgroundBorderWidth
     }

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 6c10e4c998dac0ca5ef6a44a6e141ed5d0e656d0..301c42fbf40e77ddc732e0f14ecb6f34b41f9b35 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -15,7 +15,6 @@ QtObject {
     readonly property color ncTextBrightColor: "white"\r
     readonly property color ncSecondaryTextColor: "#808080"\r
     readonly property color backgroundColor: Theme.systemPalette.base\r
-    readonly property color buttonBackgroundColor: Theme.systemPalette.button\r
     readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)\r
 \r
     readonly property color currentUserHeaderColor: UserModel.currentUser ? UserModel.currentUser.headerColor : ncBlue\r
@@ -191,7 +190,6 @@ QtObject {
     property int progressBarContentBorderWidth: 1\r
     property int progressBarBackgroundBorderWidth: 1\r
     property color progressBarContentColor: ncBlue\r
-    property color progressBarBackgroundColor: backgroundColor\r
 \r
     property int newActivitiesButtonWidth: 150\r
     property int newActivitiesButtonHeight: 40\r