no need for pause now that Plasma::Animator isn't a factory for QAbAnim but IsA QAbAnim (with Plasma::Animator being the only factory)
svn path=/trunk/KDE/kdelibs/; revision=1058597
This commit is contained in:
parent
daad380026
commit
358a456a9d
@ -49,7 +49,6 @@ set(plasma_LIB_SRCS
|
|||||||
animations/fade.cpp
|
animations/fade.cpp
|
||||||
animations/grow.cpp
|
animations/grow.cpp
|
||||||
animations/slide.cpp
|
animations/slide.cpp
|
||||||
animations/pause.cpp
|
|
||||||
animations/pulser.cpp
|
animations/pulser.cpp
|
||||||
animations/rotation.cpp
|
animations/rotation.cpp
|
||||||
animations/rotationstacked.cpp
|
animations/rotationstacked.cpp
|
||||||
|
@ -1,37 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2009 Aaron Seigo <aseigo@kde.org>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Library General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this program; if not, write to the
|
|
||||||
* Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "pause_p.h"
|
|
||||||
|
|
||||||
#include <QPauseAnimation>
|
|
||||||
|
|
||||||
namespace Plasma
|
|
||||||
{
|
|
||||||
|
|
||||||
PauseAnimation::PauseAnimation(QObject *parent)
|
|
||||||
: Animation(parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void PauseAnimation::updateCurrentTime(int)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
} //namespace Plasma
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2009 Aaron J. Seigo <aseigo@kde.org>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Library General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this program; if not, write to the
|
|
||||||
* Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @file This file contains the definition for the Expand effect.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PLASMA_ANIMATIONS_PAUSE_H
|
|
||||||
#define PLASMA_ANIMATIONS_PAUSE_H
|
|
||||||
|
|
||||||
#include <plasma/animations/animation.h>
|
|
||||||
#include <plasma/plasma_export.h>
|
|
||||||
class QPauseAnimation;
|
|
||||||
|
|
||||||
namespace Plasma
|
|
||||||
{
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @class PauseAnimation
|
|
||||||
* @short Provides a pause in animations
|
|
||||||
*/
|
|
||||||
class PauseAnimation : public Animation
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
PauseAnimation(QObject *parent = 0);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void updateCurrentTime(int msecs);
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
@ -25,7 +25,6 @@
|
|||||||
#include "animations/animation.h"
|
#include "animations/animation.h"
|
||||||
#include "animations/fade_p.h"
|
#include "animations/fade_p.h"
|
||||||
#include "animations/grow_p.h"
|
#include "animations/grow_p.h"
|
||||||
#include "animations/pause_p.h"
|
|
||||||
#include "animations/pulser_p.h"
|
#include "animations/pulser_p.h"
|
||||||
#include "animations/rotation_p.h"
|
#include "animations/rotation_p.h"
|
||||||
#include "animations/slide_p.h"
|
#include "animations/slide_p.h"
|
||||||
@ -64,10 +63,6 @@ Plasma::Animation* Animator::create(Animator::Animation type, QObject *parent)
|
|||||||
result = new Plasma::SlideAnimation;
|
result = new Plasma::SlideAnimation;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PauseAnimation:
|
|
||||||
result = new Plasma::PauseAnimation;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
kDebug() << "Unsupported animation type.";
|
kDebug() << "Unsupported animation type.";
|
||||||
|
|
||||||
|
@ -62,8 +62,7 @@ public:
|
|||||||
PulseAnimation, /*<< Pulse animated object (opacity/geometry/scale) */
|
PulseAnimation, /*<< Pulse animated object (opacity/geometry/scale) */
|
||||||
RotationAnimation, /*<< Rotate an animated object */
|
RotationAnimation, /*<< Rotate an animated object */
|
||||||
RotationStackedAnimation, /*<< TODO: for flipping one object with another */
|
RotationStackedAnimation, /*<< TODO: for flipping one object with another */
|
||||||
SlideAnimation, /*<< Move the position of animated object */
|
SlideAnimation /*<< Move the position of animated object */
|
||||||
PauseAnimation /*<< Pulse animated object (opacity/geometry/scale) */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum CurveShape {
|
enum CurveShape {
|
||||||
|
Loading…
Reference in New Issue
Block a user