alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adapt to Animation API cleanup

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1069731
This commit is contained in:
Aaron J. Seigo 2010-01-04 09:19:08 +00:00
parent 8ccd1a0d9c
commit 7a46df7066
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applet.cpp
View File

@ -455,7 +455,7 @@ void Applet::destroy()
Animation *zoomAnim = Animation *zoomAnim =
Plasma::Animator::create(Plasma::Animator::ZoomAnimation); Plasma::Animator::create(Plasma::Animator::ZoomAnimation);
connect(zoomAnim, SIGNAL(finished()), this, SLOT(appletAnimationComplete())); connect(zoomAnim, SIGNAL(finished()), this, SLOT(appletAnimationComplete()));
zoomAnim->setWidgetToAnimate(this); zoomAnim->setTargetWidget(this);
zoomAnim->start(); zoomAnim->start();
} }
} }
@ -2858,7 +2858,7 @@ void AppletOverlayWidget::destroy()
Animation *zoomAnim = Animation *zoomAnim =
Plasma::Animator::create(Plasma::Animator::ZoomAnimation); Plasma::Animator::create(Plasma::Animator::ZoomAnimation);
connect(zoomAnim, SIGNAL(finished()), this, SLOT(overlayAnimationComplete())); connect(zoomAnim, SIGNAL(finished()), this, SLOT(overlayAnimationComplete()));
zoomAnim->setWidgetToAnimate(this); zoomAnim->setTargetWidget(this);
zoomAnim->start(); zoomAnim->start();
} }

4
containment.cpp
View File

@ -962,7 +962,7 @@ void Containment::addApplet(Applet *applet, const QPointF &pos, bool delayInit)
applet->setScale(0); applet->setScale(0);
d->zoomAnim = Plasma::Animator::create(Plasma::Animator::ZoomAnimation); d->zoomAnim = Plasma::Animator::create(Plasma::Animator::ZoomAnimation);
connect(d->zoomAnim, SIGNAL(finished()), this, SLOT(containmentAppletAnimationComplete())); connect(d->zoomAnim, SIGNAL(finished()), this, SLOT(containmentAppletAnimationComplete()));
d->zoomAnim->setWidgetToAnimate(applet); d->zoomAnim->setTargetWidget(applet);
d->zoomAnim->setProperty("zoom", 1.0); d->zoomAnim->setProperty("zoom", 1.0);
d->zoomAnim->start(); d->zoomAnim->start();
} }
@ -2315,7 +2315,7 @@ void ContainmentPrivate::appletDestroyed(Plasma::Applet *applet)
void ContainmentPrivate::containmentAppletAnimationComplete() void ContainmentPrivate::containmentAppletAnimationComplete()
{ {
Applet *applet = qgraphicsitem_cast<Applet*>(zoomAnim->widgetToAnimate()); Applet *applet = qgraphicsitem_cast<Applet*>(zoomAnim->targetWidget());
if (applet->parentItem() == q) { if (applet->parentItem() == q) {
if (type == Containment::DesktopContainment) { if (type == Containment::DesktopContainment) {
applet->installSceneEventFilter(q); applet->installSceneEventFilter(q);

4
private/desktoptoolbox.cpp
View File

@ -629,7 +629,7 @@ void DesktopToolBox::showToolBox()
d->toolBacker->setOpacity(0); d->toolBacker->setOpacity(0);
d->toolBacker->show(); d->toolBacker->show();
Plasma::Animation *fadeAnim = Animator::create(Animator::FadeAnimation, d->toolBacker); Plasma::Animation *fadeAnim = Animator::create(Animator::FadeAnimation, d->toolBacker);
fadeAnim->setWidgetToAnimate(d->toolBacker); fadeAnim->setTargetWidget(d->toolBacker);
fadeAnim->setProperty("startOpacity", 0); fadeAnim->setProperty("startOpacity", 0);
fadeAnim->setProperty("targetOpacity", 1); fadeAnim->setProperty("targetOpacity", 1);
fadeAnim->start(QAbstractAnimation::DeleteWhenStopped); fadeAnim->start(QAbstractAnimation::DeleteWhenStopped);
@ -670,7 +670,7 @@ void DesktopToolBox::hideToolBox()
if (d->toolBacker) { if (d->toolBacker) {
Plasma::Animation *fadeAnim = Animator::create(Animator::FadeAnimation, d->toolBacker); Plasma::Animation *fadeAnim = Animator::create(Animator::FadeAnimation, d->toolBacker);
connect(fadeAnim, SIGNAL(finished()), this, SLOT(hideToolBacker())); connect(fadeAnim, SIGNAL(finished()), this, SLOT(hideToolBacker()));
fadeAnim->setWidgetToAnimate(d->toolBacker); fadeAnim->setTargetWidget(d->toolBacker);
fadeAnim->setProperty("startOpacity", 1); fadeAnim->setProperty("startOpacity", 1);
fadeAnim->setProperty("targetOpacity", 0); fadeAnim->setProperty("targetOpacity", 0);
fadeAnim->start(QAbstractAnimation::DeleteWhenStopped); fadeAnim->start(QAbstractAnimation::DeleteWhenStopped);

2
private/focusindicator.cpp
View File

@ -44,7 +44,7 @@ FocusIndicator::FocusIndicator(QGraphicsWidget *parent, QString widget)
m_background->setCacheAllRenderedFrames(true); m_background->setCacheAllRenderedFrames(true);
m_fade = Animator::create(Animator::FadeAnimation, this); m_fade = Animator::create(Animator::FadeAnimation, this);
m_fade->setWidgetToAnimate(this); m_fade->setTargetWidget(this);
m_fade->setProperty("startOpacity", 0.0); m_fade->setProperty("startOpacity", 0.0);
m_fade->setProperty("targetOpacity", 1.0); m_fade->setProperty("targetOpacity", 1.0);