Make all ProgressIndicator's background-aware (Dark-/Light-Mode switching)

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index f721a4cf3be89857868e699da44690cfe5929e59..f5dbe7d498174631d4e26a12fa79eec30ef1c21b 100644 (file)
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -643,6 +643,9 @@ ActivitySettings::~ActivitySettings()
 
 void ActivitySettings::slotStyleChanged()
 {
+    if(_progressIndicator)
+        _progressIndicator->setColor(QGuiApplication::palette().color(QPalette::Text));
+
     // Notify the other widgets (Dark-/Light-Mode switching)
     emit styleChanged();
 }

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 73bd01c86ec8d4345dc012ba01db138b1785da93..62ed18da8bd7f2098fe762b117df725755d757be 100644 (file)
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -573,6 +573,8 @@ void ShareLinkWidget::customizeStyle()
     _ui->confirmNote->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
     _ui->confirmPassword->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
     _ui->confirmExpirationDate->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
+
+    _ui->progressIndicator->setColor(QGuiApplication::palette().color(QPalette::Text));
 }
 
 }

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 47cd3a80e9fc92b3dd9751567400a04c24006d5f..0a58d61a5a2455c7568463e87212c642c755d510 100644 (file)
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -380,6 +380,12 @@ void ShareUserGroupWidget::slotStyleChanged()
 void ShareUserGroupWidget::customizeStyle()
 {
     _ui->confirmShare->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg"));
+
+    _pi_sharee.setColor(QGuiApplication::palette().color(QPalette::Text));
+
+    foreach (auto pi, _parentScrollArea->findChildren<QProgressIndicator *>()) {
+        pi->setColor(QGuiApplication::palette().color(QPalette::Text));;
+    }
 }
 
 ShareUserLine::ShareUserLine(QSharedPointer<Share> share,

diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index 1c278f66a285182912e0548670172316411412f6..03cfb06611351b8930f22ad6224dd7bafc0fb9cd 100644 (file)
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -396,6 +396,8 @@ void OwncloudAdvancedSetupPage::slotStyleChanged()
 
 void OwncloudAdvancedSetupPage::customizeStyle()
 {
+    if(_progressIndi)
+        _progressIndi->setColor(QGuiApplication::palette().color(QPalette::Text));
 }
 
 } // namespace OCC

diff --git a/src/gui/wizard/owncloudhttpcredspage.cpp b/src/gui/wizard/owncloudhttpcredspage.cpp
index 12f3e78d1553b4d8211bda75ad1d4d7b64abaccb..092bf789dcc3826646f6834f09f38275bff8afe1 100644 (file)
--- a/src/gui/wizard/owncloudhttpcredspage.cpp
+++ b/src/gui/wizard/owncloudhttpcredspage.cpp
@@ -201,6 +201,8 @@ void OwncloudHttpCredsPage::slotStyleChanged()
 
 void OwncloudHttpCredsPage::customizeStyle()
 {
+    if(_progressIndi)
+        _progressIndi->setColor(QGuiApplication::palette().color(QPalette::Text));
 }
 
 } // namespace OCC

diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 758f05eedbf472a2f20d8a02a14586693c918219..84f160aaf784e9cfd0186824633e94277967b8e5 100644 (file)
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -442,6 +442,9 @@ void OwncloudSetupPage::customizeStyle()
     pal.setColor(QPalette::WindowText, theme->wizardHeaderBackgroundColor());
     _ui.slideShow->setPalette(pal);
 #endif
+
+    if(_progressIndi)
+        _progressIndi->setColor(QGuiApplication::palette().color(QPalette::Text));
 }
 
 } // namespace OCC