New: New animation for object menu and message box

RevBy: Daniel d'Andrada, Marcin Miklas
Details:
* New MWidgetZoomAnimation class.
* New MWidgetFadeAnimation class.
* New MWidgetSlideAnimation class.
* Removed the old In/Out widget animation classes.
* Made MSceneLayerEffect use the new MWidgetFadeAnimation class.
* Added layer effect's animation to the scene window animation.
Scene window animation is derived from QParallelAnimationGroup so the
effect's animation is played in parallel with it, and finished() signal
is emitted at the end of the longest animation of these two.

3 files changed, 16 insertions, 18 deletions

diff --git a/plainqt/style/qtmaemo6menuproxy.cpp b/plainqt/style/qtmaemo6menuproxy.cpp
index f40f72ad..a0f018b6 100644
--- a/plainqt/style/qtmaemo6menuproxy.cpp
+++ b/plainqt/style/qtmaemo6menuproxy.cpp
@@ -33,8 +33,7 @@
 #include <QParallelAnimationGroup>
 
 #include <mapplicationmenustyle.h>
-#include <mwidgetfadeinanimationstyle.h>
-#include <mwidgetfadeoutanimationstyle.h>
+#include <mwidgetfadeanimationstyle.h>
 #include <QDebug>
 
 /* unforunately this is required to force widgets drawing it's background, even
@@ -123,9 +122,9 @@ void QtMaemo6MenuProxy::mousePressEvent(QMouseEvent *event)
 void QtMaemo6MenuProxy::showEvent(QShowEvent *event) {
     Q_UNUSED(event);
 
-    const MWidgetFadeInAnimationStyle *fadeInStyle =
-        static_cast<const MWidgetFadeInAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
-                "MWidgetFadeInAnimationStyle"));
+    const MWidgetFadeAnimationStyle *fadeInStyle =
+        static_cast<const MWidgetFadeAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
+                "MWidgetFadeInAnimationStyle", "In"));
 
     layout()->activate();
     QRect finalGeometry = QRect(m_menu->geometry().topLeft(), m_menu->sizeHint());
@@ -161,9 +160,9 @@ void QtMaemo6MenuProxy::showEvent(QShowEvent *event) {
 }
 
 void QtMaemo6MenuProxy::hideWindow() {
-    const MWidgetFadeOutAnimationStyle *fadeOutStyle =
-        static_cast<const MWidgetFadeOutAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
-                "MWidgetFadeOutAnimationStyle"));
+    const MWidgetFadeAnimationStyle *fadeOutStyle =
+        static_cast<const MWidgetFadeAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
+                "MWidgetFadeOutAnimationStyle", "Out"));
 
     QRect startGeometry = m_menu->geometry();
     QRect finalGeometry = startGeometry;
diff --git a/plainqt/style/qtmaemo6scrollbareventfilter.cpp b/plainqt/style/qtmaemo6scrollbareventfilter.cpp
index 8eb28713..46b21a0a 100644
--- a/plainqt/style/qtmaemo6scrollbareventfilter.cpp
+++ b/plainqt/style/qtmaemo6scrollbareventfilter.cpp
@@ -35,8 +35,7 @@
 #include <mwidgetstyle.h>
 #include <MScalableImage>
 
-#include <mwidgetfadeinanimationstyle.h>
-#include <mwidgetfadeoutanimationstyle.h>
+#include <mwidgetfadeanimationstyle.h>
 
 #ifdef SHOW_SCROLLING_THUMBNAIL
 AbstractScrollAreaThumbView::AbstractScrollAreaThumbView(QWidget *parent /*= NULL*/)
@@ -348,13 +347,13 @@ void QtMaemo6ScrollBarEventFilter::fadeInOutAnimation(QWidget *w, const char *pr
             static_cast<const MPositionIndicatorStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
                     "MPositionIndicatorStyle"));
 
-        const MWidgetFadeInAnimationStyle *fadeInStyle =
-            static_cast<const MWidgetFadeInAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
-                    "MWidgetFadeInAnimationStyle"));
+        const MWidgetFadeAnimationStyle *fadeInStyle =
+            static_cast<const MWidgetFadeAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
+                    "MWidgetFadeAnimationStyle", "In"));
 
-        const MWidgetFadeOutAnimationStyle *fadeOutStyle =
-            static_cast<const MWidgetFadeOutAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
-                    "MWidgetFadeOutAnimationStyle"));
+        const MWidgetFadeAnimationStyle *fadeOutStyle =
+            static_cast<const MWidgetFadeAnimationStyle *>(QtMaemo6StylePrivate::mStyle(QStyle::State_Active,
+                    "MWidgetFadeAnimationStyle", "Out"));
 
         QSequentialAnimationGroup *animationGroup = new QSequentialAnimationGroup();
         QPropertyAnimation *fadeIn = new QPropertyAnimation(animationGroup);
diff --git a/plainqt/style/qtmaemo6style.cpp b/plainqt/style/qtmaemo6style.cpp
index fa5b9159..95bb6aa3 100644
--- a/plainqt/style/qtmaemo6style.cpp
+++ b/plainqt/style/qtmaemo6style.cpp
@@ -80,8 +80,8 @@
 #include <mcontentitemstyle.h>
 #include <mapplicationmenustyle.h>
 #include <mfeedbackplayer.h>
-#include <mwidgetfadeinanimationstyle.h>
-#include <mwidgetfadeoutanimationstyle.h>
+//#include <mwidgetfadeinanimationstyle.h>
+//#include <mwidgetfadeoutanimationstyle.h>
 #include <mdeviceprofile.h>
 
 #include "qtmaemo6titlebar.h"