Hello community, here is the log from the commit of package ktux for openSUSE:Factory checked in at 2015-10-03 20:25:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktux (Old) and /work/SRC/openSUSE:Factory/.ktux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktux" Changes: -------- --- /work/SRC/openSUSE:Factory/ktux/ktux.changes 2015-07-14 17:38:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktux.new/ktux.changes 2015-10-03 20:25:08.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Sep 13 19:34:22 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + +------------------------------------------------------------------- +Wed Aug 19 19:44:09 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php + +------------------------------------------------------------------- +Fri Aug 7 07:02:09 UTC 2015 - [email protected] + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + + +------------------------------------------------------------------- Old: ---- ktux-15.04.3.tar.xz New: ---- ktux-15.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktux.spec ++++++ --- /var/tmp/diff_new_pack.iQBtyx/_old 2015-10-03 20:25:08.000000000 +0200 +++ /var/tmp/diff_new_pack.iQBtyx/_new 2015-10-03 20:25:08.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL-2.0+ Group: Amusements/Toys/Screensavers Url: http://www.kde.org -Version: 15.04.3 +Version: 15.08.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ktux-15.04.3.tar.xz -> ktux-15.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/CMakeLists.txt new/ktux-15.08.1/src/CMakeLists.txt --- old/ktux-15.04.3/src/CMakeLists.txt 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/CMakeLists.txt 2015-06-14 06:30:44.000000000 +0200 @@ -6,7 +6,7 @@ ) kde4_add_executable( ktux ${ktux_SRCS} ) -target_link_libraries( ktux ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY} ) +target_link_libraries( ktux ${KDE4_KDEUI_LIBS} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY} ) install( TARGETS ktux ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES ktux.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/ktux.desktop new/ktux-15.08.1/src/ktux.desktop --- old/ktux-15.04.3/src/ktux.desktop 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/ktux.desktop 2015-06-14 06:30:44.000000000 +0200 @@ -2,6 +2,7 @@ Name=KTux Name[af]=Ktux Name[ar]=KTux +Name[ast]=KTux Name[be]=KTux Name[bg]=KTux Name[bn]=কে-টাক্স diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/sprite.cpp new/ktux-15.08.1/src/sprite.cpp --- old/ktux-15.04.3/src/sprite.cpp 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/sprite.cpp 2015-06-14 06:30:44.000000000 +0200 @@ -19,31 +19,31 @@ #include "spritepm.h" #include "spritemisc.h" -#include <stdlib.h> -#include <time.h> +#include <cstdlib> +#include <ctime> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QSlider> -#include <QtGui/QPixmap> -#include <QtCore/QTimerEvent> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFrame> -#include <QtGui/QHBoxLayout> +#include <QDebug> +#include <QFrame> +#include <QHBoxLayout> +#include <QLabel> +#include <QLayout> +#include <QPixmap> +#include <QPointer> +#include <QSlider> +#include <QTimerEvent> +#include <QVBoxLayout> -#include <kconfiggroup.h> +#include <KConfigGroup> #include <KPushButton> #include <KMessageBox> -#include <kstandarddirs.h> -#include <klocale.h> -#include <kdebug.h> +#include <KStandardDirs> +#include <KLocale> #include <KStandardGuiItem> -#include <kguiitem.h> -#include <krandom.h> +#include <KGuiItem> +#include <KRandom> #include <KDialogButtonBox> -#include <kaboutapplicationdialog.h> -#include <kcomponentdata.h> -#include <QPointer> +#include <KAboutApplicationDialog> +#include <KComponentData> @@ -215,7 +215,7 @@ { mTimer.stop(); delete mView; - delete mCanvas; + delete mScene; } @@ -247,9 +247,9 @@ mTimerIds.resize(list.count()); for (int i = 0; i < list.count(); i++) { - kDebug() << "Group: " << list.at(i); + qDebug() << "Group: " << list.at(i); KConfigGroup grp = pConfig->group(list.at(i)); - SpriteGroup *obj = new SpriteGroup(mCanvas, grp); + SpriteGroup *obj = new SpriteGroup(mScene, grp); mTimerIds[i] = startTimer(obj->refreshTime()); mGroups.append(obj); } @@ -259,11 +259,11 @@ void KSpriteSaver::initialise() { - mCanvas = new Q3Canvas(); + mScene = new QGraphicsScene(); QPixmap pm( KStandardDirs::locate("sprite", QLatin1String( "bg.png" )) ); - mCanvas->setBackgroundPixmap( pm ); - mCanvas->resize( width(), height() ); - mView = new Q3CanvasView(mCanvas); + mScene->setBackgroundBrush(QBrush(pm)); + mScene->setSceneRect( 0, 0, width(), height() ); + mView = new QGraphicsView(mScene); QPalette palette; palette.setColor(mView->viewport()->backgroundRole(), Qt::black); @@ -271,8 +271,6 @@ mView->resize( size()); mView->setFrameStyle( QFrame::NoFrame ); - mView->setVScrollBarMode( Q3ScrollView::AlwaysOff ); - mView->setHScrollBarMode( Q3ScrollView::AlwaysOff ); embed( mView ); mView->show(); SpriteRange::setFieldSize(mView->size()); @@ -290,7 +288,7 @@ grp->next(); } - mCanvas->advance(); + mScene->advance(); } @@ -312,7 +310,7 @@ void KSpriteSaver::resizeEvent(QResizeEvent *event) { Q_UNUSED( event ); - mCanvas->resize( width(), height() ); + mScene->setSceneRect( 0, 0, width(), height() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/sprite.h new/ktux-15.08.1/src/sprite.h --- old/ktux-15.04.3/src/sprite.h 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/sprite.h 2015-06-14 06:30:44.000000000 +0200 @@ -23,7 +23,8 @@ #include <QTimerEvent> #include <QVector> -#include <Qt3Support/Q3Canvas> +#include <QGraphicsScene> +#include <QGraphicsView> #include <kscreensaver.h> #include <KDialog> @@ -55,8 +56,8 @@ void resizeEvent(QResizeEvent *event); protected: - Q3Canvas *mCanvas; - Q3CanvasView *mView; + QGraphicsScene *mScene; + QGraphicsView *mView; QTimer mTimer; int mSpeed; QList<SpriteGroup*> mGroups; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/spriteanim.cpp new/ktux-15.08.1/src/spriteanim.cpp --- old/ktux-15.04.3/src/spriteanim.cpp 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/spriteanim.cpp 2015-06-14 06:30:44.000000000 +0200 @@ -19,18 +19,39 @@ #include "spritemisc.h" #include "spritepm.h" -#include <kdebug.h> -#include <kconfiggroup.h> +#include <QDebug> +#include <QPainter> +#include <KConfigGroup> -SpriteObject::SpriteObject(SpritePixmapSequence *seq, Q3Canvas *c) - : Q3CanvasSprite( seq, c ), + +SpriteObject::SpriteObject(SpritePixmapSequence *seq, QGraphicsScene *scene) + : QGraphicsItem(0), mCycle( 0 ), mLifeSpan( -1 ), - mSeq( seq ) + mSeq( seq ), + currentFrame( 0 ) { + for (int i = 0; i < mSeq->pixmaps().size(); ++i) { + QPixmap *pixmap; + pixmap = mSeq->pixmaps().at(i); + Frame frame; + frame.pixmap = pixmap; + frame.shape = QPainterPath(); + frame.boundingRect = pixmap->rect(); + frames << frame; + } + + scene->addItem(this); } +void SpriteObject::setFrame(int frame) +{ + if (!frames.isEmpty()) { + prepareGeometryChange(); + currentFrame = frame % frames.size(); + } +} void SpriteObject::age() { @@ -38,6 +59,7 @@ mLifeSpan--; } mCycle++; + moveBy(vx, vy); if( mCycle > mSeq->delay( frame() ) ) { setFrame((frame()+1)%frameCount()); @@ -65,22 +87,21 @@ } -SpriteObject *SpriteDef::create( Q3Canvas *c ) +SpriteObject *SpriteDef::create( QGraphicsScene *scene ) { SpriteObject *sprite = 0; if( mSeq ) { int startX = mStartX.random(); int startY = mStartY.random(); - sprite = new SpriteObject( mSeq, c ); + sprite = new SpriteObject( mSeq, scene ); sprite->setVelocity( mDirX.random(), mDirY.random() ); if( mDirX.min() != 0 || mDirX.max() != 0 || mDirY.min() != 0 || mDirY.max() != 0 ) { - sprite->setAnimated( true ); } - sprite->move( startX, startY ); + sprite->setPos( startX, startY ); sprite->setBounds( startX-1, startY-1, mEndX.random()+1, mEndY.random()+1 ); sprite->setLifeSpan( mLifeSpan ); - sprite->setZ( mZ ); + sprite->setZValue( mZ ); sprite->show(); } @@ -101,28 +122,30 @@ QString animation = config.readEntry( "Animation", "" ); KConfigBase *grp = config.config(); mSeq = SpriteSequenceManager::manager()->load( *grp, animation ); - kDebug() << "Set Z = " << mZ; + qDebug() << "Set Z = " << mZ; } -SpriteGroup::SpriteGroup(Q3Canvas *c, KConfigGroup &config) - : mCanvas( c ) +SpriteGroup::SpriteGroup(QGraphicsScene *scene, KConfigGroup &config) + : mScene( scene ) { - mAvailable.setAutoDelete( true ); - mActive.setAutoDelete( true ); read( config ); } void SpriteGroup::next() { - Q3PtrListIterator<SpriteObject> it(mActive); + QList<SpriteObject*>::iterator it; - for(; it.current(); ++it) { - SpriteObject *sprite = it.current(); + for(it = mActive.begin(); it != mActive.end(); ++it) { + SpriteObject *sprite = *it; if( sprite->outOfBounds() || sprite->dead() ) { - mActive.removeRef( sprite ); + int i = mActive.indexOf(sprite); + if (i != -1) + { + delete mActive.takeAt(i); + } } else { // sprite->forward(1); @@ -135,7 +158,7 @@ void SpriteGroup::refresh() { if( ((int) mActive.count()) < mCount ) { - SpriteObject *sprite = mAvailable.first()->create( mCanvas ); + SpriteObject *sprite = mAvailable.first()->create( mScene ); mActive.append( sprite ); } } @@ -161,6 +184,16 @@ } } +QRectF SpriteObject::boundingRect() const +{ + return frames.at(currentFrame).boundingRect; +} + +void SpriteObject::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) +{ + painter->drawPixmap(0, 0, *frames.at(currentFrame).pixmap); +} + // kate: word-wrap off; encoding utf-8; indent-width 4; tab-width 4; line-numbers on; mixed-indent off; remove-trailing-space-save on; replace-tabs-save on; replace-tabs on; space-indent on; // vim:set spell et sw=4 ts=4 nowrap cino=l1,cs,U1: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/spriteanim.h new/ktux-15.08.1/src/spriteanim.h --- old/ktux-15.04.3/src/spriteanim.h 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/spriteanim.h 2015-06-14 06:30:44.000000000 +0200 @@ -21,22 +21,21 @@ #include "spritemisc.h" #include "spritepm.h" +#include <QList> #include <QPixmap> -#include <Qt3Support/Q3Dict> -#include <Qt3Support/Q3PtrList> -#include <Qt3Support/Q3StrList> -#include <Qt3Support/Q3Canvas> +#include <QGraphicsItem> +#include <QGraphicsScene> #include <kconfigbase.h> #include <kconfig.h> -class SpriteObject : public Q3CanvasSprite +class SpriteObject : public QGraphicsItem { public: - SpriteObject(SpritePixmapSequence *seq, Q3Canvas *c); + SpriteObject(SpritePixmapSequence *seq, QGraphicsScene *scene); void setLifeSpan(int l) { mLifeSpan = l; } void age(); @@ -44,11 +43,31 @@ void setBounds( int x1, int y1, int x2, int y2 ); bool outOfBounds() const; + void setFrame(int frame); + inline int frame() const { return currentFrame; } + inline int frameCount() const { return frames.size(); } + inline void setVelocity(qreal xvel, qreal yvel) { vx = xvel; vy = yvel; } + inline qreal xVelocity() const { return vx; } + inline qreal yVelocity() const { return vy; } + QRectF boundingRect() const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + protected: int mCycle; int mLifeSpan; SpritePixmapSequence *mSeq; QRect mBound; + + private: + struct Frame { + QPixmap *pixmap; + QPainterPath shape; + QRectF boundingRect; + }; + + int currentFrame; + QList<Frame> frames; + qreal vx, vy; }; @@ -57,7 +76,7 @@ public: explicit SpriteDef(KConfigGroup &config); - SpriteObject *create(Q3Canvas *c); + SpriteObject *create(QGraphicsScene *scene); protected: void read(KConfigGroup &config); @@ -78,7 +97,7 @@ class SpriteGroup { public: - SpriteGroup(Q3Canvas *c, KConfigGroup &config); + SpriteGroup(QGraphicsScene *scene, KConfigGroup &config); void next(); void refresh(); @@ -88,11 +107,11 @@ void read(KConfigGroup &config); protected: - Q3PtrList<SpriteDef> mAvailable; - Q3PtrList<SpriteObject> mActive; + QList<SpriteDef*> mAvailable; + QList<SpriteObject*> mActive; int mCount; SpriteRange mRefresh; - Q3Canvas *mCanvas; + QGraphicsScene *mScene; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/spritemisc.cpp new/ktux-15.08.1/src/spritemisc.cpp --- old/ktux-15.04.3/src/spritemisc.cpp 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/spritemisc.cpp 2015-06-14 06:30:44.000000000 +0200 @@ -17,7 +17,7 @@ */ #include "spritemisc.h" -#include <krandom.h> +#include <KRandom> QSize SpriteRange::mFieldSize; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/spritepm.cpp new/ktux-15.08.1/src/spritepm.cpp --- old/ktux-15.04.3/src/spritepm.cpp 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/spritepm.cpp 2015-06-14 06:30:44.000000000 +0200 @@ -17,13 +17,12 @@ */ #include "spritepm.h" -#include <stdlib.h> -#include <kdebug.h> -#include <kconfiggroup.h> +#include <cstdlib> +#include <KConfigGroup> +#include <QDebug> #include <QPixmap> #include <QVector> -#include <Qt3Support/Q3PtrList> // static @@ -33,7 +32,6 @@ SpritePixmapManager::SpritePixmapManager() : mPixmapDir(QLatin1String(".")) { - mPixmaps.setAutoDelete(true); } @@ -42,13 +40,14 @@ } -const QPixmap *SpritePixmapManager::load(const QString & img) +QPixmap *SpritePixmapManager::load(const QString & img) { - QPixmap *pixmap = mPixmaps.find(img); + QHash<QString, QPixmap*>::iterator i = mPixmaps.find( img ); + QPixmap *pixmap = i.value(); - if( !pixmap ) { + if( i == mPixmaps.end() ) { // pixmap has not yet been loaded. - kDebug() << "Reading pixmap: " << img; + qDebug() << "Reading pixmap: " << img; QString path = mPixmapDir + QLatin1String("/") + img; pixmap = new QPixmap(path); @@ -58,7 +57,7 @@ else { delete pixmap; pixmap = 0; - kDebug() << "read failed";; + qDebug() << "read failed"; } } @@ -76,9 +75,8 @@ } -SpritePixmapSequence::SpritePixmapSequence(Q3PtrList<QPixmap> pm, Q3PtrList<QPoint> hs, QVector<int> d) - : Q3CanvasPixmapArray( pm, hs ), - mDelays( d ) +SpritePixmapSequence::SpritePixmapSequence(QList<QPixmap*> pm, QList<QPoint*> hs, QVector<int> d) + : mDelays( d ), pm(pm), hs(hs) { } @@ -88,7 +86,6 @@ SpriteSequenceManager::SpriteSequenceManager() { - mSprites.setAutoDelete( true ); } @@ -99,10 +96,11 @@ SpritePixmapSequence* SpriteSequenceManager::load(KConfigBase &config, const QString &name) { - SpritePixmapSequence *sprite = mSprites.find( name ); + QHash<QString, SpritePixmapSequence*>::iterator i = mSprites.find( name ); + SpritePixmapSequence *sprite = i.value(); - if( !sprite ) { - kDebug() << "Reading sprite: " << name; + if( i == mSprites.end() ) { + qDebug() << "Reading sprite: " << name; KConfigGroup grp( &config, name ); sprite = read( grp ); if( sprite ) { @@ -118,8 +116,8 @@ { QStringList strImages; QStringList strDelays; - Q3PtrList<QPixmap> pixmaps; - Q3PtrList<QPoint> hotspots; + QList<QPixmap*> pixmaps; + QList<QPoint*> hotspots; strImages = config.readEntry( "Images",QStringList() ); strDelays = config.readEntry( "Delays",QStringList() ); @@ -127,8 +125,7 @@ QVector<int> delays( strImages.count() ); for( int i = 0; i < strImages.count(); i++ ) { - const QPixmap *pixmap = - SpritePixmapManager::manager()->load( strImages.at( i ) ); + QPixmap *pixmap = SpritePixmapManager::manager()->load( strImages.at( i ) ); if( pixmap ) { pixmaps.append( pixmap ); hotspots.append( new QPoint( 0,0 ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktux-15.04.3/src/spritepm.h new/ktux-15.08.1/src/spritepm.h --- old/ktux-15.04.3/src/spritepm.h 2015-06-14 09:55:55.000000000 +0200 +++ new/ktux-15.08.1/src/spritepm.h 2015-06-14 06:30:44.000000000 +0200 @@ -18,14 +18,13 @@ #ifndef SPRITEPM_H #define SPRITEPM_H -#include <Qt3Support/Q3Dict> -#include <QtGui/QPixmap> -#include <Qt3Support/Q3Canvas> -#include <Qt3Support/Q3PtrList> -#include <QtCore/QVector> +#include <QPixmap> +#include <QHash> +#include <QList> +#include <QVector> -#include <kconfigbase.h> -#include <kconfig.h> +#include <KConfigBase> +#include <KConfig> class SpritePixmapManager @@ -38,28 +37,32 @@ { mPixmapDir = dir; } void reset() { mPixmapDir = QLatin1String("."); mPixmaps.clear(); } - const QPixmap *load(const QString & img); - const QPixmap *pixmap(const char *img) const - { return mPixmaps.find(QLatin1String(img)); } + QPixmap *load(const QString & img); + QPixmap *pixmap(const char *img) const + { return mPixmaps.find(QLatin1String(img)).value(); } static SpritePixmapManager *manager(); public: - QString mPixmapDir; // get pixmaps from here - Q3Dict<QPixmap> mPixmaps; // list of pixmaps + QString mPixmapDir; // get pixmaps from here + QHash <QString, QPixmap*> mPixmaps; // list of pixmaps static SpritePixmapManager *mManager; // static pointer to instance }; -class SpritePixmapSequence : public Q3CanvasPixmapArray +class SpritePixmapSequence { public: - SpritePixmapSequence(Q3PtrList<QPixmap> pm, Q3PtrList<QPoint> hs, QVector<int> d); + SpritePixmapSequence(QList<QPixmap*> pm, QList<QPoint*> hs, QVector<int> d); int delay(int i) const { return mDelays[i]; } + QList<QPixmap*> pixmaps() const { return pm; } + QList<QPoint*> hotspots() const { return hs; } protected: QVector<int> mDelays; + QList<QPixmap*> pm; + QList<QPoint*> hs; }; class KConfigGroup; @@ -73,7 +76,7 @@ SpritePixmapSequence *load(KConfigBase &config, const QString & name); SpritePixmapSequence *sprite(const char *name) - { return mSprites.find(QLatin1String(name)); } + { return mSprites.find(QLatin1String(name)).value(); } static SpriteSequenceManager *manager(); @@ -81,7 +84,7 @@ SpritePixmapSequence *read(const KConfigGroup &config); protected: - Q3Dict<SpritePixmapSequence> mSprites; + QHash<QString, SpritePixmapSequence*> mSprites; static SpriteSequenceManager *mManager; };
