Ubuntu UI Toolkit

Merge lp:~nik90/ubuntu-ui-toolkit/panel-animation-speed into lp:ubuntu-ui-toolkit/staging

  1. panel-animation-speed
  2. Merge into staging
Proposed by Nekhelesh Ramananthan
Status: Rejected
Rejected by: Zsombor Egri
Proposed branch: lp:~nik90/ubuntu-ui-toolkit/panel-animation-speed
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 273 lines (+41/-31)
18 files modified
components.api (+3/-0)
modules/Ubuntu/Components/Panel.qml (+7/-1)
modules/Ubuntu/Components/qmldir (+1/-0)
po/ca.po (+2/-2)
po/de.po (+2/-2)
po/es.po (+2/-2)
po/fi.po (+2/-2)
po/fr.po (+2/-2)
po/gl.po (+2/-2)
po/he.po (+2/-2)
po/hu.po (+2/-2)
po/ko.po (+2/-2)
po/my.po (+2/-2)
po/nl.po (+2/-2)
po/oc.po (+2/-2)
po/pt_BR.po (+2/-2)
po/sv.po (+2/-2)
po/uk.po (+2/-2)
To merge this branch: bzr merge lp:~nik90/ubuntu-ui-toolkit/panel-animation-speed
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Nekhelesh Ramananthan (community) Disapprove
Zsombor Egri Needs Fixing
Review via email: mp+223186@code.launchpad.net

Commit message

Adds a property to set the panel swipe animation speed.

Description of the change

Adds a property to set the panel swipe animation speed. By default it is set to UbuntuAnimation.FastDuration to not break compatibility with existing applications which use the panel.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1032
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/371/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/877/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/795/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1608/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/935/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/371/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Ok, first, you've added an API to 1.0 version, which breaks the version itself in a sense that any new API must be added to 1.1

Second, the property name should rather be animationDuration than animateDuration.

And third, it is questionable whether we would want to open the whole animation object instead of simply adding a sub-property of it. So let's discuss this with Tim as well.

review: Needs Fixing
lp:~nik90/ubuntu-ui-toolkit/panel-animation-speed updated
1033. By Nekhelesh Ramananthan

Changed property name to animationDuration

1034. By Nekhelesh Ramananthan

Move the new property over to the 1.1 API instead of 1.0

1035. By Nekhelesh Ramananthan

Added 1.1 change in the qmldir as well

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

> Ok, first, you've added an API to 1.0 version, which breaks the version itself
> in a sense that any new API must be added to 1.1
>

fixed in rev 1034 and 1035

> Second, the property name should rather be animationDuration than
> animateDuration.
>

fixed in rev 1033

> And third, it is questionable whether we would want to open the whole
> animation object instead of simply adding a sub-property of it. So let's
> discuss this with Tim as well.

I don't follow this. Let's discuss this on irc.

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

After a discussion on IRC, we need something that exposes the entire animation (duration, easing etc) rather than the just the duration. However the panel consists of several stages which have their own transitions. This makes exposing the transitions more harder. In that context, this MP is not ready. I am disapproving it since for now the clock app will use a custom solution until the SDK has support for this.

review: Disapprove
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1035
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/374/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/882/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/800/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/206/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/206/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/206/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1619/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/940/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/374/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1035. By Nekhelesh Ramananthan

Added 1.1 change in the qmldir as well

1034. By Nekhelesh Ramananthan

Move the new property over to the 1.1 API instead of 1.0

1033. By Nekhelesh Ramananthan

Changed property name to animationDuration

1032. By Nekhelesh Ramananthan

Added property to set the speed of the panel swipe animation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'components.api'
--- components.api 2014-05-28 18:08:33 +0000
+++ components.api 2014-06-16 09:16:00 +0000
@@ -269,6 +269,9 @@
269 property bool __closeOnContentsClicks269 property bool __closeOnContentsClicks
270 property bool __openOnHover270 property bool __openOnHover
271 property bool pressed271 property bool pressed
272Panel 1.1
273Panel
274 property int animationDuration
272DatePicker 0.1 1.0275DatePicker 0.1 1.0
273StyledItem276StyledItem
274 property string mode277 property string mode
275278
=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml 2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Panel.qml 2014-06-16 09:16:00 +0000
@@ -171,6 +171,12 @@
171 */171 */
172 property int align: Qt.AlignBottom172 property int align: Qt.AlignBottom
173173
174 /* !
175 The property defines the swipe in/out speed of the panel.
176 The default value is \b UbuntuAnimation.FastDuration.
177 */
178 property int animationDuration: Toolkit.UbuntuAnimation.FastDuration
179
174 /*!180 /*!
175 When opened, the panel is visible, otherwise it is hidden.181 When opened, the panel is visible, otherwise it is hidden.
176 Use edge swipes to open/close the panel.182 Use edge swipes to open/close the panel.
@@ -402,7 +408,7 @@
402 The duration in milliseconds of sliding in or out transitions when opening, closing, and showing the hint.408 The duration in milliseconds of sliding in or out transitions when opening, closing, and showing the hint.
403 Default value: 250409 Default value: 250
404 */410 */
405 property real transitionDuration: panel.animate ? Toolkit.UbuntuAnimation.FastDuration : 0411 property real transitionDuration: panel.animate ? panel.animationDuration : 0
406412
407 property string previousState: ""413 property string previousState: ""
408 property int movingDelta414 property int movingDelta
409415
=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir 2014-05-28 18:08:33 +0000
+++ modules/Ubuntu/Components/qmldir 2014-06-16 09:16:00 +0000
@@ -92,3 +92,4 @@
9292
93#version 1.193#version 1.1
94ComboButton 1.1 ComboButton.qml94ComboButton 1.1 ComboButton.qml
95Panel 1.1 Panel.qml
9596
=== modified file 'po/ca.po'
--- po/ca.po 2014-06-04 06:28:51 +0000
+++ po/ca.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/de.po'
--- po/de.po 2014-06-04 06:28:51 +0000
+++ po/de.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/es.po'
--- po/es.po 2014-06-04 06:28:51 +0000
+++ po/es.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/fi.po'
--- po/fi.po 2014-06-04 06:28:51 +0000
+++ po/fi.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/fr.po'
--- po/fr.po 2014-06-04 06:28:51 +0000
+++ po/fr.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/gl.po'
--- po/gl.po 2014-06-04 06:28:51 +0000
+++ po/gl.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/he.po'
--- po/he.po 2014-06-04 06:28:51 +0000
+++ po/he.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/hu.po'
--- po/hu.po 2014-06-04 06:28:51 +0000
+++ po/hu.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/ko.po'
--- po/ko.po 2014-06-04 06:28:51 +0000
+++ po/ko.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/my.po'
--- po/my.po 2014-06-04 06:28:51 +0000
+++ po/my.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/nl.po'
--- po/nl.po 2014-06-04 06:28:51 +0000
+++ po/nl.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/oc.po'
--- po/oc.po 2014-06-04 06:28:51 +0000
+++ po/oc.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/pt_BR.po'
--- po/pt_BR.po 2014-06-04 06:28:51 +0000
+++ po/pt_BR.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/sv.po'
--- po/sv.po 2014-06-04 06:28:51 +0000
+++ po/sv.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"
2222
=== modified file 'po/uk.po'
--- po/uk.po 2014-06-04 06:28:51 +0000
+++ po/uk.po 2014-06-16 09:16:00 +0000
@@ -14,8 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"17"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
18"X-Generator: Launchpad (build 17031)\n"18"X-Generator: Launchpad (build 17041)\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
21msgid "NumberAnimation"21msgid "NumberAnimation"

Subscribers

People subscribed via source and target branches