Hello community,
here is the log from the commit of package libqt5-qtstyleplugins for
openSUSE:Factory checked in at 2017-04-29 10:54:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtstyleplugins (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtstyleplugins"
Sat Apr 29 10:54:03 2017 rev:5 rq:491866 version:5.0.0+git20170311
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtstyleplugins/libqt5-qtstyleplugins.changes
2017-01-25 23:33:06.282418919 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new/libqt5-qtstyleplugins.changes
2017-04-29 10:54:22.253052225 +0200
@@ -1,0 +2,8 @@
+Thu Apr 27 12:46:51 UTC 2017 - [email protected]
+
+- Update to version 5.0.0+git20170311 (changes since
+ 5.0.0+git20170119):
+ * Plastique, Motif/CDE: Fix QSpinBox height in layout.
+ * Fix Plastique, Cleanlooks and Motif animation timer.
+
+-------------------------------------------------------------------
Old:
----
qtstyleplugins-opensource-src-5.0.0+git20170119.tar.xz
New:
----
qtstyleplugins-opensource-src-5.0.0+git20170311.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtstyleplugins.spec ++++++
--- /var/tmp/diff_new_pack.3aHNmZ/_old 2017-04-29 10:54:22.924957306 +0200
+++ /var/tmp/diff_new_pack.3aHNmZ/_new 2017-04-29 10:54:22.928956741 +0200
@@ -21,7 +21,7 @@
%define qt_version 5.7.1
%bcond_without gtk2
Name: libqt5-qtstyleplugins
-Version: 5.0.0+git20170119
+Version: 5.0.0+git20170311
Release: 0
Summary: Qt 5 Style Plugins
License: SUSE-LGPL-2.1-with-digia-exception-1.1
++++++ qtstyleplugins-opensource-src-5.0.0+git20170119.tar.xz ->
qtstyleplugins-opensource-src-5.0.0+git20170311.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
2017-01-24 09:50:40.775718643 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
2017-04-28 16:07:43.265004501 +0200
@@ -609,7 +609,6 @@
QCleanlooksStyle::QCleanlooksStyle() :
QProxyStyle(QStyleFactory::create(QLatin1String("Windows"))), animateStep(0),
animateTimer(0)
{
setObjectName(QLatin1String("CleanLooks"));
- startTime.start();
}
/*!
@@ -3945,17 +3944,26 @@
/*!
\reimp
*/
-void QCleanlooksStyle::timerEvent(QTimerEvent *event)
+bool QCleanlooksStyle::event(QEvent *event)
{
+ switch (event->type()) {
+ case QEvent::Timer: {
#ifndef QT_NO_PROGRESSBAR
- if (event->timerId() == animateTimer) {
- Q_ASSERT(progressAnimationFps> 0);
- animateStep = startTime.elapsed() / (1000 / progressAnimationFps);
- foreach (QProgressBar *bar, animatedProgressBars)
- bar->update();
- }
+ QTimerEvent *timerEvent = reinterpret_cast<QTimerEvent *>(event);
+ if (timerEvent->timerId() == animateTimer) {
+ Q_ASSERT(progressAnimationFps > 0);
+ animateStep = startTime.elapsed() / (1000 / progressAnimationFps);
+ foreach (QProgressBar *bar, animatedProgressBars)
+ bar->update();
+ }
#endif // QT_NO_PROGRESSBAR
- event->ignore();
+ event->ignore();
+ }
+ default:
+ break;
+ }
+
+ return QProxyStyle::event(event);
}
/*!
@@ -3998,6 +4006,8 @@
animatedProgressBars << bar;
if (!animateTimer) {
Q_ASSERT(progressAnimationFps > 0);
+ animateStep = 0;
+ startTime.start();
animateTimer = o->startTimer(1000 / progressAnimationFps);
}
}
@@ -4005,10 +4015,12 @@
void QCleanlooksStyle::stopProgressAnimation(QObject *o, QProgressBar *bar)
{
- animatedProgressBars.removeAll(bar);
- if (animatedProgressBars.isEmpty() && animateTimer) {
- o->killTimer(animateTimer);
- animateTimer = 0;
+ if (!animatedProgressBars.isEmpty()) {
+ animatedProgressBars.removeOne(bar);
+ if (animatedProgressBars.isEmpty() && animateTimer) {
+ o->killTimer(animateTimer);
+ animateTimer = 0;
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
2017-01-24 09:50:40.815718379 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
2017-04-28 16:07:43.265004501 +0200
@@ -97,7 +97,7 @@
protected:
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ bool event(QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
void startProgressAnimation(QObject *o, QProgressBar *bar);
void stopProgressAnimation(QObject *o, QProgressBar *bar);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/motif/qcdestyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/motif/qcdestyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/motif/qcdestyle.cpp
2017-01-24 09:50:40.847718168 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/motif/qcdestyle.cpp
2017-04-28 16:07:43.269004470 +0200
@@ -100,6 +100,7 @@
QCDEStyle::QCDEStyle(bool useHighlightCols)
: QMotifStyle(useHighlightCols)
{
+ spinboxHCoeff = 10;
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/motif/qmotifstyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/motif/qmotifstyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/motif/qmotifstyle.cpp
2017-01-24 09:50:40.851718141 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/motif/qmotifstyle.cpp
2017-04-28 16:07:43.269004470 +0200
@@ -111,9 +111,9 @@
text color.
*/
QMotifStyle::QMotifStyle(bool useHighlightCols) : QCommonStyle(), focus(0),
- highlightCols(useHighlightCols), animationFps(25), animateTimer(0),
animateStep(0)
+ highlightCols(useHighlightCols), animationFps(25), animateTimer(0),
animateStep(0),
+ spinboxHCoeff(6)
{
- startTime.start();
}
/*!
@@ -135,26 +135,22 @@
#ifndef QT_NO_PROGRESSBAR
switch (e->type()) {
case QEvent::StyleChange:
+ case QEvent::Paint:
case QEvent::Show:
if (QProgressBar *bar = qobject_cast<QProgressBar *>(o)) {
- bars << bar;
- if (bars.size() == 1) {
- Q_ASSERT(animationFps> 0);
- animateTimer = startTimer(1000 / animationFps);
- }
+ // Animation by timer for progress bars that have their min and
+ // max values the same
+ if (bar->minimum() == bar->maximum())
+ startProgressAnimation(bar);
+ else
+ stopProgressAnimation(bar);
}
break;
case QEvent::Destroy:
case QEvent::Hide:
// reinterpret_cast because there is no type info when getting
// the destroy event. We know that it is a QProgressBar.
- if (QProgressBar *bar = reinterpret_cast<QProgressBar *>(o)) {
- bars.removeAll(bar);
- if (bars.isEmpty() && animateTimer) {
- killTimer(animateTimer);
- animateTimer = 0;
- }
- }
+ stopProgressAnimation(reinterpret_cast<QProgressBar *>(o));
default:
break;
}
@@ -162,6 +158,30 @@
return QStyle::eventFilter(o, e);
}
+void QMotifStyle::startProgressAnimation(QProgressBar *bar)
+{
+ if (!bars.contains(bar)) {
+ bars << bar;
+ if (bars.size() == 1) {
+ Q_ASSERT(animationFps > 0);
+ animateStep = 0;
+ startTime.start();
+ animateTimer = startTimer(1000 / animationFps);
+ }
+ }
+}
+
+void QMotifStyle::stopProgressAnimation(QProgressBar *bar)
+{
+ if (!bars.isEmpty()) {
+ bars.removeOne(bar);
+ if (bars.isEmpty() && animateTimer) {
+ killTimer(animateTimer);
+ animateTimer = 0;
+ }
+ }
+}
+
/*!
\reimp
*/
@@ -270,7 +290,7 @@
#ifndef QT_NO_PROGRESSBAR
if (qobject_cast<QProgressBar *>(widget)) {
widget->removeEventFilter(this);
- bars.removeAll(static_cast<QProgressBar*>(widget));
+ bars.removeOne(static_cast<QProgressBar*>(widget));
}
#endif
}
@@ -1902,6 +1922,14 @@
}
break;
+#ifndef QT_NO_SPINBOX
+ case CT_SpinBox:
+ if (const QStyleOptionSpinBox *vopt = qstyleoption_cast<const
QStyleOptionSpinBox *>(opt)) {
+ if (vopt->frame)
+ sz.rheight() += spinboxHCoeff *
proxy()->pixelMetric(PM_SpinBoxFrameWidth, vopt, widget);
+ }
+ break;
+#endif
default:
sz = QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/motif/qmotifstyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/motif/qmotifstyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/motif/qmotifstyle.h
2017-01-24 09:50:40.851718141 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/motif/qmotifstyle.h
2017-04-28 16:07:43.269004470 +0200
@@ -106,6 +106,8 @@
QPointer<QFocusFrame> focus;
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
+ void startProgressAnimation(QProgressBar *bar);
+ void stopProgressAnimation(QProgressBar *bar);
private:
bool highlightCols;
@@ -114,6 +116,9 @@
int animateTimer;
QTime startTime;
int animateStep;
+
+protected:
+ int spinboxHCoeff;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/plastique/qplastiquestyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/plastique/qplastiquestyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/plastique/qplastiquestyle.cpp
2017-01-24 09:50:40.855718115 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/plastique/qplastiquestyle.cpp
2017-04-28 16:07:43.273004438 +0200
@@ -4863,7 +4863,6 @@
#ifndef QT_NO_SPINBOX
case CT_SpinBox:
// Make sure the size is odd
- newSize.setHeight(sizeFromContents(CT_LineEdit, option, size,
widget).height());
newSize.rheight() -= ((1 - newSize.rheight()) & 1);
break;
#endif
@@ -5658,7 +5657,7 @@
#ifndef QT_NO_PROGRESSBAR
if (AnimateBusyProgressBar && qobject_cast<QProgressBar *>(widget)) {
widget->removeEventFilter(this);
- bars.removeAll(static_cast<QProgressBar*>(widget));
+ bars.removeOne(static_cast<QProgressBar*>(widget));
}
#endif
@@ -5780,25 +5779,21 @@
{
#ifndef QT_NO_PROGRESSBAR
switch (event->type()) {
+ case QEvent::StyleChange:
+ case QEvent::Paint:
case QEvent::Show:
if (QProgressBar *bar = qobject_cast<QProgressBar *>(watched)) {
- bars.append(bar);
- if (bars.size() == 1) {
- Q_ASSERT(ProgressBarFps > 0);
- timer.start();
- progressBarAnimateTimer = startTimer(1000 / ProgressBarFps);
- }
+ // Animation by timer for progress bars that have their min and
+ // max values the same
+ if (bar->minimum() == bar->maximum())
+ startProgressAnimation(bar);
+ else
+ stopProgressAnimation(bar);
}
break;
case QEvent::Destroy:
case QEvent::Hide:
- if (!bars.isEmpty()) {
- bars.removeAll(reinterpret_cast<QProgressBar*>(watched));
- if (bars.isEmpty()) {
- killTimer(progressBarAnimateTimer);
- progressBarAnimateTimer = 0;
- }
- }
+ stopProgressAnimation(reinterpret_cast<QProgressBar *>(watched));
break;
#if defined QPlastique_MaskButtons
case QEvent::Resize:
@@ -5829,19 +5824,52 @@
/*!
\reimp
*/
-void QPlastiqueStyle::timerEvent(QTimerEvent *event)
+bool QPlastiqueStyle::event(QEvent *event)
{
+ switch (event->type()) {
+ case QEvent::Timer: {
#ifndef QT_NO_PROGRESSBAR
- if (event->timerId() == progressBarAnimateTimer) {
- Q_ASSERT(ProgressBarFps > 0);
- animateStep = timer.elapsed() / (1000 / ProgressBarFps);
- foreach (QProgressBar *bar, bars) {
- if (AnimateProgressBar || (bar->minimum() == 0 && bar->maximum()
== 0))
- bar->update();
+ QTimerEvent *timerEvent = reinterpret_cast<QTimerEvent *>(event);
+ if (timerEvent->timerId() == progressBarAnimateTimer) {
+ Q_ASSERT(ProgressBarFps > 0);
+ animateStep = timer.elapsed() / (1000 / ProgressBarFps);
+ foreach (QProgressBar *bar, bars) {
+ if (AnimateProgressBar || (bar->minimum() == 0 &&
bar->maximum() == 0))
+ bar->update();
+ }
}
- }
#endif // QT_NO_PROGRESSBAR
- event->ignore();
+ event->ignore();
+ }
+ default:
+ break;
+ }
+
+ return QProxyStyle::event(event);
+}
+
+void QPlastiqueStyle::startProgressAnimation(QProgressBar *bar)
+{
+ if (!bars.contains(bar)) {
+ bars << bar;
+ if (bars.size() == 1) {
+ Q_ASSERT(ProgressBarFps > 0);
+ animateStep = 0;
+ timer.start();
+ progressBarAnimateTimer = startTimer(1000 / ProgressBarFps);
+ }
+ }
+}
+
+void QPlastiqueStyle::stopProgressAnimation(QProgressBar *bar)
+{
+ if (!bars.isEmpty()) {
+ bars.removeOne(bar);
+ if (bars.isEmpty() && progressBarAnimateTimer) {
+ killTimer(progressBarAnimateTimer);
+ progressBarAnimateTimer = 0;
+ }
+ }
}
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/plastique/qplastiquestyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/plastique/qplastiquestyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20170119/src/plugins/styles/plastique/qplastiquestyle.h
2017-01-24 09:50:40.855718115 +0100
+++
new/qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/plastique/qplastiquestyle.h
2017-04-28 16:07:43.273004438 +0200
@@ -100,7 +100,9 @@
protected:
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
- void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+ bool event(QEvent *event) Q_DECL_OVERRIDE;
+ void startProgressAnimation(QProgressBar *bar);
+ void stopProgressAnimation(QProgressBar *bar);
private:
int animateStep;
