From b5bcbac542c6739ef5bcf29a4be889055dc18bd2 Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Mon, 16 Jan 2023 13:21:31 +0300
Subject: [PATCH] UI: Tray: Change icon color on some states

---
 src/ui/driver/drivermanager.cpp     |   8 ++---
 src/ui/form/tray/traycontroller.cpp |   6 ++++
 src/ui/form/tray/traycontroller.h   |   2 ++
 src/ui/form/tray/trayicon.cpp       |  50 ++++++++++++++++++++--------
 src/ui/form/tray/trayicon.h         |   7 ++--
 src/ui/fort_icons.qrc               |   2 ++
 src/ui/icons/sheild-96_gray.png     | Bin 0 -> 7420 bytes
 src/ui/icons/sheild-96_red.png      | Bin 0 -> 8042 bytes
 src/ui/manager/windowmanager.cpp    |   6 ++--
 9 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 src/ui/icons/sheild-96_gray.png
 create mode 100644 src/ui/icons/sheild-96_red.png

diff --git a/src/ui/driver/drivermanager.cpp b/src/ui/driver/drivermanager.cpp
index 025ff95a..db8a89a4 100644
--- a/src/ui/driver/drivermanager.cpp
+++ b/src/ui/driver/drivermanager.cpp
@@ -73,10 +73,10 @@ bool DriverManager::openDevice()
 {
     const bool res = device()->open(DriverCommon::deviceName());
 
-    emit isDeviceOpenedChanged();
-
     updateErrorCode(res);
 
+    emit isDeviceOpenedChanged();
+
     return res;
 }
 
@@ -84,10 +84,10 @@ bool DriverManager::closeDevice()
 {
     const bool res = device()->close();
 
-    emit isDeviceOpenedChanged();
-
     updateErrorCode(true);
 
+    emit isDeviceOpenedChanged();
+
     return res;
 }
 
diff --git a/src/ui/form/tray/traycontroller.cpp b/src/ui/form/tray/traycontroller.cpp
index 5157f196..b06f66b7 100644
--- a/src/ui/form/tray/traycontroller.cpp
+++ b/src/ui/form/tray/traycontroller.cpp
@@ -2,6 +2,7 @@
 
 #include <conf/confmanager.h>
 #include <conf/firewallconf.h>
+#include <driver/drivermanager.h>
 #include <fortmanager.h>
 #include <fortsettings.h>
 #include <manager/hotkeymanager.h>
@@ -50,6 +51,11 @@ HotKeyManager *TrayController::hotKeyManager() const
     return IoC<HotKeyManager>();
 }
 
+DriverManager *TrayController::driverManager() const
+{
+    return IoC<DriverManager>();
+}
+
 TranslationManager *TrayController::translationManager() const
 {
     return IoC<TranslationManager>();
diff --git a/src/ui/form/tray/traycontroller.h b/src/ui/form/tray/traycontroller.h
index f4d7e61c..211e5804 100644
--- a/src/ui/form/tray/traycontroller.h
+++ b/src/ui/form/tray/traycontroller.h
@@ -4,6 +4,7 @@
 #include <QObject>
 
 class ConfManager;
+class DriverManager;
 class FirewallConf;
 class FortManager;
 class FortSettings;
@@ -27,6 +28,7 @@ public:
     IniOptions *ini() const;
     IniUser *iniUser() const;
     HotKeyManager *hotKeyManager() const;
+    DriverManager *driverManager() const;
     TranslationManager *translationManager() const;
     WindowManager *windowManager() const;
 
diff --git a/src/ui/form/tray/trayicon.cpp b/src/ui/form/tray/trayicon.cpp
index bd015538..39d09a56 100644
--- a/src/ui/form/tray/trayicon.cpp
+++ b/src/ui/form/tray/trayicon.cpp
@@ -9,6 +9,7 @@
 #include <conf/appgroup.h>
 #include <conf/confmanager.h>
 #include <conf/firewallconf.h>
+#include <driver/drivermanager.h>
 #include <form/controls/controlutil.h>
 #include <form/controls/mainwindow.h>
 #include <fortsettings.h>
@@ -145,6 +146,7 @@ QAction *addAction(QWidget *widget, const QIcon &icon, const QString &text,
 TrayIcon::TrayIcon(QObject *parent) :
     QSystemTrayIcon(parent),
     m_trayTriggered(false),
+    m_alerted(false),
     m_animatedAlert(false),
     m_ctrl(new TrayController(this))
 {
@@ -152,6 +154,11 @@ TrayIcon::TrayIcon(QObject *parent) :
     setupController();
 
     connect(this, &QSystemTrayIcon::activated, this, &TrayIcon::onTrayActivated);
+
+    connect(confManager(), &ConfManager::confChanged, this, &TrayIcon::updateTrayMenu);
+    connect(confManager(), &ConfManager::iniUserChanged, this, &TrayIcon::updateTrayMenu);
+    connect(driverManager(), &DriverManager::isDeviceOpenedChanged, this,
+            &TrayIcon::updateTrayIconShape);
 }
 
 FortSettings *TrayIcon::settings() const
@@ -184,6 +191,11 @@ HotKeyManager *TrayIcon::hotKeyManager() const
     return ctrl()->hotKeyManager();
 }
 
+DriverManager *TrayIcon::driverManager() const
+{
+    return ctrl()->driverManager();
+}
+
 WindowManager *TrayIcon::windowManager() const
 {
     return ctrl()->windowManager();
@@ -211,9 +223,12 @@ void TrayIcon::onTrayActivated(QSystemTrayIcon::ActivationReason reason)
 
 void TrayIcon::updateTrayIcon(bool alerted)
 {
-    updateAnimatedTrayIcon(alerted);
+    m_alerted = alerted;
+    m_animatedAlert = false;
 
-    updateAlertTimer(alerted);
+    updateAlertTimer();
+
+    updateTrayIconShape();
 }
 
 void TrayIcon::showTrayMenu(const QPoint &pos)
@@ -227,6 +242,7 @@ void TrayIcon::updateTrayMenu(bool onlyFlags)
         updateAppGroupActions();
     }
 
+    updateTrayIconShape();
     updateTrayMenuFlags();
     updateHotKeys();
 }
@@ -286,8 +302,6 @@ void TrayIcon::setupUi()
     setupTrayMenu();
     updateTrayMenu();
 
-    updateTrayIcon();
-
     updateClickActions();
 }
 
@@ -441,7 +455,7 @@ void TrayIcon::updateAppGroupActions()
     }
 }
 
-void TrayIcon::updateAlertTimer(bool alerted)
+void TrayIcon::updateAlertTimer()
 {
     if (!iniUser()->trayAnimateAlert())
         return;
@@ -452,25 +466,35 @@ void TrayIcon::updateAlertTimer(bool alerted)
 
         connect(m_alertTimer, &QTimer::timeout, this, [&] {
             m_animatedAlert = !m_animatedAlert;
-            updateAnimatedTrayIcon(/*alerted=*/true, m_animatedAlert);
+            updateTrayIconShape();
         });
     }
 
-    m_animatedAlert = alerted;
+    m_animatedAlert = m_alerted;
 
-    if (alerted) {
+    if (m_alerted) {
         m_alertTimer->start();
     } else {
         m_alertTimer->stop();
     }
 }
 
-void TrayIcon::updateAnimatedTrayIcon(bool alerted, bool animated)
+void TrayIcon::updateTrayIconShape()
 {
-    const auto icon = alerted
-            ? (animated ? IconCache::icon(":/icons/error.png")
-                        : GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/error.png"))
-            : IconCache::icon(":/icons/sheild-96.png");
+    QString mainIconPath;
+
+    if (!conf()->filterEnabled() || !driverManager()->isDeviceOpened()) {
+        mainIconPath = ":/icons/sheild-96_gray.png";
+    } else if (conf()->stopTraffic() || conf()->stopInetTraffic()) {
+        mainIconPath = ":/icons/sheild-96_red.png";
+    } else {
+        mainIconPath = ":/icons/sheild-96.png";
+    }
+
+    const auto icon = m_alerted
+            ? (m_animatedAlert ? IconCache::icon(":/icons/error.png")
+                               : GuiUtil::overlayIcon(mainIconPath, ":/icons/error.png"))
+            : IconCache::icon(mainIconPath);
 
     this->setIcon(icon);
 }
diff --git a/src/ui/form/tray/trayicon.h b/src/ui/form/tray/trayicon.h
index db23af2f..e7c9de26 100644
--- a/src/ui/form/tray/trayicon.h
+++ b/src/ui/form/tray/trayicon.h
@@ -8,6 +8,7 @@ QT_FORWARD_DECLARE_CLASS(QActionGroup)
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
 class ConfManager;
+class DriverManager;
 class FirewallConf;
 class FortSettings;
 class HotKeyManager;
@@ -52,6 +53,7 @@ public:
     IniOptions *ini() const;
     IniUser *iniUser() const;
     HotKeyManager *hotKeyManager() const;
+    DriverManager *driverManager() const;
     WindowManager *windowManager() const;
 
     ActionType clickEventActionType(ClickType clickType) const;
@@ -87,8 +89,8 @@ private:
     void updateTrayMenuFlags();
     void updateAppGroupActions();
 
-    void updateAlertTimer(bool alerted);
-    void updateAnimatedTrayIcon(bool alerted, bool animated = false);
+    void updateAlertTimer();
+    void updateTrayIconShape();
 
     void addHotKey(QAction *action, const QString &shortcutText);
     void updateHotKeys();
@@ -108,6 +110,7 @@ private:
 
 private:
     bool m_trayTriggered : 1;
+    bool m_alerted : 1;
     bool m_animatedAlert : 1;
 
     TrayController *m_ctrl = nullptr;
diff --git a/src/ui/fort_icons.qrc b/src/ui/fort_icons.qrc
index 22249ae6..d96b65d4 100644
--- a/src/ui/fort_icons.qrc
+++ b/src/ui/fort_icons.qrc
@@ -38,6 +38,8 @@
     <file>icons/pencil.png</file>
     <file>icons/play.png</file>
     <file>icons/sheild-96.png</file>
+    <file>icons/sheild-96_gray.png</file>
+    <file>icons/sheild-96_red.png</file>
     <file>icons/save_as.png</file>
     <file>icons/server_components.png</file>
     <file>icons/time.png</file>
diff --git a/src/ui/icons/sheild-96_gray.png b/src/ui/icons/sheild-96_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..a915a1dec6672eabeac298ce1b63c7f904406e19
GIT binary patch
literal 7420
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

literal 0
HcmV?d00001

diff --git a/src/ui/icons/sheild-96_red.png b/src/ui/icons/sheild-96_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..27d38f36d86ac3b6b9b723a5a8d1e28b0b744f64
GIT binary patch
literal 8042
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

literal 0
HcmV?d00001

diff --git a/src/ui/manager/windowmanager.cpp b/src/ui/manager/windowmanager.cpp
index 59c22ad5..681423bc 100644
--- a/src/ui/manager/windowmanager.cpp
+++ b/src/ui/manager/windowmanager.cpp
@@ -132,10 +132,8 @@ void WindowManager::setupTrayIcon()
             &WindowManager::onTrayMessageClicked);
 
     auto confManager = IoC<ConfManager>();
-    connect(confManager, &ConfManager::confChanged, m_trayIcon, &TrayIcon::updateTrayMenu);
-    connect(confManager, &ConfManager::iniUserChanged, m_trayIcon, &TrayIcon::updateTrayMenu);
     connect(confManager, &ConfManager::appAlerted, m_trayIcon,
-            [&] { m_trayIcon->updateTrayIcon(true); });
+            [&] { m_trayIcon->updateTrayIcon(/*alerted=*/true); });
 }
 
 void WindowManager::setupProgramsWindow()
@@ -145,7 +143,7 @@ void WindowManager::setupProgramsWindow()
 
     connect(m_progWindow, &ProgramsWindow::aboutToClose, this, &WindowManager::closeProgramsWindow);
     connect(m_progWindow, &ProgramsWindow::activationChanged, m_trayIcon,
-            [&] { m_trayIcon->updateTrayIcon(false); });
+            [&] { m_trayIcon->updateTrayIcon(/*alerted=*/false); });
 }
 
 void WindowManager::setupOptionsWindow()