Merge lp:~fboucault/ubuntu-ui-toolkit/standard_animations into lp:ubuntu-ui-toolkit

[Florian Boucault]

New UbuntuAnimation durations and easing constants.
New UbuntuNumberAnimation.

[Florian Boucault (fboucault)]

Not ready for merging. Todo:
- more representative examples
- improved documentation
- check that Fast is the right/most used default duration
- think again about API (UbuntuNumberAnimation vs. UbuntuAnimation)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/43/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

212 + qmlRegisterSingletonType<UCUbuntuAnimation>(uri, 0, 1, "UbuntuAnimation", registerUCUbuntuAnimation);

Why singleton type? The class functionality mostly consists of defining values, those can be handled with enums/flags, and that doesn't require any instance just a non-creatable type.

review: Needs Information

[lp:~fboucault/ubuntu-ui-toolkit/standard_animations]

486. By Florian Boucault on 2013-05-14

Made properties CONSTANT.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:486
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/48

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/48/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/standard_animations]

487. By Florian Boucault on 2013-05-14

Improved documentation.

488. By Florian Boucault on 2013-05-14

Use standard animations in toolkit.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:487
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/50

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/50/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

> Not ready for merging. Todo:
> - more representative examples
DONE.

> - improved documentation
DONE.

> - check that Fast is the right/most used default duration
DONE.

> - think again about API (UbuntuNumberAnimation vs. UbuntuAnimation)
NO FURTHER IDEAS.

[lp:~fboucault/ubuntu-ui-toolkit/standard_animations]

489. By Florian Boucault on 2013-05-14

Improved Animations example.

490. By Florian Boucault on 2013-05-14

Better examples.

491. By Florian Boucault on 2013-05-14

Better examples.

492. By Florian Boucault on 2013-05-14

Switched durations to be int instead of float.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:489
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/51

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/51/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:492
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/52

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/52/rebuild

review: Approve (continuous-integration)

=== added file 'examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml'
--- examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml	2013-05-14 14:31:25 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Rectangle {
+    id: circle
+
+    color: "#dd4814"
+    width: radius
+    height: radius
+    radius: units.gu(12)
+    antialiasing: true
+    gradient: Gradient {
+        GradientStop { position: 0.0; color: Qt.lighter(circle.color, 1.3) }
+        GradientStop { position: 1.0; color: circle.color }
+    }
+}

=== added file 'examples/ubuntu-ui-toolkit-gallery/Animations.qml'
--- examples/ubuntu-ui-toolkit-gallery/Animations.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Animations.qml	2013-05-14 14:31:25 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Template {
+    TemplateSection {
+        title: i18n.tr("NumberAnimation")
+        className: "UbuntuNumberAnimation"
+
+        TemplateRow {
+            title: i18n.tr("Standard")
+
+            Item {
+                width: units.gu(14)
+                height: units.gu(14)
+
+                AnimationCircle {
+                    radius: units.gu(6)
+                    anchors.centerIn: parent
+
+                    SequentialAnimation on radius {
+                        loops: Animation.Infinite
+                        PauseAnimation {
+                            duration: 1000
+                        }
+                        UbuntuNumberAnimation {
+                            from: units.gu(6)
+                            to: units.gu(12)
+                        }
+                        UbuntuNumberAnimation {
+                            from: units.gu(12)
+                            to: units.gu(6)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    TemplateSection {
+        title: i18n.tr("Standard Durations")
+        className: "UbuntuAnimation"
+
+        TemplateRow {
+            title: i18n.tr("Snap")
+
+            Repeater {
+                id: repeaterSnap
+                model: 6
+                AnimationCircle {
+                    radius: units.gu(2)
+
+                    SequentialAnimation on color {
+                        PauseAnimation {
+                            duration: index * UbuntuAnimation.SnapDuration
+                        }
+                        SequentialAnimation {
+                            loops: Animation.Infinite
+                            ColorAnimation {
+                                from: "#dd4814"
+                                to: "#ddcc14"
+                                duration: UbuntuAnimation.SnapDuration
+                            }
+                            PauseAnimation {
+                                duration: repeaterSnap.count * UbuntuAnimation.SnapDuration
+                            }
+                            ColorAnimation {
+                                from: "#ddcc14"
+                                to: "#dd4814"
+                                duration: UbuntuAnimation.SnapDuration
+                            }
+                            PauseAnimation {
+                                duration: repeaterSnap.count * UbuntuAnimation.SnapDuration
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Fast")
+
+            Repeater {
+                id: repeaterFast
+                model: 2
+                AnimationCircle {
+                    radius: units.gu(11)
+
+                    SequentialAnimation on color {
+                        PauseAnimation {
+                            duration: index * UbuntuAnimation.FastDuration
+                        }
+                        SequentialAnimation {
+                            loops: Animation.Infinite
+                            ColorAnimation {
+                                from: "#dd4814"
+                                to: "#ddcc14"
+                                duration: UbuntuAnimation.SnapDuration
+                            }
+                            PauseAnimation {
+                                duration: repeaterFast.count * UbuntuAnimation.FastDuration
+                            }
+                            ColorAnimation {
+                                from: "#ddcc14"
+                                to: "#dd4814"
+                                duration: UbuntuAnimation.SnapDuration
+                            }
+                            PauseAnimation {
+                                duration: repeaterFast.count * UbuntuAnimation.FastDuration
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Slow")
+
+            AnimationCircle {
+                radius: units.gu(12)
+
+                SequentialAnimation on x {
+                    loops: Animation.Infinite
+                    PauseAnimation {
+                        duration: 1000
+                    }
+                    UbuntuNumberAnimation {
+                        from: 0
+                        to: units.gu(12)
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                    PauseAnimation {
+                        duration: 300
+                    }
+                    PropertyAction {
+                        value: 0
+                    }
+                }
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Sleepy")
+
+            Item {
+                width: units.gu(10)
+                height: units.gu(42)
+
+                AnimationCircle {
+                    radius: units.gu(22)
+
+                    SequentialAnimation on y {
+                        loops: Animation.Infinite
+                        PauseAnimation {
+                            duration: 1000
+                        }
+                        UbuntuNumberAnimation {
+                            from: 0
+                            to: units.gu(20)
+                            duration: UbuntuAnimation.SleepyDuration
+                        }
+                        PauseAnimation {
+                            duration: 300
+                        }
+                        PropertyAction {
+                            value: 0
+                        }
+                    }
+                }
+             }
+        }
+    }
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2013-05-06 08:17:02 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2013-05-14 14:31:25 +0000
@@ -75,4 +75,10 @@
         label: "Sheet"
         source: "Sheet.qml"
     }
+
+    // Not in design guidelines yet
+    ListElement {
+        label: "Animations"
+        source: "Animations.qml"
+    }
 }

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2013-05-01 21:21:11 +0000
+++ modules/Ubuntu/Components/Header.qml	2013-05-14 14:31:25 +0000
@@ -41,7 +41,7 @@
     Behavior on y {
         enabled: !(header.flickable && header.flickable.moving)
         SmoothedAnimation {
-            duration: 200
+            duration: Theming.UbuntuAnimation.FastDuration
         }
     }
     height: units.gu(10)

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2013-04-26 19:23:36 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2013-05-14 14:31:25 +0000
@@ -322,8 +322,7 @@
             Behavior on x {
                 enabled: !priv.held
                 SequentialAnimation {
-                    NumberAnimation {
-                        duration: 200
+                    UbuntuNumberAnimation {
                     }
                     ScriptAction {
                          script: {
@@ -386,11 +385,10 @@
         id: removeItemAnimation
 
         running: false
-        NumberAnimation {
+        UbuntuNumberAnimation {
             target: emptyListItem
             property: "implicitHeight"
             to: 0
-            duration: 200
         }
         ScriptAction {
              script: {

=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2013-04-26 20:53:31 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2013-05-14 14:31:25 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 0.1
 
 /*!
     \qmltype ValueSelector
@@ -206,10 +207,10 @@
                     ]
 
                     transitions: Transition {
-                        PropertyAnimation {
+                        UbuntuNumberAnimation {
                             target: accordionIcon
                             properties: "rotation"
-                            duration: 100
+                            duration: UbuntuAnimation.SnapDuration
                         }
                     }
                 }
@@ -238,10 +239,10 @@
             ]
 
             transitions: Transition {
-                PropertyAnimation {
+                UbuntuNumberAnimation {
                     target: valueRepeater
                     properties: "valueHeight"
-                    duration: 100
+                    duration: UbuntuAnimation.SnapDuration
                 }
             }
 

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-04-25 17:19:46 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2013-05-14 14:31:25 +0000
@@ -125,8 +125,8 @@
                     RotationAnimation {
                         target: orientationHelper
                         properties: "rotation"
-                        duration: 250
-                        easing.type: Easing.OutQuint
+                        duration: UbuntuAnimation.FastDuration
+                        easing: UbuntuAnimation.StandardEasing
                         direction: RotationAnimation.Shortest
                     }
                 }

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-05-02 19:18:51 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-05-14 14:31:25 +0000
@@ -248,29 +248,26 @@
     transitions: [
         Transition {
             to: ""
-            PropertyAnimation {
+            UbuntuNumberAnimation {
                 target: bar
                 properties: "position"
                 duration: internal.transitionDuration
-                easing.type: Easing.OutQuad
             }
         },
         Transition {
             to: "hint"
-            PropertyAnimation {
+            UbuntuNumberAnimation {
                 target: bar
                 properties: "position"
                 duration: internal.transitionDuration
-                easing.type: Easing.OutQuad
             }
         },
         Transition {
             to: "spread"
-            PropertyAnimation {
+            UbuntuNumberAnimation {
                 target: bar
                 properties: "position"
                 duration: internal.transitionDuration
-                easing.type: Easing.OutQuad
             }
         }
     ]
@@ -281,9 +278,8 @@
         /*!
           The duration in milliseconds of sliding in or out transitions when opening, closing, and showing the hint.
           Default value: 250
-          // FIXME: Update to use ubuntuFastBeat when animation speeds are added to the SDK.
          */
-        property real transitionDuration: 250
+        property real transitionDuration: Toolkit.UbuntuAnimation.FastDuration
 
 
         property string previousState: ""

=== added file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2013-05-14 14:31:25 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1 as Ubuntu
+
+/*!
+    \qmltype UbuntuNumberAnimation
+    \inqmlmodule Ubuntu.Components 0.1
+    \ingroup ubuntu
+    \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
+           settings to ensure that Ubuntu applications are consistent in their animations.
+
+    Example of use:
+
+    \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    Rectangle {
+        width: 100; height: 100
+        color: "red"
+
+        UbuntuNumberAnimation on x { to: 50 }
+    }
+    \endqml
+
+    UbuntuNumberAnimation is predefined with the following settings:
+    \list
+    \li \e duration: \l{UbuntuAnimation::FastDuration}{UbuntuAnimation.FastDuration}
+    \li \e easing: \l{UbuntuAnimation::StandardEasing}{UbuntuAnimation.StandardEasing}
+    \endlist
+
+    If the standard duration and easing used by UbuntuNumberAnimation do not
+    satisfy a use case or you need to use a different type of Animation
+    (e.g. ColorAnimation), use standard durations and easing defined in
+    \l UbuntuAnimation manually in order to ensure consistency.
+*/
+NumberAnimation {
+    duration: Ubuntu.UbuntuAnimation.FastDuration
+    easing: Ubuntu.UbuntuAnimation.StandardEasing
+}

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2013-04-25 00:03:08 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2013-05-14 14:31:25 +0000
@@ -40,6 +40,7 @@
 #include "qquickmimedata.h"
 #include "bottombarvisibilitycommunicator.h"
 #include "ucstyle.h"
+#include "ucubuntuanimation.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -69,6 +70,7 @@
     qmlRegisterType<QQuickMimeData>(uri, 0, 1, "MimeData");
     qmlRegisterSingletonType<QQuickClipboard>(uri, 0, 1, "Clipboard", registerClipboard);
     qmlRegisterType<UCStyle>(uri, 0, 1, "Style");
+    qmlRegisterSingletonType<UCUbuntuAnimation>(uri, 0, 1, "UbuntuAnimation", registerUCUbuntuAnimation);
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2013-03-27 12:01:27 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2013-05-14 14:31:25 +0000
@@ -43,7 +43,8 @@
     qquickmimedata.h \
     qquickclipboard_p.h \
     selector_p.h \
-    ucstyle.h
+    ucstyle.h \
+    ucubuntuanimation.h
 
 SOURCES += plugin.cpp \
     themeengine.cpp \
@@ -64,7 +65,8 @@
     qquickclipboard.cpp \
     qquickmimedata.cpp \
     selector.cpp \
-    ucstyle.cpp
+    ucstyle.cpp \
+    ucubuntuanimation.cpp
 
 # deployment rules for the plugin
 installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)

=== added file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2013-05-14 14:31:25 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ucubuntuanimation.h"
+
+/*!
+ * \qmltype UbuntuAnimation
+ * \instantiates UCUbuntuAnimation
+ * \inqmlmodule Ubuntu.Components 0.1
+ * \ingroup ubuntu
+ * \brief Singleton defining standard Ubuntu durations and easing for animations
+ *        that should be used to ensure that Ubuntu applications are consistent
+ *        in their animations.
+ *
+ * Example of use:
+ *
+ * \qml
+ * RotationAnimation {
+ *    duration: UbuntuAnimation.SlowDuration
+ *    easing: UbuntuAnimation.StandardEasing
+ * }
+ * \endqml
+ *
+ * Animation durations should be selected depending on the frequency and
+ * disruptiveness of the animation. The more frequent an animation is, the
+ * faster it should be. The more disruptive an animation is, the slower it should
+ * be. Rule of thumb to select durations:
+ *  \list
+ *   \li SnapDuration: very frequent, non-disruptive.
+ *   \li FastDuration: frequent, non-disruptive.
+ *   \li SlowDuration: less frequent, non-disruptive.
+ *   \li SleepyDuration: disruptive.
+ *  \endlist
+ *
+ * Note that \l UbuntuNumberAnimation provides a standard NumberAnimation for
+ * Ubuntu applications.
+ *
+ */
+
+UCUbuntuAnimation::UCUbuntuAnimation(QObject *parent) :
+    QObject(parent)
+{
+}
+
+/*!
+ * \qmlproperty int UbuntuAnimation::SnapDuration
+ * Used for very frequent and non-disruptive transitions on small objects.
+ * The user would perceive the change as instant but smooth.
+ *
+ * The value is 125ms.
+ */
+
+/*!
+ * \qmlproperty int UbuntuAnimation::FastDuration
+ * Used for frequent and non-disruptive transitions.
+ *
+ * The value is 250ms.
+ */
+
+/*!
+ * \qmlproperty int UbuntuAnimation::SlowDuration
+ * Used for delay after key press and for less frequent and non-disruptive
+ * transitions.
+ *
+ * The value is 500ms.
+ */
+
+/*!
+ * \qmlproperty int UbuntuAnimation::SleepyDuration
+ * Used for disruptive transitions.
+ *
+ * The value is 1000ms.
+ */
+
+/*!
+ * \qmlproperty QEasingCurve UbuntuAnimation::StandardEasing
+ * Used for animations trigerred by user actions.
+ *
+ * The type is Easing.OutQuint.
+ */

=== added file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.h'
--- modules/Ubuntu/Components/plugin/ucubuntuanimation.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntuanimation.h	2013-05-14 14:31:25 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef UCUBUNTUANIMATION_H
+#define UCUBUNTUANIMATION_H
+
+#include <QObject>
+#include <QtCore/QEasingCurve>
+
+class UCUbuntuAnimation : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int SnapDuration READ SnapDuration CONSTANT)
+    Q_PROPERTY(int FastDuration READ FastDuration CONSTANT)
+    Q_PROPERTY(int SlowDuration READ SlowDuration CONSTANT)
+    Q_PROPERTY(int SleepyDuration READ SleepyDuration CONSTANT)
+    Q_PROPERTY(QEasingCurve StandardEasing READ StandardEasing CONSTANT)
+
+public:
+    explicit UCUbuntuAnimation(QObject *parent = 0);
+    
+    int SnapDuration() const { return 125; }
+    int FastDuration() const { return 250; }
+    int SlowDuration() const { return 500; }
+    int SleepyDuration() const { return 1000; }
+    QEasingCurve StandardEasing() const {
+        static QEasingCurve standardEasing(QEasingCurve::OutQuint);
+        return standardEasing;
+    }
+};
+
+/*
+ * Registration function used by qmlRegisterSingletonType
+ */
+class QQmlEngine;
+class QJSEngine;
+
+static QObject *registerUCUbuntuAnimation(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    UCUbuntuAnimation *animation = new UCUbuntuAnimation();
+    return animation;
+}
+
+#endif // UCUBUNTUANIMATION_H

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2013-04-29 18:36:03 +0000
+++ modules/Ubuntu/Components/qmldir	2013-05-14 14:31:25 +0000
@@ -38,6 +38,7 @@
 ComponentUtils 0.1 componentUtils.js
 SliderUtils 0.1 sliderUtils.js
 ScrollbarUtils 0.1 scrollbarUtils.js
+UbuntuNumberAnimation 0.1 UbuntuNumberAnimation.qml
 
 internal TextCursor TextCursor.qml
 internal TextInputPopover TextInputPopover.qml

=== modified file 'themes/Ambiance/qmltheme/ActivityIndicatorDelegate.qml'
--- themes/Ambiance/qmltheme/ActivityIndicatorDelegate.qml	2013-03-27 12:24:22 +0000
+++ themes/Ambiance/qmltheme/ActivityIndicatorDelegate.qml	2013-05-14 14:31:25 +0000
@@ -32,6 +32,6 @@
         from: 0
         to: 360
         loops: Animation.Infinite
-        duration: 1300
+        duration: UbuntuAnimation.SleepyDuration
     }
 }

=== modified file 'themes/Ambiance/qmltheme/ButtonDelegate.qml'
--- themes/Ambiance/qmltheme/ButtonDelegate.qml	2013-03-27 07:51:04 +0000
+++ themes/Ambiance/qmltheme/ButtonDelegate.qml	2013-05-14 14:31:25 +0000
@@ -51,7 +51,7 @@
         color: item.color
         borderSource: visuals.borderPressed
         opacity: item.pressed ? 1.0 : 0.0
-        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
+        Behavior on opacity { UbuntuNumberAnimation {} }
     }
 
     TransparentButtonDelegate {

=== modified file 'themes/Ambiance/qmltheme/CheckBoxDelegate.qml'
--- themes/Ambiance/qmltheme/CheckBoxDelegate.qml	2013-03-13 12:03:30 +0000
+++ themes/Ambiance/qmltheme/CheckBoxDelegate.qml	2013-05-14 14:31:25 +0000
@@ -54,7 +54,7 @@
         source: checkMarkSource
         opacity: item.checked ? 1.0 : 0.0
         Behavior on opacity {
-            NumberAnimation { duration: 100; easing.type: Easing.OutQuad }
+            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
         }
     }
 }

=== modified file 'themes/Ambiance/qmltheme/ToolbarDelegate.qml'
--- themes/Ambiance/qmltheme/ToolbarDelegate.qml	2013-05-01 23:38:10 +0000
+++ themes/Ambiance/qmltheme/ToolbarDelegate.qml	2013-05-14 14:31:25 +0000
@@ -42,7 +42,7 @@
         source: Qt.resolvedUrl("artwork/toolbar_dropshadow.png")
         opacity: item.opened || item.animating ? 0.5 : 0.0
         Behavior on opacity {
-            NumberAnimation { duration: 50; easing.type: Easing.OutQuad }
+            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
         }
     }
 }

=== modified file 'themes/Ambiance/qmltheme/default.qmltheme'
--- themes/Ambiance/qmltheme/default.qmltheme	2013-04-26 16:39:56 +0000
+++ themes/Ambiance/qmltheme/default.qmltheme	2013-05-14 14:31:25 +0000
@@ -99,7 +99,7 @@
     checkedColor: "#DD4814";
     uncheckedColor: Qt.rgba(0.0, 0.0, 0.0, 0.1);
     checkMarkSource: url("artwork/CheckMark.png");
-    backgroundColorAnimation: ColorAnimation { duration: 100; easing.type: Easing.OutQuad };
+    backgroundColorAnimation: ColorAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing };
 }
 
 .switch {
@@ -110,8 +110,8 @@
     thumbSpacing: units.dp(2);
     checkedThumbColor: "#DD4814";
     uncheckedThumbColor: "#bbbbbb";
-    thumbColorAnimation: ColorAnimation { duration: 100; easing.type: Easing.OutQuad };
-    moveThumbAnimation: NumberAnimation { duration: 100; easing.type: Easing.OutQuad };
+    thumbColorAnimation: ColorAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing };
+    moveThumbAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
     backgroundColor: Qt.rgba(0.78, 0.78, 0.78, 0.1);
 }
 
@@ -186,7 +186,7 @@
 .popover {
     edgeMargins: units.gu(2);
     callerMargin: units.gu(1);
-    fadingAnimation: PropertyAnimation{duration: 125; easing.type: Easing.OutQuint};
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
 }
 
 .popover .foreground {
@@ -200,7 +200,7 @@
 }
 
 .sheet {
-    fadingAnimation: PropertyAnimation{duration: 125; easing.type: Easing.OutQuint};
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
 }
 .sheet .foreground {
     headerColor: "darkgray";
@@ -212,7 +212,7 @@
 .dialog {
     edgeMargins: units.gu(2);
     callerMargin: units.gu(1);
-    fadingAnimation: PropertyAnimation{duration: 125; easing.type: Easing.OutQuint};
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
 }
 .dialog .background {
     dim: true;
@@ -269,19 +269,13 @@
     overlayOpacityWhenShown: 0.6;
     overlayOpacityWhenHidden: 0.0;
 
-    scrollbarFadeInAnimation: NumberAnimation {
-        duration: 100;
-        easing.type: Easing.InOutQuad;
-    };
+    scrollbarFadeInAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
     scrollbarFadeOutPause: 300;
-    scrollbarFadeOutAnimation: NumberAnimation {
-        duration: 500;
-        easing.type: Easing.InOutQuad;
-    };
+    scrollbarFadeOutAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SlowDuration };
 
-    sliderAnimation: NumberAnimation {duration: 200; easing.type: Easing.InOutQuad};
-    thumbConnectorFading: NumberAnimation {duration: 100; easing.type: Easing.InOutQuad};
-    thumbFading: NumberAnimation {duration: 100; easing.type: Easing.InOutQuad};
+    sliderAnimation: UbuntuNumberAnimation {};
+    thumbConnectorFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
+    thumbFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration };
     backwardThumbReleased : (item.align === Qt.AlignLeading || item.align === Qt.AlignTrailing) ? url("artwork/ScrollbarTopIdle.png") : url("artwork/ScrollbarLeftIdle.png");
     backwardThumbPressed: (item.align === Qt.AlignLeading || item.align === Qt.AlignTrailing) ? url("artwork/ScrollbarTopPressed.png") : url("artwork/ScrollbarLeftPressed.png");
     forwardThumbReleased: (item.align === Qt.AlignLeading || item.align === Qt.AlignTrailing) ? url("artwork/ScrollbarBottomIdle.png") : url("artwork/ScrollbarRightIdle.png");