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

Proposed by Nekhelesh Ramananthan on 2014-06-15
Status: Rejected
Rejected by: Zsombor Egri on 2014-07-11
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 on 2014-06-16
Nekhelesh Ramananthan (community) Disapprove on 2014-06-16
Zsombor Egri 2014-06-15 Needs Fixing on 2014-06-16
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.
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
1033. By Nekhelesh Ramananthan on 2014-06-16

Changed property name to animationDuration

1034. By Nekhelesh Ramananthan on 2014-06-16

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

1035. By Nekhelesh Ramananthan on 2014-06-16

Added 1.1 change in the qmldir as well

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.

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

Unmerged revisions

1035. By Nekhelesh Ramananthan on 2014-06-16

Added 1.1 change in the qmldir as well

1034. By Nekhelesh Ramananthan on 2014-06-16

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

1033. By Nekhelesh Ramananthan on 2014-06-16

Changed property name to animationDuration

1032. By Nekhelesh Ramananthan on 2014-06-15

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
1=== modified file 'components.api'
2--- components.api 2014-05-28 18:08:33 +0000
3+++ components.api 2014-06-16 09:16:00 +0000
4@@ -269,6 +269,9 @@
5 property bool __closeOnContentsClicks
6 property bool __openOnHover
7 property bool pressed
8+Panel 1.1
9+Panel
10+ property int animationDuration
11 DatePicker 0.1 1.0
12 StyledItem
13 property string mode
14
15=== modified file 'modules/Ubuntu/Components/Panel.qml'
16--- modules/Ubuntu/Components/Panel.qml 2014-04-25 12:53:58 +0000
17+++ modules/Ubuntu/Components/Panel.qml 2014-06-16 09:16:00 +0000
18@@ -171,6 +171,12 @@
19 */
20 property int align: Qt.AlignBottom
21
22+ /* !
23+ The property defines the swipe in/out speed of the panel.
24+ The default value is \b UbuntuAnimation.FastDuration.
25+ */
26+ property int animationDuration: Toolkit.UbuntuAnimation.FastDuration
27+
28 /*!
29 When opened, the panel is visible, otherwise it is hidden.
30 Use edge swipes to open/close the panel.
31@@ -402,7 +408,7 @@
32 The duration in milliseconds of sliding in or out transitions when opening, closing, and showing the hint.
33 Default value: 250
34 */
35- property real transitionDuration: panel.animate ? Toolkit.UbuntuAnimation.FastDuration : 0
36+ property real transitionDuration: panel.animate ? panel.animationDuration : 0
37
38 property string previousState: ""
39 property int movingDelta
40
41=== modified file 'modules/Ubuntu/Components/qmldir'
42--- modules/Ubuntu/Components/qmldir 2014-05-28 18:08:33 +0000
43+++ modules/Ubuntu/Components/qmldir 2014-06-16 09:16:00 +0000
44@@ -92,3 +92,4 @@
45
46 #version 1.1
47 ComboButton 1.1 ComboButton.qml
48+Panel 1.1 Panel.qml
49
50=== modified file 'po/ca.po'
51--- po/ca.po 2014-06-04 06:28:51 +0000
52+++ po/ca.po 2014-06-16 09:16:00 +0000
53@@ -14,8 +14,8 @@
54 "MIME-Version: 1.0\n"
55 "Content-Type: text/plain; charset=UTF-8\n"
56 "Content-Transfer-Encoding: 8bit\n"
57-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
58-"X-Generator: Launchpad (build 17031)\n"
59+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
60+"X-Generator: Launchpad (build 17041)\n"
61
62 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
63 msgid "NumberAnimation"
64
65=== modified file 'po/de.po'
66--- po/de.po 2014-06-04 06:28:51 +0000
67+++ po/de.po 2014-06-16 09:16:00 +0000
68@@ -14,8 +14,8 @@
69 "MIME-Version: 1.0\n"
70 "Content-Type: text/plain; charset=UTF-8\n"
71 "Content-Transfer-Encoding: 8bit\n"
72-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
73-"X-Generator: Launchpad (build 17031)\n"
74+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
75+"X-Generator: Launchpad (build 17041)\n"
76
77 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
78 msgid "NumberAnimation"
79
80=== modified file 'po/es.po'
81--- po/es.po 2014-06-04 06:28:51 +0000
82+++ po/es.po 2014-06-16 09:16:00 +0000
83@@ -14,8 +14,8 @@
84 "MIME-Version: 1.0\n"
85 "Content-Type: text/plain; charset=UTF-8\n"
86 "Content-Transfer-Encoding: 8bit\n"
87-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
88-"X-Generator: Launchpad (build 17031)\n"
89+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
90+"X-Generator: Launchpad (build 17041)\n"
91
92 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
93 msgid "NumberAnimation"
94
95=== modified file 'po/fi.po'
96--- po/fi.po 2014-06-04 06:28:51 +0000
97+++ po/fi.po 2014-06-16 09:16:00 +0000
98@@ -14,8 +14,8 @@
99 "MIME-Version: 1.0\n"
100 "Content-Type: text/plain; charset=UTF-8\n"
101 "Content-Transfer-Encoding: 8bit\n"
102-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
103-"X-Generator: Launchpad (build 17031)\n"
104+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
105+"X-Generator: Launchpad (build 17041)\n"
106
107 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
108 msgid "NumberAnimation"
109
110=== modified file 'po/fr.po'
111--- po/fr.po 2014-06-04 06:28:51 +0000
112+++ po/fr.po 2014-06-16 09:16:00 +0000
113@@ -14,8 +14,8 @@
114 "MIME-Version: 1.0\n"
115 "Content-Type: text/plain; charset=UTF-8\n"
116 "Content-Transfer-Encoding: 8bit\n"
117-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
118-"X-Generator: Launchpad (build 17031)\n"
119+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
120+"X-Generator: Launchpad (build 17041)\n"
121
122 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
123 msgid "NumberAnimation"
124
125=== modified file 'po/gl.po'
126--- po/gl.po 2014-06-04 06:28:51 +0000
127+++ po/gl.po 2014-06-16 09:16:00 +0000
128@@ -14,8 +14,8 @@
129 "MIME-Version: 1.0\n"
130 "Content-Type: text/plain; charset=UTF-8\n"
131 "Content-Transfer-Encoding: 8bit\n"
132-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
133-"X-Generator: Launchpad (build 17031)\n"
134+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
135+"X-Generator: Launchpad (build 17041)\n"
136
137 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
138 msgid "NumberAnimation"
139
140=== modified file 'po/he.po'
141--- po/he.po 2014-06-04 06:28:51 +0000
142+++ po/he.po 2014-06-16 09:16:00 +0000
143@@ -14,8 +14,8 @@
144 "MIME-Version: 1.0\n"
145 "Content-Type: text/plain; charset=UTF-8\n"
146 "Content-Transfer-Encoding: 8bit\n"
147-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
148-"X-Generator: Launchpad (build 17031)\n"
149+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
150+"X-Generator: Launchpad (build 17041)\n"
151
152 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
153 msgid "NumberAnimation"
154
155=== modified file 'po/hu.po'
156--- po/hu.po 2014-06-04 06:28:51 +0000
157+++ po/hu.po 2014-06-16 09:16:00 +0000
158@@ -14,8 +14,8 @@
159 "MIME-Version: 1.0\n"
160 "Content-Type: text/plain; charset=UTF-8\n"
161 "Content-Transfer-Encoding: 8bit\n"
162-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
163-"X-Generator: Launchpad (build 17031)\n"
164+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
165+"X-Generator: Launchpad (build 17041)\n"
166
167 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
168 msgid "NumberAnimation"
169
170=== modified file 'po/ko.po'
171--- po/ko.po 2014-06-04 06:28:51 +0000
172+++ po/ko.po 2014-06-16 09:16:00 +0000
173@@ -14,8 +14,8 @@
174 "MIME-Version: 1.0\n"
175 "Content-Type: text/plain; charset=UTF-8\n"
176 "Content-Transfer-Encoding: 8bit\n"
177-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
178-"X-Generator: Launchpad (build 17031)\n"
179+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
180+"X-Generator: Launchpad (build 17041)\n"
181
182 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
183 msgid "NumberAnimation"
184
185=== modified file 'po/my.po'
186--- po/my.po 2014-06-04 06:28:51 +0000
187+++ po/my.po 2014-06-16 09:16:00 +0000
188@@ -14,8 +14,8 @@
189 "MIME-Version: 1.0\n"
190 "Content-Type: text/plain; charset=UTF-8\n"
191 "Content-Transfer-Encoding: 8bit\n"
192-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
193-"X-Generator: Launchpad (build 17031)\n"
194+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
195+"X-Generator: Launchpad (build 17041)\n"
196
197 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
198 msgid "NumberAnimation"
199
200=== modified file 'po/nl.po'
201--- po/nl.po 2014-06-04 06:28:51 +0000
202+++ po/nl.po 2014-06-16 09:16:00 +0000
203@@ -14,8 +14,8 @@
204 "MIME-Version: 1.0\n"
205 "Content-Type: text/plain; charset=UTF-8\n"
206 "Content-Transfer-Encoding: 8bit\n"
207-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
208-"X-Generator: Launchpad (build 17031)\n"
209+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
210+"X-Generator: Launchpad (build 17041)\n"
211
212 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
213 msgid "NumberAnimation"
214
215=== modified file 'po/oc.po'
216--- po/oc.po 2014-06-04 06:28:51 +0000
217+++ po/oc.po 2014-06-16 09:16:00 +0000
218@@ -14,8 +14,8 @@
219 "MIME-Version: 1.0\n"
220 "Content-Type: text/plain; charset=UTF-8\n"
221 "Content-Transfer-Encoding: 8bit\n"
222-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
223-"X-Generator: Launchpad (build 17031)\n"
224+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
225+"X-Generator: Launchpad (build 17041)\n"
226
227 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
228 msgid "NumberAnimation"
229
230=== modified file 'po/pt_BR.po'
231--- po/pt_BR.po 2014-06-04 06:28:51 +0000
232+++ po/pt_BR.po 2014-06-16 09:16:00 +0000
233@@ -14,8 +14,8 @@
234 "MIME-Version: 1.0\n"
235 "Content-Type: text/plain; charset=UTF-8\n"
236 "Content-Transfer-Encoding: 8bit\n"
237-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
238-"X-Generator: Launchpad (build 17031)\n"
239+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
240+"X-Generator: Launchpad (build 17041)\n"
241
242 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
243 msgid "NumberAnimation"
244
245=== modified file 'po/sv.po'
246--- po/sv.po 2014-06-04 06:28:51 +0000
247+++ po/sv.po 2014-06-16 09:16:00 +0000
248@@ -14,8 +14,8 @@
249 "MIME-Version: 1.0\n"
250 "Content-Type: text/plain; charset=UTF-8\n"
251 "Content-Transfer-Encoding: 8bit\n"
252-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
253-"X-Generator: Launchpad (build 17031)\n"
254+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
255+"X-Generator: Launchpad (build 17041)\n"
256
257 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
258 msgid "NumberAnimation"
259
260=== modified file 'po/uk.po'
261--- po/uk.po 2014-06-04 06:28:51 +0000
262+++ po/uk.po 2014-06-16 09:16:00 +0000
263@@ -14,8 +14,8 @@
264 "MIME-Version: 1.0\n"
265 "Content-Type: text/plain; charset=UTF-8\n"
266 "Content-Transfer-Encoding: 8bit\n"
267-"X-Launchpad-Export-Date: 2014-06-04 06:28+0000\n"
268-"X-Generator: Launchpad (build 17031)\n"
269+"X-Launchpad-Export-Date: 2014-06-12 06:32+0000\n"
270+"X-Generator: Launchpad (build 17041)\n"
271
272 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
273 msgid "NumberAnimation"

Subscribers

People subscribed via source and target branches