From 103924eff0b234e5437e8842a27eba42a47fde64 Mon Sep 17 00:00:00 2001
From: Tom Dewey <tom.dewey@raspberrypi.com>
Date: Wed, 31 Jul 2024 13:56:29 +0100
Subject: [PATCH] imagewriter: Windows: Remove taskbar progress indicator

This is no longer supported in Qt6, with no replacement available.
---
 src/imagewriter.cpp | 41 -----------------------------------------
 src/imagewriter.h   |  4 ----
 2 files changed, 45 deletions(-)

diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp
index 063ba7b..c538b09 100644
--- a/src/imagewriter.cpp
+++ b/src/imagewriter.cpp
@@ -46,8 +46,6 @@
 
 #ifdef Q_OS_WIN
 #include <windows.h>
-#include <QWinTaskbarButton>
-#include <QWinTaskbarProgress>
 #include <QProcessEnvironment>
 #endif
 
@@ -108,10 +106,6 @@ ImageWriter::ImageWriter(QObject *parent)
     }
 #endif
 
-#ifdef Q_OS_WIN
-    _taskbarButton = nullptr;
-#endif
-
     if (!_settings.isWritable() && !_settings.fileName().isEmpty())
     {
         /* Settings file is not writable, probably run by root previously */
@@ -667,19 +661,6 @@ DriveListModel *ImageWriter::getDriveList()
 void ImageWriter::startProgressPolling()
 {
     _powersave.applyBlock(tr("Downloading and writing image"));
-#ifdef Q_OS_WIN
-    if (!_taskbarButton && _engine)
-    {
-        QWindow* window = qobject_cast<QWindow*>( _engine->rootObjects().at(0) );
-        if (window)
-        {
-            _taskbarButton = new QWinTaskbarButton(this);
-            _taskbarButton->setWindow(window);
-            _taskbarButton->progress()->setMaximum(0);
-            _taskbarButton->progress()->setVisible(true);
-        }
-    }
-#endif
     _dlnow = 0; _verifynow = 0;
     _polltimer.start(PROGRESS_UPDATE_INTERVAL);
 }
@@ -688,14 +669,6 @@ void ImageWriter::stopProgressPolling()
 {
     _polltimer.stop();
     pollProgress();
-#ifdef Q_OS_WIN
-    if (_taskbarButton)
-    {
-        _taskbarButton->progress()->setVisible(false);
-        _taskbarButton->deleteLater();
-        _taskbarButton = nullptr;
-    }
-#endif
     _powersave.removeBlock();
 }
 
@@ -719,13 +692,6 @@ void ImageWriter::pollProgress()
     if (newDlNow != _dlnow)
     {
         _dlnow = newDlNow;
-#ifdef Q_OS_WIN
-        if (_taskbarButton)
-        {
-            _taskbarButton->progress()->setMaximum(dlTotal/1048576);
-            _taskbarButton->progress()->setValue(newDlNow/1048576);
-        }
-#endif
         emit downloadProgress(newDlNow, dlTotal);
     }
 
@@ -735,13 +701,6 @@ void ImageWriter::pollProgress()
     {
         _verifynow = newVerifyNow;
         quint64 verifyTotal = _thread->verifyTotal();
-#ifdef Q_OS_WIN
-        if (_taskbarButton)
-        {
-            _taskbarButton->progress()->setMaximum(verifyTotal/1048576);
-            _taskbarButton->progress()->setValue(newVerifyNow/1048576);
-        }
-#endif
         emit verifyProgress(newVerifyNow, verifyTotal);
     }
 }
diff --git a/src/imagewriter.h b/src/imagewriter.h
index 2676c03..843ed53 100644
--- a/src/imagewriter.h
+++ b/src/imagewriter.h
@@ -23,7 +23,6 @@
 class QQmlApplicationEngine;
 class DownloadThread;
 class QNetworkReply;
-class QWinTaskbarButton;
 class QTranslator;
 
 class ImageWriter : public QObject
@@ -203,9 +202,6 @@ protected:
     QMap<QString,QString> _translations;
     bool _customCacheFile;
     QTranslator *_trans;
-#ifdef Q_OS_WIN
-    QWinTaskbarButton *_taskbarButton;
-#endif
 
     void _parseCompressedFile();
     void _parseXZFile();