ui: Showing indexing progress in windows task bar

* implemented showing indexing progress in windows taskbar button
* renamed TaskShowStatusDialog
* added "Qt5WinExtras.dll" for windows builds

src/lib/CMakeLists.txt

@@ -279,8 +279,8 @@ add_files(
 	data/TaskInjectStorage.h
 	data/TaskMergeStorages.cpp
 	data/TaskMergeStorages.h
-	data/TaskShowStatusDialog.cpp
-	data/TaskShowStatusDialog.h
+	data/TaskShowUnknownProgressDialog.cpp
+	data/TaskShowUnknownProgressDialog.h
 
 	project/Project.cpp
 	project/Project.h

src/lib/data/TaskShowStatusDialog.cpp

@@ -1,36 +0,0 @@
-#include "data/TaskShowStatusDialog.h"
-
-#include "component/view/DialogView.h"
-#include "Application.h"
-
-TaskShowStatusDialog::TaskShowStatusDialog(
-	const std::string& title,
-	const std::string& message
-)
-	: m_title(title)
-	, m_message(message)
-{
-}
-
-TaskShowStatusDialog::~TaskShowStatusDialog()
-{
-}
-
-void TaskShowStatusDialog::doEnter(std::shared_ptr<Blackboard> blackboard)
-{
-}
-
-Task::TaskState TaskShowStatusDialog::doUpdate(std::shared_ptr<Blackboard> blackboard)
-{
-	Application::getInstance()->getDialogView()->showUnknownProgressDialog(m_title, m_message);
-
-	return STATE_SUCCESS;
-}
-
-void TaskShowStatusDialog::doExit(std::shared_ptr<Blackboard> blackboard)
-{
-}
-
-void TaskShowStatusDialog::doReset(std::shared_ptr<Blackboard> blackboard)
-{
-}

src/lib/data/TaskShowUnknownProgressDialog.cpp

@@ -0,0 +1,38 @@
+#include "data/TaskShowUnknownProgressDialog.h"
+
+#include "component/view/DialogView.h"
+#include "Application.h"
+
+TaskShowUnknownProgressDialog::TaskShowUnknownProgressDialog(
+	const std::string& title,
+	const std::string& message
+)
+	: m_title(title)
+	, m_message(message)
+{
+}
+
+TaskShowUnknownProgressDialog::~TaskShowUnknownProgressDialog()
+{
+}
+
+void TaskShowUnknownProgressDialog::doEnter(std::shared_ptr<Blackboard> blackboard)
+{
+}
+
+Task::TaskState TaskShowUnknownProgressDialog::doUpdate(std::shared_ptr<Blackboard> blackboard)
+{
+	if (std::shared_ptr<DialogView> dialogView = Application::getInstance()->getDialogView())
+	{
+		dialogView->showUnknownProgressDialog(m_title, m_message);
+	}
+	return STATE_SUCCESS;
+}
+
+void TaskShowUnknownProgressDialog::doExit(std::shared_ptr<Blackboard> blackboard)
+{
+}
+
+void TaskShowUnknownProgressDialog::doReset(std::shared_ptr<Blackboard> blackboard)
+{
+}

src/lib/data/TaskShowUnknownProgressDialog.h

@@ -1,22 +1,20 @@
-#ifndef TASK_SHOW_STATUS_DIALOG_H
-#define TASK_SHOW_STATUS_DIALOG_H
+#ifndef TASK_SHOW_UNKNOWN_PROGRESS_DIALOG_H
+#define TASK_SHOW_UNKNOWN_PROGRESS_DIALOG_H
 
 #include <string>
 
 #include "utility/scheduling/Task.h"
 
-class DialogView;
-
-class TaskShowStatusDialog
+class TaskShowUnknownProgressDialog
 	: public Task
 {
 public:
-	TaskShowStatusDialog(
+	TaskShowUnknownProgressDialog(
 		const std::string& title,
 		const std::string& message
 	);
 
-	virtual ~TaskShowStatusDialog();
+	virtual ~TaskShowUnknownProgressDialog();
 
 private:
 	virtual void doEnter(std::shared_ptr<Blackboard> blackboard);
@@ -28,4 +26,4 @@ private:
 	const std::string m_message;
 };
 
-#endif // TASK_SHOW_STATUS_DIALOG_H
+#endif // TASK_SHOW_UNKNOWN_PROGRESS_DIALOG_H

src/lib/project/Project.cpp

@@ -12,7 +12,7 @@
 #include "data/TaskFinishParsing.h"
 #include "data/TaskInjectStorage.h"
 #include "data/TaskMergeStorages.h"
-#include "data/TaskShowStatusDialog.h"
+#include "data/TaskShowUnknownProgressDialog.h"
 #include "project/SourceGroup.h"
 #include "project/SourceGroupFactory.h"
 #include "settings/ApplicationSettings.h"
@@ -440,7 +440,7 @@ void Project::buildIndex(const RefreshInfo& info, DialogView* dialogView)
 		);
 		// add task that notifies the user of what's going on
 		taskSequential->addTask( // we don't need to hide this dialog again, because it's overridden by other dialogs later on.
-			std::make_shared<TaskShowStatusDialog>("Finish Indexing", "Saving\nRemaining Data")
+			std::make_shared<TaskShowUnknownProgressDialog>("Finish Indexing", "Saving\nRemaining Data")
 		);
 
 		// add task that injects the remaining intermediate storages into the persistent storage

src/lib_cxx/project/SourceGroupCxx.h

@@ -7,7 +7,8 @@
 #include "project/SourceGroup.h"
 #include "settings/SourceGroupSettingsCxx.h"
 
-class SourceGroupCxx: public SourceGroup
+class SourceGroupCxx
+	: public SourceGroup
 {
 public:
 	SourceGroupCxx();

src/lib_cxx/project/SourceGroupCxxCdb.h

@@ -7,7 +7,8 @@
 #include "project/SourceGroupCxx.h"
 #include "settings/SourceGroupSettingsCxxCdb.h"
 
-class SourceGroupCxxCdb: public SourceGroupCxx
+class SourceGroupCxxCdb
+	: public SourceGroupCxx
 {
 public:
 	SourceGroupCxxCdb(std::shared_ptr<SourceGroupSettingsCxxCdb> settings);
@@ -22,7 +23,7 @@ public:
 private:
 	virtual std::shared_ptr<SourceGroupSettingsCxx> getSourceGroupSettingsCxx() override;
 	virtual std::shared_ptr<const SourceGroupSettingsCxx> getSourceGroupSettingsCxx() const override;
-	virtual std::vector<FilePath> getAllSourcePaths() const;
+	virtual std::vector<FilePath> getAllSourcePaths() const override;
 
 	std::shared_ptr<SourceGroupSettingsCxxCdb> m_settings;
 };

src/lib_gui/CMakeLists.txt

@@ -104,6 +104,8 @@ add_files(
 	qt/utility/QtScrollSpeedChangeListener.cpp
 	qt/utility/QtScrollSpeedChangeListener.h
 	qt/utility/QtThreadedFunctor.h
+	qt/utility/QtWindowsTaskbarButton.cpp
+	qt/utility/QtWindowsTaskbarButton.h
 	qt/utility/utilityQt.cpp
 	qt/utility/utilityQt.h
 

src/lib_gui/qt/utility/QtFileDialog.h

@@ -1,5 +1,5 @@
-#ifndef QT_FILE_DIALOG
-#define QT_FILE_DIALOG
+#ifndef QT_FILE_DIALOG_H
+#define QT_FILE_DIALOG_H
 
 class QString;
 class QStringList;
@@ -20,4 +20,4 @@ private:
 	static QString getDir(QString dir);
 };
 
-#endif // QT_FILE_DIALOG
+#endif // QT_FILE_DIALOG_H

src/lib_gui/qt/utility/QtWindowsTaskbarButton.cpp

@@ -0,0 +1,45 @@
+#include "qt/utility/QtWindowsTaskbarButton.h"
+
+#ifdef _WIN32
+#include <QWinTaskbarButton>
+#include <QWinTaskbarProgress>
+#endif
+
+#include "qt/window/QtMainWindow.h"
+
+QtWindowsTaskbarButton::QtWindowsTaskbarButton()
+#ifdef _WIN32
+	: m_taskbarProgress(nullptr)
+#endif
+{
+}
+
+void QtWindowsTaskbarButton::setWindow(QtMainWindow* mainWindow)
+{
+#ifdef _WIN32
+	QWinTaskbarButton* taskbarButton = new QWinTaskbarButton(mainWindow);
+	taskbarButton->setWindow(mainWindow->windowHandle());
+	m_taskbarProgress = taskbarButton->progress();
+#endif
+}
+
+void QtWindowsTaskbarButton::setProgress(float progress)
+{
+#ifdef _WIN32
+	if (m_taskbarProgress != nullptr)
+	{
+		m_taskbarProgress->show();
+		m_taskbarProgress->setValue(std::max(0, std::min<int>(100, 100 * progress)));
+	}
+#endif
+}
+
+void QtWindowsTaskbarButton::hideProgress()
+{
+#ifdef _WIN32
+	if (m_taskbarProgress != nullptr)
+	{
+		m_taskbarProgress->hide();
+	}
+#endif
+}

src/lib_gui/qt/utility/QtWindowsTaskbarButton.h

@@ -0,0 +1,23 @@
+#ifndef QT_WINDOWS_TASKBAR_BUTTON_H
+#define QT_WINDOWS_TASKBAR_BUTTON_H
+
+class QWinTaskbarProgress;
+class QtMainWindow;
+
+class QtWindowsTaskbarButton
+{
+public:
+	QtWindowsTaskbarButton();
+	void setWindow(QtMainWindow* mainWindow);
+
+	void setProgress(float progress);
+	void hideProgress();
+
+private:
+
+#ifdef _WIN32
+	QWinTaskbarProgress* m_taskbarProgress;
+#endif
+};
+
+#endif // QT_WINDOWS_TASKBAR_BUTTON_H

src/lib_gui/qt/view/QtDialogView.cpp

@@ -217,6 +217,7 @@ void QtDialogView::updateIndexingDialog(
 				window->updateIndexingProgress(finishedFileCount, totalFileCount, sourcePath);
 				setUIBlocked(true);
 			}
+			m_mainWindow->setWindowsTaskbarProgress(float(finishedFileCount) / totalFileCount);
 		}
 	);
 }
@@ -236,6 +237,7 @@ void QtDialogView::finishedIndexingDialog(
 			window->updateErrorCount(errorInfo.total, errorInfo.fatal);
 
 			setUIBlocked(false);
+			m_mainWindow->hideWindowsTaskbarProgress();
 		}
 	);
 }

src/lib_gui/qt/window/QtMainWindow.cpp

@@ -374,6 +374,21 @@ void QtMainWindow::refreshStyle()
 	setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath().concatenate(FilePath("main/main.css"))).c_str());
 }
 
+void QtMainWindow::setWindowsTaskbarProgress(float progress)
+{
+	m_windowsTaskbarButton.setProgress(progress);
+}
+
+void QtMainWindow::hideWindowsTaskbarProgress()
+{
+	m_windowsTaskbarButton.hideProgress();
+}
+
+void QtMainWindow::showEvent(QShowEvent* e)
+{
+	m_windowsTaskbarButton.setWindow(this);
+}
+
 void QtMainWindow::keyPressEvent(QKeyEvent* event)
 {
 	switch (event->key())

src/lib_gui/qt/window/QtMainWindow.h

@@ -9,6 +9,7 @@
 
 #include "data/search/SearchMatch.h"
 #include "LicenseChecker.h"
+#include "qt/utility/QtWindowsTaskbarButton.h"
 #include "qt/window/QtWindowStack.h"
 
 class Bookmark;
@@ -80,15 +81,19 @@ public:
 	void setContentEnabled(bool enabled);
 	void refreshStyle();
 
+	void setWindowsTaskbarProgress(float progress);
+	void hideWindowsTaskbarProgress();
+
 signals:
 	void showScreenSearch();
 	void hideScreenSearch();
 
 protected:
-	void keyPressEvent(QKeyEvent* event);
-	void contextMenuEvent(QContextMenuEvent* event);
-	void closeEvent(QCloseEvent* event);
-    void resizeEvent(QResizeEvent* event);
+	virtual void showEvent(QShowEvent* event) override;
+	virtual void keyPressEvent(QKeyEvent* event) override;
+	virtual void contextMenuEvent(QContextMenuEvent* event) override;
+	virtual void closeEvent(QCloseEvent* event) override;
+	virtual void resizeEvent(QResizeEvent* event) override;
 
 public slots:
 	void about();
@@ -189,6 +194,8 @@ private:
 	bool m_showDockWidgetTitleBars;
 
 	QtWindowStack m_windowStack;
+
+	QtWindowsTaskbarButton m_windowsTaskbarButton;
 };
 
 #endif // QT_MAIN_WINDOW_H