kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

use ifdef QT_WINEXTRAS_LIB to make sure the code is only used in windows build with qt5 version 5.2 and higher

Browse Source
This commit is contained in:
MA-DEVELOP\apeltauer
2019-05-02 10:16:32 +02:00
committed by wmayer
parent 8644b61e32
commit a26e05bd4d
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Gui/ProgressBar.cpp
View File

@@ -369,31 +369,46 @@ int ProgressBar::minimumDuration() const
void Gui::ProgressBar::reset()
{
QProgressBar::reset();
if (setupTaskBarProgress()) m_taskbarProgress->reset();
#ifdef QT_WINEXTRAS_LIB
setupTaskBarProgress();
m_taskbarProgress->reset();
#endif
}
void Gui::ProgressBar::setRange(int minimum, int maximum)
{
QProgressBar::setRange(minimum, maximum);
if (setupTaskBarProgress()) m_taskbarProgress->setRange(minimum, maximum);
#ifdef QT_WINEXTRAS_LIB
setupTaskBarProgress();
m_taskbarProgress->setRange(minimum, maximum);
#endif
}
void Gui::ProgressBar::setMinimum(int minimum)
{
QProgressBar::setMinimum(minimum);
if (setupTaskBarProgress()) m_taskbarProgress->setMinimum(minimum);
#ifdef QT_WINEXTRAS_LIB
setupTaskBarProgress();
m_taskbarProgress->setMinimum(minimum);
#endif
}
void Gui::ProgressBar::setMaximum(int maximum)
{
QProgressBar::setMaximum(maximum);
if (setupTaskBarProgress()) m_taskbarProgress->setMaximum(maximum);
#ifdef QT_WINEXTRAS_LIB
setupTaskBarProgress();
m_taskbarProgress->setMaximum(maximum);
#endif
}
void Gui::ProgressBar::setValue(int value)
{
QProgressBar::setValue(value);
if (setupTaskBarProgress()) m_taskbarProgress->setValue(value);
#ifdef QT_WINEXTRAS_LIB
setupTaskBarProgress();
m_taskbarProgress->setValue(value);
#endif
}
void ProgressBar::setMinimumDuration (int ms)
@@ -462,26 +477,20 @@ void ProgressBar::leaveControlEvents()
releaseKeyboard();
}
bool Gui::ProgressBar::setupTaskBarProgress(void)
#ifdef QT_WINEXTRAS_LIB
void ProgressBar::setupTaskBarProgress()
{
if (!m_taskbarButton || !m_taskbarProgress)
{
#ifdef QT_WINEXTRAS_LIB
m_taskbarButton = new QWinTaskbarButton(this);
m_taskbarButton->setWindow(MainWindow::getInstance()->windowHandle());
//m_myButton->setOverlayIcon(QIcon(""));
m_taskbarProgress = m_taskbarButton->progress();
m_taskbarProgress->setVisible(true);
return true;
#endif
#ifndef QT_WINEXTRAS_LIB
return false;
#endif
}
else if (m_taskbarButton && m_taskbarProgress) return true;
return false;
}
#endif
bool ProgressBar::eventFilter(QObject* o, QEvent* e)
{

4
src/Gui/ProgressBar.h
View File

@@ -190,14 +190,14 @@ private:
/** Loses the control over incoming events*/
void leaveControlEvents();
/* Set up the task abr progress in windows */
bool setupTaskBarProgress(void);
//@}
ProgressBarPrivate* d;
Sequencer* sequencer;
#ifdef QT_WINEXTRAS_LIB
/* Set up the taskbar progress in windows */
void setupTaskBarProgress(void);
QWinTaskbarProgress* m_taskbarProgress;
QWinTaskbarButton* m_taskbarButton;
#endif