ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Showing indexing progress in windows task bar

Browse Source 
* implemented showing indexing progress in windows taskbar button
* renamed TaskShowStatusDialog
* added "Qt5WinExtras.dll" for windows builds
This commit is contained in:
mlangkabel
2018-01-16 11:16:08 +01:00
parent 43c223368c
commit 2c52425d99
18 changed files with 177 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+10 -1
View File
@@ -349,12 +349,17 @@ else()
set(Qt5Widgets_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Widgets")
set(Qt5PrintSupport_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5PrintSupport")
set(Qt5Network_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Network")
set(Qt5WinExtras_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5WinExtras")
endif()
find_package(Qt5Widgets)
find_package(Qt5PrintSupport)
find_package(Qt5Network)
if (WIN32)
find_package(Qt5WinExtras)
endif()
if(Qt5Widgets_FOUND)
MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
# FIX: Qt was built with -reduce-relocations
@@ -371,7 +376,11 @@ add_custom_target(
add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/version.h)
target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::Widgets Qt5::Network)
if(UNIX)
target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::Widgets Qt5::Network)
else()
target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::WinExtras)
endif()
# command for versioning script
add_custom_command(
deployment/windows/wixSetup/installDir.wxs
+4
View File
@@ -48,6 +48,10 @@
<Component Id='Qt5WidgetsDll' Guid='*' Win64="$(var.Win64)">
<File Id='qt5widgetsDLL' Name='Qt5Widgets.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Widgets.dll' KeyPath='yes' />
</Component>
<Component Id='Qt5WinExtrasDll' Guid='*' Win64="$(var.Win64)">
<File Id='qt5winExtrasDLL' Name='Qt5WinExtras.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5WinExtras.dll' KeyPath='yes' />
</Component>
<Component Id='apiMsWinCoreConsole_l1_1_0Dll' Guid='*' Win64="$(var.Win64)">
<File Id='apiMsWinCoreConsole_l1_1_0' Name='api-ms-win-core-console-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-console-l1-1-0.dll' KeyPath='yes' />
deployment/windows/wixSetup/sourcetrail.wxs
+1
View File
@@ -175,6 +175,7 @@
<ComponentRef Id='Qt5GuiDll'/>
<ComponentRef Id='Qt5NetworkDll'/>
<ComponentRef Id='Qt5WidgetsDll'/>
<ComponentRef Id='Qt5WinExtrasDll'/>
<ComponentRef Id='apiMsWinCoreConsole_l1_1_0Dll'/>
<ComponentRef Id='apiMsWinCoreDatetime_l1_1_0Dll'/>
script/setup.sh
+8
View File
@@ -74,6 +74,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Guid.dll build/win32/Debug/app
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Networkd.dll build/win32/Debug/app
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgetsd.dll build/win32/Debug/app
cp -u -r ${QT_WIN32_DIR}/bin/Qt5WinExtrasd.dll build/win32/Debug/app
cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindowsd.dll build/win32/Debug/app/platforms
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgifd.dll build/win32/Debug/app/imageformats
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicnsd.dll build/win32/Debug/app/imageformats
@@ -90,6 +91,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Gui.dll build/win32/Release/app
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Network.dll build/win32/Release/app
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgets.dll build/win32/Release/app
cp -u -r ${QT_WIN32_DIR}/bin/Qt5WinExtras.dll build/win32/Release/app
cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindows.dll build/win32/Release/app/platforms
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgif.dll build/win32/Release/app/imageformats
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicns.dll build/win32/Release/app/imageformats
@@ -106,6 +108,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Guid.dll build/win64/Debug/app
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Networkd.dll build/win64/Debug/app
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgetsd.dll build/win64/Debug/app
cp -u -r ${QT_WIN64_DIR}/bin/Qt5WinExtrasd.dll build/win64/Debug/app
cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindowsd.dll build/win64/Debug/app/platforms
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgifd.dll build/win64/Debug/app/imageformats
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicnsd.dll build/win64/Debug/app/imageformats
@@ -122,6 +125,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Gui.dll build/win64/Release/app
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Network.dll build/win64/Release/app
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgets.dll build/win64/Release/app
cp -u -r ${QT_WIN64_DIR}/bin/Qt5WinExtras.dll build/win64/Release/app
cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindows.dll build/win64/Release/app/platforms
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgif.dll build/win64/Release/app/imageformats
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicns.dll build/win64/Release/app/imageformats
@@ -139,6 +143,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Guid.dll build/win32/Debug/test
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Networkd.dll build/win32/Debug/test
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgetsd.dll build/win32/Debug/test
cp -u -r ${QT_WIN32_DIR}/bin/Qt5WinExtrasd.dll build/win32/Debug/test
cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindowsd.dll build/win32/Debug/test/platforms
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgifd.dll build/win32/Debug/test/imageformats
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicnsd.dll build/win32/Debug/test/imageformats
@@ -154,6 +159,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Gui.dll build/win32/Release/test
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Network.dll build/win32/Release/test
cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgets.dll build/win32/Release/test
cp -u -r ${QT_WIN32_DIR}/bin/Qt5WinExtras.dll build/win32/Release/test
cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindows.dll build/win32/Release/test/platforms
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgif.dll build/win32/Release/test/imageformats
cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicns.dll build/win32/Release/test/imageformats
@@ -169,6 +175,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Guid.dll build/win64/Debug/test
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Networkd.dll build/win64/Debug/test
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgetsd.dll build/win64/Debug/test
cp -u -r ${QT_WIN64_DIR}/bin/Qt5WinExtrasd.dll build/win64/Debug/test
cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindowsd.dll build/win64/Debug/test/platforms
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgifd.dll build/win64/Debug/test/imageformats
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicnsd.dll build/win64/Debug/test/imageformats
@@ -184,6 +191,7 @@ if [ $PLATFORM == "Windows" ]; then
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Gui.dll build/win64/Release/test
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Network.dll build/win64/Release/test
cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgets.dll build/win64/Release/test
cp -u -r ${QT_WIN64_DIR}/bin/Qt5WinExtras.dll build/win64/Release/test
cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindows.dll build/win64/Release/test/platforms
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgif.dll build/win64/Release/test/imageformats
cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicns.dll build/win64/Release/test/imageformats
src/lib/CMakeLists.txt
+2 -2
View File
@@ -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
-36
View File
@@ -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
+38
View File
@@ -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/TaskShowStatusDialog.h → src/lib/data/TaskShowUnknownProgressDialog.h
+6 -8
View File
@@ -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
+2 -2
View File
@@ -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
+2 -1
View File
@@ -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
+3 -2
View File
@@ -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
+2
View File
@@ -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
+3 -3
View File
@@ -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
+45
View File
@@ -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
+23
View File
@@ -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
+2
View File
@@ -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
+15
View File
@@ -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
+11 -4
View File
@@ -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