From 28d961c018d3f1337862abac1f138a114954a178 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Mon, 27 Jan 2020 00:29:30 +0100
Subject: [PATCH 1/8] Add Win icon

---
 app/SysTray-X/files/icons/SysTray-X.ico | Bin 0 -> 3415 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/SysTray-X/files/icons/SysTray-X.ico

diff --git a/app/SysTray-X/files/icons/SysTray-X.ico b/app/SysTray-X/files/icons/SysTray-X.ico
new file mode 100644
index 0000000000000000000000000000000000000000..99b179c45e1f0f4abf9819ba6fde8db2a9d940de
GIT binary patch
literal 3415
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

literal 0
HcmV?d00001


From 4fae56d1b69dd013af0ef1a405d5ae925c9ab380 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Mon, 3 Feb 2020 23:05:20 +0100
Subject: [PATCH 2/8] Add show/hide menu and icon click action (minimize)

---
 app/SysTray-X/SysTray-X.pro       | 19 +++++++-
 app/SysTray-X/systrayx.cpp        | 47 ++++++++++--------
 app/SysTray-X/systrayx.h          | 13 ++---
 app/SysTray-X/systrayxicon.cpp    | 25 ++++++++++
 app/SysTray-X/systrayxicon.h      | 20 ++++++--
 app/SysTray-X/systrayxlink.cpp    | 76 +++++++++++++++++++++++++++--
 app/SysTray-X/systrayxlink.h      | 25 ++++++++++
 app/SysTray-X/windowctrl-unix.cpp | 32 ++++++++++++
 app/SysTray-X/windowctrl-unix.h   | 65 +++++++++++++++++++++++++
 app/SysTray-X/windowctrl-win.cpp  | 22 +++++++++
 app/SysTray-X/windowctrl-win.h    | 55 +++++++++++++++++++++
 app/SysTray-X/windowctrl.h        | 14 ++++++
 webext/background.js              | 81 +++++++++++++++++++++++++++----
 webext/manifest.json              |  2 +-
 14 files changed, 451 insertions(+), 45 deletions(-)
 create mode 100644 app/SysTray-X/windowctrl-unix.cpp
 create mode 100644 app/SysTray-X/windowctrl-unix.h
 create mode 100644 app/SysTray-X/windowctrl-win.cpp
 create mode 100644 app/SysTray-X/windowctrl-win.h
 create mode 100644 app/SysTray-X/windowctrl.h

diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro
index 38ab0f3..168e2c8 100644
--- a/app/SysTray-X/SysTray-X.pro
+++ b/app/SysTray-X/SysTray-X.pro
@@ -131,6 +131,14 @@ SOURCES += \
         debugwidget.cpp \
         preferencesdialog.cpp \
         preferences.cpp
+unix: {
+SOURCES += \
+        windowctrl-unix.cpp
+}
+win32: {
+SOURCES += \
+        windowctrl-win.cpp
+}
 
 HEADERS += \
         systrayxlink.h \
@@ -138,7 +146,16 @@ HEADERS += \
         systrayx.h \
         debugwidget.h \
         preferencesdialog.h \
-        preferences.h
+        preferences.h \
+        windowctrl.h
+unix: {
+HEADERS += \
+        windowctrl-unix.h
+}
+win32: {
+HEADERS += \
+        windowctrl-win.h
+}
 
 FORMS += \
         debugwidget.ui \
diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp
index f5f5b19..c009ead 100644
--- a/app/SysTray-X/systrayx.cpp
+++ b/app/SysTray-X/systrayx.cpp
@@ -7,6 +7,7 @@
 #include "preferencesdialog.h"
 #include "systrayxlink.h"
 #include "systrayxicon.h"
+#include "windowctrl.h"
 
 /*
  *	Qt includes
@@ -30,6 +31,11 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
      */
     m_preferences = new Preferences();
 
+    /*
+     *  Setup window control
+     */
+    m_win_ctrl = new WindowCtrl();
+
     /*
      *  Setup the link
      */
@@ -54,9 +60,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
         m_debug->show();
     }
 
-//    connect( m_trayIcon, &QSystemTrayIcon::messageClicked, this, &SysTrayX::messageClicked);
-    connect( m_tray_icon, &QSystemTrayIcon::activated, this, &SysTrayX::iconActivated);
-
     /*
      *  Connect debug link signals
      */
@@ -72,10 +75,11 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
     connect( m_pref_dialog, &PreferencesDialog::signalDebugMessage, m_debug, &DebugWidget::slotDebugMessage );
     connect( m_tray_icon, &SysTrayXIcon::signalDebugMessage, m_debug, &DebugWidget::slotDebugMessage );
     connect( m_link, &SysTrayXLink::signalDebugMessage, m_debug, &DebugWidget::slotDebugMessage );
+    connect( m_win_ctrl, &WindowCtrl::signalDebugMessage, m_debug, &DebugWidget::slotDebugMessage );
 
 
     /*
-     * Connect preferences signals
+     *  Connect preferences signals
      */
     connect( m_preferences, &Preferences::signalIconTypeChange, m_tray_icon, &SysTrayXIcon::slotIconTypeChange );
     connect( m_preferences, &Preferences::signalIconDataChange, m_tray_icon, &SysTrayXIcon::slotIconDataChange );
@@ -91,10 +95,22 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
     connect( m_preferences, &Preferences::signalDebugChange, m_debug, &DebugWidget::slotDebugChange );
 
     /*
-     * Connect link signals
+     *  Connect link signals
      */
     connect( m_link, &SysTrayXLink::signalUnreadMail, m_tray_icon, &SysTrayXIcon::slotSetUnreadMail );
     connect( m_link, &SysTrayXLink::signalShutdown, this, &SysTrayX::slotShutdown );
+    connect( m_link, &SysTrayXLink::signalWindowState, m_win_ctrl, &WindowCtrl::slotWindowState );
+
+    /*
+     *  Connect window signals
+     */
+    connect( m_win_ctrl, &WindowCtrl::signalWindowNormal, m_link, &SysTrayXLink::slotWindowNormal );
+    connect( m_win_ctrl, &WindowCtrl::signalWindowMinimize, m_link, &SysTrayXLink::slotWindowMinimize );
+
+    /*
+     *  Connect system tray signals
+     */
+    connect( m_tray_icon, &SysTrayXIcon::signalShowHide, m_win_ctrl, &WindowCtrl::slotShowHide );
 
     /*
      *  Request preferences from add-on
@@ -116,22 +132,6 @@ void SysTrayX::getPreferences()
 }
 
 
-/*
- *  Handle a click on the system tray icon
- */
-void SysTrayX::iconActivated( QSystemTrayIcon::ActivationReason reason )
-{
-    switch (reason) {
-    case QSystemTrayIcon::Trigger:
-    case QSystemTrayIcon::DoubleClick:
-    case QSystemTrayIcon::MiddleClick:
-        break;
-    default:
-        ;
-    }
-}
-
-
 /*
  *  Create the actions for the system tray icon menu
  */
@@ -148,6 +148,9 @@ void SysTrayX::createActions()
     connect( m_restoreAction, &QAction::triggered, this, &QWidget::showNormal );
 */
 
+    m_showhide_action = new QAction(tr("&Show/Hide"), this);
+    connect( m_showhide_action, &QAction::triggered, m_win_ctrl, &WindowCtrl::slotShowHide );
+
     m_pref_action = new QAction(tr("&Preferences"), this);
     connect( m_pref_action, &QAction::triggered, m_pref_dialog, &PreferencesDialog::showNormal );
 
@@ -175,6 +178,8 @@ void SysTrayX::createTrayIcon()
 //    m_trayIconMenu->addAction( m_maximizeAction );
 //    m_trayIconMenu->addAction( m_restoreAction );
 
+    m_tray_icon_menu->addAction( m_showhide_action );
+    m_tray_icon_menu->addSeparator();
     m_tray_icon_menu->addAction( m_pref_action );
     m_tray_icon_menu->addSeparator();
     m_tray_icon_menu->addAction( m_quit_action );
diff --git a/app/SysTray-X/systrayx.h b/app/SysTray-X/systrayx.h
index 2a0551e..ad787c5 100644
--- a/app/SysTray-X/systrayx.h
+++ b/app/SysTray-X/systrayx.h
@@ -22,6 +22,7 @@ class DebugWidget;
 class PreferencesDialog;
 class SysTrayXIcon;
 class SysTrayXLink;
+class WindowCtrl;
 
 /**
  * @brief The SysTrayX class
@@ -50,12 +51,6 @@ class SysTrayX : public QObject
          */
         void getPreferences();
 
-        /**
-         * @brief iconActivated
-         * @param reason
-         */
-        void iconActivated( QSystemTrayIcon::ActivationReason reason );
-
         /**
          * @brief createTrayIcon. Create the system tray icon.
          */
@@ -94,6 +89,11 @@ class SysTrayX : public QObject
          */
         DebugWidget *m_debug;
 
+        /**
+         * @brief m_win_ctrl. Pointer to the window control.
+         */
+        WindowCtrl *m_win_ctrl;
+
         /**
          * @brief m_link. Pointer to the link object.
          */
@@ -119,6 +119,7 @@ class SysTrayX : public QObject
          */
         QAction *m_pref_action;
         QAction *m_quit_action;
+        QAction *m_showhide_action;
 };
 
 #endif // SYSTRAYX_H
diff --git a/app/SysTray-X/systrayxicon.cpp b/app/SysTray-X/systrayxicon.cpp
index f9068c6..a3a82f0 100644
--- a/app/SysTray-X/systrayxicon.cpp
+++ b/app/SysTray-X/systrayxicon.cpp
@@ -28,6 +28,8 @@ SysTrayXIcon::SysTrayXIcon( SysTrayXLink *link, Preferences *pref, QObject *pare
     m_pref = pref;
 
     m_unread_mail = 0;
+
+    connect( this, &QSystemTrayIcon::activated, this, &SysTrayXIcon::slotIconActivated );
 }
 
 
@@ -188,3 +190,26 @@ void SysTrayXIcon::slotIconDataChange()
     setIconMime( m_pref->getIconMime() );
     setIconData( m_pref->getIconData() );
 }
+
+
+/*
+ *  Handle activation of the tray icon
+ */
+void SysTrayXIcon::slotIconActivated( QSystemTrayIcon::ActivationReason reason )
+{
+    switch (reason) {
+    case QSystemTrayIcon::Trigger:
+    {
+        //  Clicked
+        emit signalShowHide();
+        break;
+    }
+
+    case QSystemTrayIcon::DoubleClick:
+    case QSystemTrayIcon::MiddleClick:
+        break;
+
+    default:
+        ;
+    }
+}
diff --git a/app/SysTray-X/systrayxicon.h b/app/SysTray-X/systrayxicon.h
index 478892a..c9beb57 100644
--- a/app/SysTray-X/systrayxicon.h
+++ b/app/SysTray-X/systrayxicon.h
@@ -61,6 +61,13 @@ class SysTrayXIcon : public QSystemTrayIcon
          */
         void setUnreadMail( int unread_mail );
 
+    private:
+
+        /**
+         * @brief setIcon. Set a new rendered icon.
+         */
+        void renderIcon();
+
     signals:
 
         /**
@@ -70,6 +77,11 @@ class SysTrayXIcon : public QSystemTrayIcon
          */
         void signalDebugMessage( QString message );
 
+        /**
+         * @brief signalShowHide. Signal show / hide window.
+         */
+        void signalShowHide();
+
    public slots:
 
         /**
@@ -89,12 +101,14 @@ class SysTrayXIcon : public QSystemTrayIcon
          */
         void slotIconDataChange();
 
-    private:
+    private slots:
 
         /**
-         * @brief setIcon. Set a new rendered icon.
+         * @brief slotIconActivated. Hnadle activation signal of the tray icon.
+         *
+         *  @param reason   Activation reason.
          */
-        void renderIcon();
+        void slotIconActivated( QSystemTrayIcon::ActivationReason reason );
 
     private:
 
diff --git a/app/SysTray-X/systrayxlink.cpp b/app/SysTray-X/systrayxlink.cpp
index 27a18f0..13bc0eb 100644
--- a/app/SysTray-X/systrayxlink.cpp
+++ b/app/SysTray-X/systrayxlink.cpp
@@ -129,6 +129,52 @@ void SysTrayXLink::sendPreferences()
 }
 
 
+/*
+ *  Send the window normal command
+ */
+void SysTrayXLink::sendWindowNormal()
+{
+    /*
+     *  Create command
+     */
+    QJsonObject windowObject;
+    windowObject.insert("window", "normal" );
+
+    /*
+     *  Create doc
+     */
+    QJsonDocument doc( windowObject );
+
+    /*
+     *  Send the command
+     */
+    linkWrite( doc.toJson( QJsonDocument::Compact ) );
+}
+
+
+/*
+ *  Send the window minimize command
+ */
+void SysTrayXLink::sendWindowMinimize()
+{
+    /*
+     *  Create command
+     */
+    QJsonObject windowObject;
+    windowObject.insert("window", "minimized" );
+
+    /*
+     *  Create doc
+     */
+    QJsonDocument doc( windowObject );
+
+    /*
+     *  Send the command
+     */
+    linkWrite( doc.toJson( QJsonDocument::Compact ) );
+}
+
+
 /*
  *  Decode JSON message
  */
@@ -141,15 +187,21 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message )
     {
         QJsonObject jsonObject = jsonResponse.object();
 
+        if( jsonObject.contains( "unreadMail" ) && jsonObject[ "unreadMail" ].isDouble() )
+        {
+            int unreadMail = jsonObject[ "unreadMail" ].toInt();
+            emit signalUnreadMail( unreadMail );
+        }
+
         if( jsonObject.contains( "shutdown" ) && jsonObject[ "shutdown" ].isString() )
         {
             emit signalShutdown();
         }
 
-        if( jsonObject.contains( "unreadMail" ) && jsonObject[ "unreadMail" ].isDouble() )
+        if( jsonObject.contains( "window" ) && jsonObject[ "window" ].isString() )
         {
-            int unreadMail = jsonObject[ "unreadMail" ].toInt();
-            emit signalUnreadMail( unreadMail );
+            QString window_state = jsonObject[ "window" ].toString();
+            emit signalWindowState( window_state );
         }
 
         if( jsonObject.contains( "preferences" ) && jsonObject[ "preferences" ].isObject() )
@@ -331,3 +383,21 @@ void SysTrayXLink::slotIconDataChange()
         sendPreferences();
     }
 }
+
+
+/*
+ *  Handle the window normal signal
+ */
+void SysTrayXLink::slotWindowNormal()
+{
+    sendWindowNormal();
+}
+
+
+/*
+ *  Handle the window minimize signal
+ */
+void SysTrayXLink::slotWindowMinimize()
+{
+    sendWindowMinimize();
+}
diff --git a/app/SysTray-X/systrayxlink.h b/app/SysTray-X/systrayxlink.h
index f428474..881836c 100644
--- a/app/SysTray-X/systrayxlink.h
+++ b/app/SysTray-X/systrayxlink.h
@@ -45,6 +45,16 @@ class SysTrayXLink : public QObject
          */
         void sendPreferences();
 
+        /**
+         * @brief sendWindowNormal. Send the window normal command.
+         */
+        void sendWindowNormal();
+
+        /**
+         * @brief sendWindowMinimize. Send the window minimize command.
+         */
+        void sendWindowMinimize();
+
     private:
 
         /**
@@ -75,6 +85,11 @@ class SysTrayXLink : public QObject
          */
         void signalShutdown();
 
+        /**
+         * @brief signalWindowState. Signal a change in the window state.
+         */
+        void signalWindowState( QString state );
+
         /**
          * @brief signalReceivedMessageLength
          *
@@ -132,6 +147,16 @@ class SysTrayXLink : public QObject
          */
         void slotIconDataChange();
 
+        /**
+         * @brief slotWindowNormal. Slot for handling window normal signals.
+         */
+        void slotWindowNormal();
+
+        /**
+         * @brief slotWindowMinimize. Slot for handling window minimize signals.
+         */
+        void slotWindowMinimize();
+
      private slots:
 
         /**
diff --git a/app/SysTray-X/windowctrl-unix.cpp b/app/SysTray-X/windowctrl-unix.cpp
new file mode 100644
index 0000000..275ff24
--- /dev/null
+++ b/app/SysTray-X/windowctrl-unix.cpp
@@ -0,0 +1,32 @@
+#include "windowctrl-unix.h"
+
+#ifdef Q_OS_UNIX
+
+WindowCtrl::WindowCtrl(QObject *parent) : QObject(parent)
+{
+
+}
+
+
+void WindowCtrl::slotWindowState( QString state )
+{
+    m_state = state;
+
+    emit signalDebugMessage( "Win state: " + state );
+}
+
+
+void WindowCtrl::slotShowHide()
+{
+    if( m_state == "minimized" )
+    {
+        m_state = "normal";
+        emit signalWindowNormal();
+    } else {
+        m_state = "minimized";
+        emit signalWindowMinimize();
+    }
+}
+
+
+#endif // Q_OS_UNIX
diff --git a/app/SysTray-X/windowctrl-unix.h b/app/SysTray-X/windowctrl-unix.h
new file mode 100644
index 0000000..f1302e6
--- /dev/null
+++ b/app/SysTray-X/windowctrl-unix.h
@@ -0,0 +1,65 @@
+#include <QtGlobal>
+#ifdef Q_OS_UNIX
+
+#ifndef WINDOWCTRLLINUX_H
+#define WINDOWCTRLLINUX_H
+
+#include <QObject>
+
+class WindowCtrl : public QObject
+{
+    Q_OBJECT
+
+    public:
+
+        /**
+         * @brief WindowCtrl. Constructor.
+         *
+         * @param parent    My parent.
+         */
+        explicit WindowCtrl( QObject *parent = nullptr );
+
+    signals:
+
+        /**
+         * @brief signalDebugMessage. Signal a debug message.
+         *
+         * @param message   The message.
+         */
+        void signalDebugMessage( QString message );
+
+        /**
+         * @brief signalWindowNormal. Signal normal window.
+         */
+        void signalWindowNormal();
+
+        /**
+         * @brief signalWindowMinimuze. Signal minimize window.
+         */
+        void signalWindowMinimize();
+
+    public slots:
+
+        /**
+         * @brief slotWindowState. Handle the window state change signal.
+         *
+         * @param state     The new state.
+         */
+        void slotWindowState( QString state );
+
+        /**
+         * @brief slotShowHide. Slot for handling of the show / hide window signal.
+         */
+        void slotShowHide();
+
+    private:
+
+        /**
+         * @brief m_state. State of the TB window.
+         */
+        QString m_state;
+};
+
+#endif // WINDOWCTRLLINUX_H
+
+#endif // Q_OS_UNIX
diff --git a/app/SysTray-X/windowctrl-win.cpp b/app/SysTray-X/windowctrl-win.cpp
new file mode 100644
index 0000000..c7b30d2
--- /dev/null
+++ b/app/SysTray-X/windowctrl-win.cpp
@@ -0,0 +1,22 @@
+#include "windowctrl-win.h"
+
+#ifdef Q_OS_WIN
+
+WindowCtrl::WindowCtrl(QObject *parent) : QObject(parent)
+{
+
+}
+
+
+void WindowCtrl::slotWindowState( QString state )
+{
+
+}
+
+
+void WindowCtrl::slotShowHide()
+{
+
+}
+
+#endif // Q_OS_WIN
diff --git a/app/SysTray-X/windowctrl-win.h b/app/SysTray-X/windowctrl-win.h
new file mode 100644
index 0000000..1e8f882
--- /dev/null
+++ b/app/SysTray-X/windowctrl-win.h
@@ -0,0 +1,55 @@
+#include <QtGlobal>
+#ifdef Q_OS_WIN
+
+#ifndef WINDOWCTRLWIN_H
+#define WINDOWCTRLWIN_H
+
+#include <QObject>
+
+class WindowCtrl : public QObject
+{
+    Q_OBJECT
+
+    public:
+
+        /**
+         * @brief WindowCtrl. Constructor.
+         *
+         * @param parent    My parent.
+         */
+        explicit WindowCtrl( QObject *parent = nullptr );
+
+    signals:
+
+        /**
+         * @brief signalDebugMessage. Signal a debug message.
+         *
+         * @param message   The message.
+         */
+        void signalDebugMessage( QString message );
+
+    public slots:
+
+        /**
+         * @brief slotWindowState. Handle the window state change signal.
+         *
+         * @param state     The new state.
+         */
+        void slotWindowState( QString state );
+
+        /**
+         * @brief slotShowHide. Slot for handling of the show / hide window signal.
+         */
+        void slotShowHide();
+
+private:
+
+    /**
+     * @brief m_state. State of the TB window.
+     */
+    QString m_state;
+};
+
+#endif // WINDOWCTRLWIN_H
+
+#endif // Q_OS_WIN
diff --git a/app/SysTray-X/windowctrl.h b/app/SysTray-X/windowctrl.h
new file mode 100644
index 0000000..04288c1
--- /dev/null
+++ b/app/SysTray-X/windowctrl.h
@@ -0,0 +1,14 @@
+#ifndef WINDOWCTRL_H
+#define WINDOWCTRL_H
+
+#include <QtGlobal>
+
+#ifdef Q_OS_UNIX
+#include "windowctrl-unix.h"
+#endif // Q_OS_UNIX
+
+#ifdef Q_OS_WIN
+#include "windowctrl-win.h"
+#endif // Q_OS_WIN
+
+#endif // WINDOWCTRL_H
diff --git a/webext/background.js b/webext/background.js
index 6a8de7c..98d0517 100644
--- a/webext/background.js
+++ b/webext/background.js
@@ -23,17 +23,11 @@ SysTrayX.Messaging = {
     //    this.unReadMessages(this.unreadFiltersTest).then(this.unreadCb);
     window.setInterval(SysTrayX.Messaging.pollAccounts, 10000);
 
-    //  Semd the app a close command
-    browser.windows.onRemoved.addListener(SysTrayX.Messaging.closeApp);
-  },
+    //  Send the app a close command if the window closes
+    browser.windows.onRemoved.addListener(SysTrayX.Window.closed);
 
-  closeApp: function() {
-    console.debug("Shutting down");
-
-    //  Send it to the app
-    SysTrayX.Link.postSysTrayXMessage({
-      shutdown: ""
-    });
+    //  Try to catch the window state
+    browser.windows.onFocusChanged.addListener(SysTrayX.Window.focusChanged);
   },
 
   //
@@ -233,6 +227,23 @@ SysTrayX.Link = {
   receiveSysTrayXMessage: function(response) {
     console.log(`Received: ${response}`);
 
+    if (response["window"]) {
+      console.log("Window received: " + response["window"]);
+
+      if (response["window"] === "minimized") {
+        browser.windows.update(SysTrayX.Window.startWindow.id, {
+          state: "minimized"
+        });
+      }
+
+      if (response["window"] === "normal") {
+        browser.windows.update(SysTrayX.Window.startWindow.id, {
+          state: "normal",
+          focused: true
+        });
+      }
+    }
+
     if (response["preferences"]) {
       //  Store the preferences from the app
       console.log("Preferences received");
@@ -268,10 +279,60 @@ SysTrayX.Link = {
   }
 };
 
+SysTrayX.Window = {
+  startWindow: undefined,
+
+  closed: function() {
+    // Window closed
+    console.debug("Shutting down");
+
+    //  Send it to the app
+    SysTrayX.Link.postSysTrayXMessage({
+      shutdown: ""
+    });
+  },
+
+  focusChanged: function(windowId) {
+    console.debug("Win focus changed");
+
+    browser.windows.getCurrent().then(win => {
+      SysTrayX.Link.postSysTrayXMessage({ window: win.state });
+    });
+
+    /*
+    if (windowId === -1) {
+      // Assume minimized
+      SysTrayX.Link.postSysTrayXMessage({
+        window: "minimized"
+      });
+    } else {
+      browser.windows.get(windowId, function(win) {
+        SysTrayX.Link.postSysTrayXMessage({
+          window: win.state
+        });
+      });
+    }
+*/
+  }
+};
+
 async function start() {
   // Init defaults before everything
   await getDefaultIcon();
 
+  SysTrayX.Window.startWindow = await browser.windows
+    .getCurrent()
+    .then(currentWindow => currentWindow);
+
+  console.debug("Window focus: " + SysTrayX.Window.startWindow.focused);
+  console.debug("Window name: " + SysTrayX.Window.startWindow.title);
+  console.debug("Window name: " + SysTrayX.Window.startWindow.state);
+
+  //  browser.windows.update(currentWindow.id, { state: "minimized" });
+  //  browser.windows.update(currentWindow.id, { state: "normal", focused: true });
+
+  // ??  browser.windows.update(currentWindow.id, { state: "docked" });
+
   //  Setup the link first
   SysTrayX.Link.init();
 
diff --git a/webext/manifest.json b/webext/manifest.json
index cb05c3f..d037a97 100644
--- a/webext/manifest.json
+++ b/webext/manifest.json
@@ -19,7 +19,7 @@
 
   "default_locale": "en-US",
 
-  "permissions": ["accountsRead", "messagesRead", "storage", "nativeMessaging"],
+  "permissions": ["accountsRead", "messagesRead", "storage", "nativeMessaging", "tabs"],
 
   "background": {
     "page": "background.html"

From 542e8124b94771e54a299e6f56f777b511ab29b6 Mon Sep 17 00:00:00 2001
From: Maxime Rijnders <ximi.github@gmail.com>
Date: Mon, 3 Feb 2020 23:09:06 +0100
Subject: [PATCH 3/8] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4120f5e..63a869c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@ The add-on and system tray application can do:
 
 - custom new mail icon
 - display number of unread mails
-- to be implemented: show / hide Thunderbird
+- show / hide Thunderbird (minimize)
+- to be implemented: remove from task bar when minimized
 - to be implemented: start a new mail
 - to be implemented: open the last used account
 

From 7db31ffe1d6f08977994955416a267c614e05c3a Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 4 Feb 2020 21:45:40 +0100
Subject: [PATCH 4/8] Sync win

---
 app/SysTray-X/windowctrl-unix.cpp |  9 +++++++++
 app/SysTray-X/windowctrl-win.cpp  | 20 +++++++++++++++++++-
 app/SysTray-X/windowctrl-win.h    | 20 +++++++++++++++-----
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/app/SysTray-X/windowctrl-unix.cpp b/app/SysTray-X/windowctrl-unix.cpp
index 275ff24..9101a5a 100644
--- a/app/SysTray-X/windowctrl-unix.cpp
+++ b/app/SysTray-X/windowctrl-unix.cpp
@@ -2,12 +2,18 @@
 
 #ifdef Q_OS_UNIX
 
+/*
+ *  Constructor
+ */
 WindowCtrl::WindowCtrl(QObject *parent) : QObject(parent)
 {
 
 }
 
 
+/*
+ *  Handle change in window state
+ */
 void WindowCtrl::slotWindowState( QString state )
 {
     m_state = state;
@@ -16,6 +22,9 @@ void WindowCtrl::slotWindowState( QString state )
 }
 
 
+/*
+ *  Handle show / hide signal
+ */
 void WindowCtrl::slotShowHide()
 {
     if( m_state == "minimized" )
diff --git a/app/SysTray-X/windowctrl-win.cpp b/app/SysTray-X/windowctrl-win.cpp
index c7b30d2..fecde09 100644
--- a/app/SysTray-X/windowctrl-win.cpp
+++ b/app/SysTray-X/windowctrl-win.cpp
@@ -2,21 +2,39 @@
 
 #ifdef Q_OS_WIN
 
+/*
+ *  Constructor
+ */
 WindowCtrl::WindowCtrl(QObject *parent) : QObject(parent)
 {
 
 }
 
 
+/*
+ *  Handle change in window state
+ */
 void WindowCtrl::slotWindowState( QString state )
 {
+    m_state = state;
 
+    emit signalDebugMessage( "Win state: " + state );
 }
 
 
+/*
+ *  Handle show / hide signal
+ */
 void WindowCtrl::slotShowHide()
 {
-
+    if( m_state == "minimized" )
+    {
+        m_state = "normal";
+        emit signalWindowNormal();
+    } else {
+        m_state = "minimized";
+        emit signalWindowMinimize();
+    }
 }
 
 #endif // Q_OS_WIN
diff --git a/app/SysTray-X/windowctrl-win.h b/app/SysTray-X/windowctrl-win.h
index 1e8f882..23f4863 100644
--- a/app/SysTray-X/windowctrl-win.h
+++ b/app/SysTray-X/windowctrl-win.h
@@ -28,6 +28,16 @@ class WindowCtrl : public QObject
          */
         void signalDebugMessage( QString message );
 
+        /**
+         * @brief signalWindowNormal. Signal normal window.
+         */
+        void signalWindowNormal();
+
+        /**
+         * @brief signalWindowMinimuze. Signal minimize window.
+         */
+        void signalWindowMinimize();
+
     public slots:
 
         /**
@@ -42,12 +52,12 @@ class WindowCtrl : public QObject
          */
         void slotShowHide();
 
-private:
+    private:
 
-    /**
-     * @brief m_state. State of the TB window.
-     */
-    QString m_state;
+        /**
+         * @brief m_state. State of the TB window.
+         */
+        QString m_state;
 };
 
 #endif // WINDOWCTRLWIN_H

From dbd4b18ef6fd1415b282b06334767a67a004be24 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Wed, 5 Feb 2020 22:49:33 +0100
Subject: [PATCH 5/8] Remove unix dep

---
 app/SysTray-X/systrayxlink.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/SysTray-X/systrayxlink.cpp b/app/SysTray-X/systrayxlink.cpp
index 13bc0eb..f393ae2 100644
--- a/app/SysTray-X/systrayxlink.cpp
+++ b/app/SysTray-X/systrayxlink.cpp
@@ -8,7 +8,6 @@
 /*
  *  System includes
  */
-#include <unistd.h>
 
 /*
  *	Qt includes
@@ -52,10 +51,10 @@ SysTrayXLink::SysTrayXLink( Preferences *pref )
     /*
      *  Setup the notifiers
      */
-    m_notifier_link_read = new QSocketNotifier( STDIN_FILENO, QSocketNotifier::Read, this );
+    m_notifier_link_read = new QSocketNotifier( 0, QSocketNotifier::Read, this );
     connect( m_notifier_link_read, &QSocketNotifier::activated, this, &SysTrayXLink::slotLinkRead );
 
-    m_notifier_link_read_exception = new QSocketNotifier( STDIN_FILENO, QSocketNotifier::Exception, this );
+    m_notifier_link_read_exception = new QSocketNotifier( 0, QSocketNotifier::Exception, this );
     connect( m_notifier_link_read_exception, &QSocketNotifier::activated, this, &SysTrayXLink::slotLinkReadException );
 }
 

From 182622f0e4f9f53a493051202d8c03334022a74f Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Wed, 5 Feb 2020 23:48:28 +0100
Subject: [PATCH 6/8] Update win build

---
 app/SysTray-X/SysTray-X.pro | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro
index 168e2c8..c169482 100644
--- a/app/SysTray-X/SysTray-X.pro
+++ b/app/SysTray-X/SysTray-X.pro
@@ -116,6 +116,17 @@ message("Git branch: "$$GIT_BRANCH)
 message("Version: "$$VERSION_MAJOR"."$$VERSION_MINOR"."$$VERSION_PATCH)
 #message($$QMAKESPEC)
 
+win32: {
+    CONFIG(debug, debug|release) {
+        QAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
+        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgetsd.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
+        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\"
+    } else {
+        QAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
+        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgets.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
+        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($${OUT_PWD}/release/)\"
+    }
+}
 
 #
 #	DO NOT COMPRESS THE RESOURCES. QFile.map() cannot handle it...

From 6b59e2f12f1999db94aec42f9ba352a2438add92 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Wed, 5 Feb 2020 23:55:43 +0100
Subject: [PATCH 7/8] Update

---
 app/SysTray-X/SysTray-X.pro | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro
index c169482..fd4448e 100644
--- a/app/SysTray-X/SysTray-X.pro
+++ b/app/SysTray-X/SysTray-X.pro
@@ -118,13 +118,13 @@ message("Version: "$$VERSION_MAJOR"."$$VERSION_MINOR"."$$VERSION_PATCH)
 
 win32: {
     CONFIG(debug, debug|release) {
-        QAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
-        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgetsd.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
-        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\"
+        QMAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
+        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgetsd.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
+        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\"
     } else {
-        QAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
-        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgets.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
-        QAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($${OUT_PWD}/release/)\"
+        QMAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
+        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgets.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
+        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($${OUT_PWD}/release/)\"
     }
 }
 

From a98a87b7342fda151d7b011bf017ccfd0820f839 Mon Sep 17 00:00:00 2001
From: Maxime Rijnders <ximi.github@gmail.com>
Date: Thu, 6 Feb 2020 14:24:55 +0100
Subject: [PATCH 8/8] Update SysTray-X.pro

---
 app/SysTray-X/SysTray-X.pro | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro
index fd4448e..febb3d3 100644
--- a/app/SysTray-X/SysTray-X.pro
+++ b/app/SysTray-X/SysTray-X.pro
@@ -118,13 +118,13 @@ message("Version: "$$VERSION_MAJOR"."$$VERSION_MINOR"."$$VERSION_PATCH)
 
 win32: {
     CONFIG(debug, debug|release) {
-        QMAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
-        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgetsd.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
-        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\"
+        QMAKE_POST_LINK = $$[QT_INSTALL_BINS]\windeployqt.exe "$$shell_path($${OUT_PWD}/debug/$${TARGET}.exe)"
+
+#       QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgetsd.dll)\" \"$$shell_path($${OUT_PWD}/debug/)\" &
     } else {
-        QMAKE_POST_LINK = xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
-        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgets.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
-        QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($${OUT_PWD}/release/)\"
+        QMAKE_POST_LINK = $$[QT_INSTALL_BINS]\windeployqt.exe "$$shell_path($${OUT_PWD}/release/$${TARGET}.exe)"
+
+#       QMAKE_POST_LINK += xcopy /Y \"$$shell_path($$[QT_INSTALL_BINS]/Qt5widgets.dll)\" \"$$shell_path($${OUT_PWD}/release/)\" &
     }
 }