Some improvements to connectivity check: Start with small timeout and increase the...

[mutilities/MUtilities.git] / src / Taskbar7_Win32.cpp

diff --git a/src/Taskbar7_Win32.cpp b/src/Taskbar7_Win32.cpp
index d86bd53..f97b137 100644 (file)
--- a/src/Taskbar7_Win32.cpp
+++ b/src/Taskbar7_Win32.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
-// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// MuldeR's Utilities for Qt
+// Copyright (C) 2004-2017 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // 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
@@ -20,13 +20,20 @@
 // http://www.gnu.org/licenses/gpl-2.0.txt
 ///////////////////////////////////////////////////////////////////////////////
 
-//Internal
+//MUtils
 #include <MUtils/Taskbar7.h>
+#include <MUtils/OSSupport.h>
 #include <MUtils/Exception.h>
 
+//Internal
+#include "Utils_Win32.h"
+
 //Qt
 #include <QWidget>
 #include <QIcon>
+#if QT_VERSION > QT_VERSION_CHECK(5,0,0)
+#include <QtWinExtras>
+#endif
 
 //Windows includes
 #define NOMINMAX
@@ -40,7 +47,11 @@
 
 #define INITIALIZE_TASKBAR() do \
 { \
-       if(!initialize()) \
+       if(!p->supported) \
+       { \
+               return false; \
+       } \
+       if(!(p->initialized || initialize())) \
        { \
                qWarning("Taskbar initialization failed!"); \
                return false; \
@@ -59,7 +70,15 @@ namespace MUtils
                friend class Taskbar7;
 
        protected:
+               Taskbar7_Private(void)
+               {
+                       taskbarList = NULL;
+                       supported   = false;
+                       initialized = false;
+               }
+
                ITaskbarList3 *taskbarList;
+               volatile bool supported;
                volatile bool initialized;
        };
 }
@@ -73,13 +92,14 @@ MUtils::Taskbar7::Taskbar7(QWidget *const window)
        p(new Taskbar7_Private()),
        m_window(window)
 {
-       p->taskbarList = NULL;
-       p->initialized = false;
-
        if(!m_window)
        {
                MUTILS_THROW("Taskbar7: Window pointer must not be NULL!");
        }
+       if(!(p->supported = (OS::os_version() >= OS::Version::WINDOWS_WIN70)))
+       {
+               qWarning("Taskbar7: Taskbar progress not supported on this platform.");
+       }
 }
 
 MUtils::Taskbar7::~Taskbar7(void)
@@ -139,15 +159,15 @@ bool MUtils::Taskbar7::setOverlayIcon(const QIcon *const icon, const QString &in
        HRESULT result = HRESULT(-1);
        if(icon)
        {
-               if(const HICON hIcon = icon->pixmap(16,16).toWinHICON())
+               if(const HICON hIcon = (HICON)MUtils::Win32Utils::qicon_to_hicon(icon, 16, 16))
                {
-                       result = p->taskbarList->SetOverlayIcon(m_window->winId(), hIcon, MUTILS_WCHR(info));
+                       result = p->taskbarList->SetOverlayIcon(reinterpret_cast<HWND>(m_window->winId()), hIcon, MUTILS_WCHR(info));
                        DestroyIcon(hIcon);
                }
        }
        else
        {
-               result = p->taskbarList->SetOverlayIcon(m_window->winId(), NULL, MUTILS_WCHR(info));
+               result = p->taskbarList->SetOverlayIcon(reinterpret_cast<HWND>(m_window->winId()), NULL, MUTILS_WCHR(info));
        }
        return SUCCEEDED(result);
 }