refactor: [DC-348] automatically update icons and colors when system color scheme changes

src/gui/CMakeLists.txt

@@ -32,7 +32,6 @@ set(client_SRCS
     localactivitywidget.cpp
     protocolitem.cpp
     syncerrorwidget.cpp
-    activitysettings.cpp
     selectivesyncwidget.cpp
     tlserrordialog.cpp
     syncrunfilelog.cpp

src/gui/mainwindow/CMakeLists.txt

@@ -11,5 +11,7 @@ target_sources(owncloudGui PRIVATE
     settingsview.cpp
     settingsview.h
     settingsview.ui
+    colormanager.h 
+    colormanager.cpp
 )
 

src/gui/mainwindow/colormanager.cpp

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) Lisa Reese <lisa.reese@kiteworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "colormanager.h"
+
+#include <QAction>
+#include <QGuiApplication>
+
+#include "resources/iconresources.h"
+
+namespace OCC {
+
+ColorManager::ColorManager(QObject *parent)
+    : QObject{parent}
+{
+    connect(qGuiApp->styleHints(), &QStyleHints::colorSchemeChanged, this, &ColorManager::updateColorScheme);
+}
+
+void ColorManager::addActionIcon(QAction *action, const QString &iconName)
+{
+    connect(this, &ColorManager::refreshCoreIcons, action, [action, iconName]() { action->setIcon(IconResources::getCoreIcon(iconName)); });
+}
+
+void ColorManager::refresh()
+{
+    updateColorScheme(qGuiApp->styleHints()->colorScheme());
+}
+
+void ColorManager::updateColorScheme(Qt::ColorScheme colorScheme)
+{
+    Q_UNUSED(colorScheme);
+
+    IconResources::handleSystemStyleChanged();
+
+    emit refreshCoreIcons();
+}
+}

src/gui/activitysettings.h → src/gui/mainwindow/colormanager.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
+ * Copyright (C) Lisa Reese <lisa.reese@kiteworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,30 +14,29 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QHash>
+#include <QObject>
+#include <QStyleHints>
 
-class QTabWidget;
+class QAction;
 
 namespace OCC {
 
-/**
- * @brief The ActivitySettings class
- * @ingroup gui
- *
- * Implements a tab for the settings dialog, displaying lists of local activities and sync issues
- */
-class ActivitySettings : public QWidget
+class ColorManager : public QObject
 {
     Q_OBJECT
+
 public:
-    explicit ActivitySettings(QWidget *parent = nullptr);
-    ~ActivitySettings() override;
+    explicit ColorManager(QObject *parent);
 
-private Q_SLOTS:
-    void slotShowIssueItemCount(int cnt);
+    void addActionIcon(QAction *action, const QString &iconName);
+    void refresh();
 
-private:
-    QTabWidget *_tab = nullptr;
-    int _syncErrorTabId = -1;
+signals:
+    void refreshCoreIcons();
+
+protected:
+    void updateColorScheme(Qt::ColorScheme colorScheme);
 };
+
 }

src/gui/mainwindow/mainwindowcontroller.cpp

@@ -16,8 +16,9 @@
 
 #include "aboutview.h"
 #include "application.h"
-#include "iconresources.h"
+#include "colormanager.h"
 #include "guiutility.h"
+#include "iconresources.h"
 #include "localactivitywidget.h"
 #include "mainwindow.h"
 #include "modalwrapperwidget.h"
@@ -35,7 +36,10 @@ MainWindowController::MainWindowController(MainWindow *window, QObject *parent)
     : QObject{parent}
     , _window(window)
 {
+    // this is going to move so it can be passed around by injection or connected externally, but starting with it here:
+    _colorManager = new ColorManager(this);
     setup();
+    _colorManager->refresh();
 }
 
 void MainWindowController::setup()
@@ -118,7 +122,9 @@ void MainWindowController::buildMenuActions()
 void MainWindowController::createSyncErrorsAction()
 {
     QAction *syncErrorsAction = new QAction(tr("Errors: %1").arg(0), this);
-    syncErrorsAction->setIcon(IconResources::getCoreIcon("states/error"));
+    //  syncErrorsAction->setIcon(IconResources::getCoreIcon("states/error"));
+    _colorManager->addActionIcon(syncErrorsAction, "states/error");
+
     syncErrorsAction->setObjectName("syncErrorsAction");
     syncErrorsAction->setCheckable(true);
     auto syncErrorWidget = new SyncErrorWidget(_window);
@@ -132,7 +138,8 @@ void MainWindowController::createSyncErrorsAction()
 void MainWindowController::createActivityAction()
 {
     QAction *activityAction = new QAction(tr("Activity"), this);
-    activityAction->setIcon(IconResources::getCoreIcon("states/sync"));
+    // activityAction->setIcon(IconResources::getCoreIcon("states/sync"));
+    _colorManager->addActionIcon(activityAction, "states/sync");
     activityAction->setObjectName("activityAction");
     activityAction->setCheckable(true);
     auto localActivityWidget = new LocalActivityWidget(_window);

src/gui/mainwindow/mainwindowcontroller.h

@@ -22,6 +22,7 @@ namespace OCC {
 
 class MainWindow;
 class AccountsGuiController;
+class ColorManager;
 
 class MainWindowController : public QObject
 {
@@ -48,5 +49,6 @@ class MainWindowController : public QObject
     void onQuit();
 
     MainWindow *_window = nullptr;
+    ColorManager *_colorManager = nullptr;
 };
 }