From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 25 Jan 2023 11:42:47 +0000 (+0100)
Subject: Remove monoIcons-related functionality from theme
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~28^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0aee2bc2eb656a863988af9ca5608db8803d867e;p=nextcloud-desktop.git

Remove monoIcons-related functionality from theme

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

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 3a262a305..907d87fac 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -360,9 +360,6 @@ Application::Application(int &argc, char **argv)
 
     setQuitOnLastWindowClosed(false);
 
-    _theme->setSystrayUseMonoIcons(cfg.monoIcons());
-    connect(_theme, &Theme::systrayUseMonoIconsChanged, this, &Application::slotUseMonoIconsChanged);
-
     // Setting up the gui class will allow tray notifications for the
     // setup that follows, like folder setup
     _gui = new ownCloudGui(this);
@@ -571,11 +568,6 @@ void Application::setupLogging()
     qCInfo(lcApplication) << "Arguments:" << qApp->arguments();
 }
 
-void Application::slotUseMonoIconsChanged(bool)
-{
-    _gui->slotComputeOverallSyncStatus();
-}
-
 void Application::slotParseMessage(const QString &msg, QObject *)
 {
     if (msg.startsWith(QLatin1String("MSG_PARSEOPTIONS:"))) {
diff --git a/src/gui/application.h b/src/gui/application.h
index 5bd412077..67fd836e9 100644
--- a/src/gui/application.h
+++ b/src/gui/application.h
@@ -100,7 +100,6 @@ signals:
 protected slots:
     void slotParseMessage(const QString &, QObject *);
     void slotCheckConnection();
-    void slotUseMonoIconsChanged(bool);
     void slotCleanup();
     void slotAccountStateAdded(OCC::AccountState *accountState);
     void slotAccountStateRemoved(OCC::AccountState *accountState);
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index caee23bc3..732bd0948 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -480,23 +480,6 @@ QString Theme::systrayIconFlavor(bool mono) const
     return flavor;
 }
 
-void Theme::setSystrayUseMonoIcons(bool mono)
-{
-    _mono = mono;
-    emit systrayUseMonoIconsChanged(mono);
-}
-
-bool Theme::systrayUseMonoIcons() const
-{
-    return _mono;
-}
-
-bool Theme::monoIconsAvailable() const
-{
-    QString themeDir = QString(Theme::themePrefix) + QString::fromLatin1("%1/").arg(Theme::instance()->systrayIconFlavor(true));
-    return QDir(themeDir).exists();
-}
-
 QString Theme::updateCheckUrl() const
 {
     return APPLICATION_UPDATE_URL;
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index de721f71c..7c6e42ba3 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -340,21 +340,6 @@ public:
      */
     virtual QString aboutDetails() const;
 
-    /**
-     * Define if the systray icons should be using mono design
-     */
-    void setSystrayUseMonoIcons(bool mono);
-
-    /**
-     * Retrieve wether to use mono icons for systray
-     */
-    bool systrayUseMonoIcons() const;
-
-    /**
-     * Check if mono icons are available
-     */
-    bool monoIconsAvailable() const;
-
     /**
      * @brief Where to check for new Updates.
      */
@@ -612,7 +597,6 @@ protected:
     Theme();
 
 signals:
-    void systrayUseMonoIconsChanged(bool);
     void systemPaletteChanged(const QPalette &palette);
     void darkModeChanged();
     void overrideServerUrlChanged();