use QTaskbarControl for progress bars

Author: Skycoder42

README.md

@@ -51,10 +51,11 @@ There are multiple ways to install the Qt module, sorted by preference:
 	3. You can install either all of my modules, or select the one you need: `Qt Auto Updater`
 	4. Continue the setup and thats it! you can now use the module for all of your installed Kits for that Qt
 2. Download the compiled modules from the release page. **Note:** You will have to add the correct ones yourself and may need to adjust some paths to fit your installation!
-3. Build it yourself! **Note:** This requires perl, [qpmx](https://github.com/Skycoder42/qpmx) and [qpm](https://github.com/Cutehacks/qpm) to be installed. If you don't have/need cmake, you can ignore the related warnings. To automatically build and install to your Qt installation, run:
+3. Build it yourself! **Note:** This requires perl to be installed. If you don't have/need cmake, you can ignore the related warnings. To automatically build and install to your Qt installation, run:
+	- Install and prepare [qdep](https://github.com/Skycoder42/qdep#installation)
 	- `qmake`
-	- `make qmake_all`
-	- `make`
+	- `make` (If you want the tests/examples/etc. run `make all`)
+	- Optional step: `make doxygen` to generate the documentation
 	- `make install`
 
 ## Usage

src/autoupdatercore/updater_p.h

@@ -15,6 +15,7 @@ namespace QtAutoUpdater
 
 class Q_AUTOUPDATERCORE_EXPORT UpdaterPrivate : public QObject
 {
+	Q_DISABLE_COPY(UpdaterPrivate)
 public:
 	class Q_AUTOUPDATERCORE_EXPORT NoUpdatesXmlException : public QExceptionBase {
 	public:

src/autoupdatergui/autoupdatergui.pro

@@ -61,7 +61,9 @@ win32 {
 	QMAKE_TARGET_BUNDLE_PREFIX = "de.skycoder42."
 }
 
-QDEP_DEPENDS += Skycoder42/DialogMaster@1.4.0
+QDEP_DEPENDS += \
+	Skycoder42/DialogMaster@1.4.0 \
+	Skycoder42/QTaskbarControl@1.2.1
 QDEP_LINK_DEPENDS += ../autoupdatercore
 
 !load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")

src/autoupdatergui/progressdialog.cpp

@@ -3,34 +3,23 @@
 
 #include <QtGui/QCloseEvent>
 #include <dialogmaster.h>
-#ifdef Q_OS_WIN
-#include <QtWinExtras/QWinTaskbarProgress>
-#endif
 
 using namespace QtAutoUpdater;
 
 ProgressDialog::ProgressDialog(QWidget *parent) :
-	QDialog(parent),
-	ui(new Ui::ProgressDialog)
-#ifdef Q_OS_WIN
-	,tButton(new QWinTaskbarButton(this))
-#endif
+	QDialog{parent},
+	ui{new Ui::ProgressDialog},
+	taskbar{new QTaskbarControl{this}}
 {
 	ui->setupUi(this);
 	DialogMaster::masterDialog(this, true, Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint);
-#ifdef Q_OS_WIN
-	if(parent)
-		setupTaskbar(parent);
-#endif
-}
 
-ProgressDialog::~ProgressDialog()
-{
-#ifdef Q_OS_WIN
-	tButton->progress()->hide();
-#endif
+	taskbar->setProgress(-1.0);
+	taskbar->setProgressVisible(true);
 }
 
+ProgressDialog::~ProgressDialog() = default;
+
 void ProgressDialog::setCanceled()
 {
 	ui->label->setText(tr("Canceling update check…"));
@@ -39,29 +28,25 @@ void ProgressDialog::setCanceled()
 
 void ProgressDialog::hide(QMessageBox::Icon hideType)
 {
-#ifdef Q_OS_WIN
-	if(tButton->window()) {
-		QWinTaskbarProgress *progress = tButton->progress();
-		progress->setRange(0, 1);
-		progress->setValue(1);
-		switch (hideType) {
-		case QMessageBox::Information:
-			progress->resume();
-			break;
-		case QMessageBox::Warning:
-			progress->pause();
-			break;
-		case QMessageBox::Critical:
-			progress->stop();
-			break;
-		default:
-			progress->hide();
-			break;
-		}
+	taskbar->setProgress(1.0);
+	switch (hideType) {
+	case QMessageBox::Information:
+		taskbar->setAttribute(QTaskbarControl::WindowsProgressState, QTaskbarControl::Running);
+		taskbar->setProgressVisible(true);
+		break;
+	case QMessageBox::Warning:
+		taskbar->setAttribute(QTaskbarControl::WindowsProgressState, QTaskbarControl::Paused);
+		taskbar->setProgressVisible(true);
+		break;
+	case QMessageBox::Critical:
+		taskbar->setAttribute(QTaskbarControl::WindowsProgressState, QTaskbarControl::Stopped);
+		taskbar->setProgressVisible(true);
+		break;
+	default:
+		taskbar->setProgressVisible(false);
+		break;
 	}
-#else
-	Q_UNUSED(hideType)
-#endif
+
 	QDialog::hide();
 }
 
@@ -74,22 +59,3 @@ void ProgressDialog::closeEvent(QCloseEvent *event)
 	}
 }
 
-#ifdef Q_OS_WIN
-void ProgressDialog::showEvent(QShowEvent *event)
-{
-	event->accept();
-	setupTaskbar(this);
-}
-
-void ProgressDialog::setupTaskbar(QWidget *window)
-{
-	if(!tButton->window()) {
-		tButton->setWindow(window->windowHandle());
-		QWinTaskbarProgress *progress = tButton->progress();
-		progress->setRange(0, 0);
-		progress->resume();
-		progress->show();
-	}
-}
-#endif
-

src/autoupdatergui/progressdialog_p.h

@@ -8,12 +8,10 @@
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QMessageBox>
 
-#ifdef Q_OS_WIN
-#include <QtWinExtras/QWinTaskbarButton>
-#endif
-
 #include <functional>
 
+#include <qtaskbarcontrol.h>
+
 namespace Ui {
 class ProgressDialog;
 }
@@ -49,18 +47,11 @@ public Q_SLOTS:
 	void canceled();
 
 protected:
-#ifdef Q_OS_WIN
-	void showEvent(QShowEvent *event) override;
-#endif
 	void closeEvent(QCloseEvent *event) override;
 
 private:
 	QScopedPointer<Ui::ProgressDialog> ui;
-#ifdef Q_OS_WIN
-	QWinTaskbarButton *tButton;
-
-	void setupTaskbar(QWidget *window);
-#endif
+	QTaskbarControl *taskbar;
 };
 
 }

src/autoupdatergui/updatebutton_p.h

@@ -18,6 +18,7 @@ namespace QtAutoUpdater
 
 class Q_AUTOUPDATERGUI_EXPORT UpdateButtonPrivate
 {
+	Q_DISABLE_COPY(UpdateButtonPrivate)
 public:
 	UpdateButton *q;
 

src/autoupdatergui/updatecontroller_p.h

@@ -16,6 +16,7 @@ namespace QtAutoUpdater
 
 class Q_AUTOUPDATERGUI_EXPORT UpdateControllerPrivate
 {
+	Q_DISABLE_COPY(UpdateControllerPrivate)
 public:
 	using UpdateTask = QPair<UpdateController::DisplayLevel, bool>;