From kde-commits Sun Mar 22 15:52:26 2015 From: =?utf-8?b?QXVyw6lsaWVuIEfDonRlYXU=?= Date: Sun, 22 Mar 2015 15:52:26 +0000 To: kde-commits Subject: [gwenview] lib: Fix loading animations with KPixmapSequence Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142703955814540 Git commit 5ec88f2b4c3f8f707d9eb7c576048fb8d1d46e0e by Aur=C3=A9lien G=C3= =A2teau, on behalf of David Rosca. Committed on 22/03/2015 at 15:50. Pushed by gateau into branch 'master'. Fix loading animations with KPixmapSequence KPixmapSequence(QString) takes a full path to icon REVIEW: 123086 M +2 -1 lib/documentview/loadingindicator.cpp M +1 -1 lib/thumbnailview/thumbnailview.cpp http://commits.kde.org/gwenview/5ec88f2b4c3f8f707d9eb7c576048fb8d1d46e0e diff --git a/lib/documentview/loadingindicator.cpp b/lib/documentview/loadi= ngindicator.cpp index fbc780e..8c1374d 100644 --- a/lib/documentview/loadingindicator.cpp +++ b/lib/documentview/loadingindicator.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambri= dge, MA 02110-1301, USA // Local = // KDE +#include #include = // Qt @@ -43,10 +44,10 @@ struct LoadingIndicatorPrivate = LoadingIndicatorPrivate(LoadingIndicator* qq) : q(qq) - , mSequence("process-working", 22) , mIndex(0) , mTimer(new QTimer(qq)) { + mSequence =3D KIconLoader::global()->loadPixmapSequence(QStringLit= eral("process-working"), 22); mTimer->setInterval(100); QObject::connect(mTimer, SIGNAL(timeout()), q, SLOT(showNextFrame(= ))); } diff --git a/lib/thumbnailview/thumbnailview.cpp b/lib/thumbnailview/thumbn= ailview.cpp index e05a2ce..6f63e24 100644 --- a/lib/thumbnailview/thumbnailview.cpp +++ b/lib/thumbnailview/thumbnailview.cpp @@ -189,7 +189,7 @@ struct ThumbnailViewPrivate = void setupBusyAnimation() { - mBusySequence =3D KPixmapSequence("process-working", 22); + mBusySequence =3D KIconLoader::global()->loadPixmapSequence(QStrin= gLiteral("process-working"), 22); mBusyAnimationTimeLine =3D new QTimeLine(100 * mBusySequence.frame= Count(), q); mBusyAnimationTimeLine->setCurveShape(QTimeLine::LinearCurve); mBusyAnimationTimeLine->setEndFrame(mBusySequence.frameCount() - 1= );