More work with taskbar

diff --git a/src/mainwin.cpp b/src/mainwin.cpp
index 3bbd663b..724e8ce0 100644
--- a/src/mainwin.cpp
+++ b/src/mainwin.cpp
@@ -71,6 +71,7 @@
 #include <QtAlgorithms>
 #ifdef Q_OS_WIN
 #include <windows.h>
+#include "widgets/thumbnailtoolbar.h"
 #endif
 #ifdef HAVE_X11
 #include <x11windowsystem.h>
@@ -154,6 +155,7 @@ public:

 #ifdef Q_OS_WIN
     DWORD deactivationTickCount;
+    QPointer<PsiThumbnailToolBar> thumbnailToolBar_;
 #endif

     void        registerActions();
@@ -510,16 +512,9 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon *psi) :

     buildToolbars();
     // setUnifiedTitleAndToolBarOnMac(true);
+
 #ifdef Q_OS_WIN
-    thumbnailToolBar_ = new PsiThumbnailToolBar(this, windowHandle());
-    connect(thumbnailToolBar_, &PsiThumbnailToolBar::openOptions, this, &MainWin::doOptions);
-    connect(thumbnailToolBar_, &PsiThumbnailToolBar::setOnline, this,
-            [this]() { d->getAction("status_online")->trigger(); });
-    connect(thumbnailToolBar_, &PsiThumbnailToolBar::setOffline, this,
-            [this]() { d->getAction("status_offline")->trigger(); });
-    connect(thumbnailToolBar_, &PsiThumbnailToolBar::runActiveEvent, this, &MainWin::doRecvNextEvent);
-    connect(psi->contactList(), &PsiContactList::queueChanged, this,
-            [this]() { thumbnailToolBar_->updateToolBar(d->nextAmount > 0); });
+    updateWinTaskbar(_asTool);
 #endif

     connect(qApp, SIGNAL(dockActivated()), SLOT(dockActivated()));
@@ -752,6 +747,9 @@ void MainWin::setWindowOpts(bool _onTop, bool _asTool)

     setWindowFlags(flags);
     show();
+#ifdef Q_OS_WIN
+    updateWinTaskbar(_asTool);
+#endif
 }

 void MainWin::setUseDock(bool use)
@@ -1478,6 +1476,26 @@ bool MainWin::nativeEvent(const QByteArray &eventType, MSG *msg, long *result)
     }
     return false;
 }
+
+void MainWin::updateWinTaskbar(bool enabled)
+{
+    if(! enabled) {
+        if(!d->thumbnailToolBar_) {
+            d->thumbnailToolBar_ = new PsiThumbnailToolBar(this, windowHandle());
+            connect(d->thumbnailToolBar_, &PsiThumbnailToolBar::openOptions, this, &MainWin::doOptions);
+            connect(d->thumbnailToolBar_, &PsiThumbnailToolBar::setOnline, this,
+                    [this]() { d->getAction("status_online")->trigger(); });
+            connect(d->thumbnailToolBar_, &PsiThumbnailToolBar::setOffline, this,
+                    [this]() { d->getAction("status_offline")->trigger(); });
+            connect(d->thumbnailToolBar_, &PsiThumbnailToolBar::runActiveEvent, this, &MainWin::doRecvNextEvent);
+            connect(d->psi->contactList(), &PsiContactList::queueChanged, this,
+                    [this]() { d->thumbnailToolBar_->updateToolBar(d->nextAmount > 0); });
+        }
+    }
+    else {
+        delete d->thumbnailToolBar_;
+    }
+}
 #endif

 void MainWin::updateCaption()
diff --git a/src/mainwin.h b/src/mainwin.h
index 02f38fde..802f064e 100644
--- a/src/mainwin.h
+++ b/src/mainwin.h
@@ -22,9 +22,6 @@

 #include "advwidget.h"
 #include "xmpp_status.h"
-#ifdef Q_OS_WIN
-#include "widgets/thumbnailtoolbar.h"
-#endif

 #include <QList>
 #include <QMainWindow>
@@ -188,14 +185,15 @@ private:

     void buildStatusMenu(GlobalStatusMenu *statusMenu);

+#ifdef Q_OS_WIN
+    void updateWinTaskbar(bool enabled);
+#endif
+
 private:
     class Private;
     Private *d;
     friend class Private;
     QList<PsiToolBar *> toolbars_;
-#ifdef Q_OS_WIN
-    PsiThumbnailToolBar *thumbnailToolBar_;
-#endif
 };

 #endif // MAINWIN_H
diff --git a/src/widgets/thumbnailtoolbar.cpp b/src/widgets/thumbnailtoolbar.cpp
index 9a062616..46ee57ce 100644
--- a/src/widgets/thumbnailtoolbar.cpp
+++ b/src/widgets/thumbnailtoolbar.cpp
@@ -26,7 +26,7 @@
 PsiThumbnailToolBar::PsiThumbnailToolBar(QObject *parent, QWindow *parentWindow) :
     QWinThumbnailToolBar(parent), optionsBtn_(new QWinThumbnailToolButton(this)),
     onlineStatusBtn_(new QWinThumbnailToolButton(this)), offlineStatusBtn_(new QWinThumbnailToolButton(this)),
-    eventsBtn_(new QWinThumbnailToolButton(this))
+    eventsBtn_(new QWinThumbnailToolButton(this)), taskbarBtn_(new QWinTaskbarButton(parent))
 {
     // ToolTips
     optionsBtn_->setToolTip(tr("Options"));
@@ -58,6 +58,7 @@ PsiThumbnailToolBar::PsiThumbnailToolBar(QObject *parent, QWindow *parentWindow)
     addButton(offlineStatusBtn_);
     addButton(optionsBtn_);
     setWindow(parentWindow);
+    taskbarBtn_->setWindow(parentWindow);
 }

 void PsiThumbnailToolBar::updateToolBar(bool hasEvents) { eventsBtn_->setEnabled(hasEvents); }
diff --git a/src/widgets/thumbnailtoolbar.h b/src/widgets/thumbnailtoolbar.h
index 4a9c72c5..6e78fdec 100644
--- a/src/widgets/thumbnailtoolbar.h
+++ b/src/widgets/thumbnailtoolbar.h
@@ -21,6 +21,7 @@

 #include <QObject>
 #include <QWinThumbnailToolBar>
+#include <QWinTaskbarButton>

 class QWindow;

@@ -41,5 +42,6 @@ private:
     QWinThumbnailToolButton *onlineStatusBtn_;
     QWinThumbnailToolButton *offlineStatusBtn_;
     QWinThumbnailToolButton *eventsBtn_;
+    QWinTaskbarButton *taskbarBtn_;
 };
 #endif // THUMBNAIL_TOOLBAR_H