Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/new-bottom-edge into lp:ubuntu-clock-app

  1. new-bottom-edge
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan on 2016-02-25
Status: Merged
Approved by: Bartosz Kosiorek on 2016-02-25
Approved revision: 453
Merged at revision: 444
Proposed branch: lp:~nik90/ubuntu-clock-app/new-bottom-edge
Merge into: lp:ubuntu-clock-app
Diff against target: 1940 lines (+252/-771)
73 files modified
app/MainPage.qml (+23/-7)
app/alarm/AlarmDelegate.qml (+1/-1)
app/alarm/AlarmLabel.qml (+1/-1)
app/alarm/AlarmList.qml (+3/-3)
app/alarm/AlarmModelComponent.qml (+1/-1)
app/alarm/AlarmPage.qml (+87/-84)
app/alarm/AlarmRepeat.qml (+1/-1)
app/alarm/AlarmSettingsPage.qml (+1/-1)
app/alarm/AlarmUtils.qml (+1/-55)
app/alarm/EditAlarmPage.qml (+20/-16)
app/alarm/SoundPeerPicker.qml (+1/-1)
app/clock/ClockPage.qml (+3/-3)
app/clock/MainClock.qml (+1/-1)
app/components/ActionIcon.qml (+1/-1)
app/components/AnalogMode.qml (+1/-1)
app/components/AnalogShadow.qml (+1/-1)
app/components/Clock.qml (+3/-3)
app/components/ClockCircle.qml (+1/-1)
app/components/DigitalMode.qml (+1/-1)
app/components/DigitalShadow.qml (+1/-1)
app/components/EmptyState.qml (+1/-1)
app/components/ExpandableListItem.qml (+1/-1)
app/components/HeaderNavigation.qml (+1/-1)
app/components/Shadow.qml (+1/-1)
app/stopwatch/LapListView.qml (+1/-1)
app/stopwatch/StopwatchFace.qml (+1/-1)
app/stopwatch/StopwatchPage.qml (+1/-1)
app/ubuntu-clock-app.qml (+1/-3)
app/upstreamcomponents/CMakeLists.txt (+0/-2)
app/upstreamcomponents/FakeHeader.qml (+0/-39)
app/upstreamcomponents/PageWithBottomEdge.qml (+0/-449)
app/upstreamcomponents/README.components (+0/-4)
app/worldclock/AddWorldCityButton.qml (+1/-1)
app/worldclock/UserWorldCityDelegate.qml (+2/-1)
app/worldclock/UserWorldCityList.qml (+3/-2)
app/worldclock/WorldCityList.qml (+1/-1)
backend/modules/Alarm/backend.cpp (+1/-1)
backend/modules/Alarm/backend.h (+1/-1)
backend/modules/Alarm/settings.cpp (+1/-1)
backend/modules/Alarm/settings.h (+1/-1)
backend/modules/Alarm/sound.cpp (+1/-1)
backend/modules/Alarm/sound.h (+1/-1)
backend/modules/Stopwatch/backend.cpp (+1/-1)
backend/modules/Stopwatch/backend.h (+1/-1)
backend/modules/Stopwatch/engine.cpp (+2/-2)
backend/modules/Stopwatch/engine.h (+2/-2)
backend/modules/Stopwatch/formattime.cpp (+1/-1)
backend/modules/Stopwatch/formattime.h (+1/-1)
backend/modules/WorldClock/backend.cpp (+1/-1)
backend/modules/WorldClock/backend.h (+1/-1)
backend/modules/WorldClock/datetime.cpp (+1/-1)
backend/modules/WorldClock/datetime.h (+1/-1)
backend/modules/WorldClock/generictimezonemodel.cpp (+1/-1)
backend/modules/WorldClock/generictimezonemodel.h (+1/-1)
backend/modules/WorldClock/geolocation.cpp (+1/-1)
backend/modules/WorldClock/geolocation.h (+1/-1)
backend/modules/WorldClock/jsontimezonemodel.cpp (+1/-1)
backend/modules/WorldClock/jsontimezonemodel.h (+1/-1)
backend/modules/WorldClock/statictimezonemodel.cpp (+1/-1)
backend/modules/WorldClock/statictimezonemodel.h (+1/-1)
backend/modules/WorldClock/timezonemodel.cpp (+1/-1)
backend/modules/WorldClock/timezonemodel.h (+1/-1)
debian/changelog (+16/-0)
po/com.ubuntu.clock.pot (+31/-41)
tests/unit/ClockTestCase.qml (+1/-1)
tests/unit/MockClockApp.qml (+1/-1)
tests/unit/tst_alarm.qml (+1/-1)
tests/unit/tst_alarmLabel.qml (+1/-1)
tests/unit/tst_alarmRepeat.qml (+1/-1)
tests/unit/tst_alarmSound.qml (+1/-1)
tests/unit/tst_alarmUtils.qml (+1/-1)
tests/unit/tst_stopwatchUtils.qml (+1/-1)
tests/unit/tst_worldClock.qml (+1/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/new-bottom-edge
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-02-25
Bartosz Kosiorek 2016-02-25 Approve on 2016-02-25
Review via email: mp+287236@code.launchpad.net

Commit Message

- Use the new bottom edge
- Updated copyright years of all files
- Updated debian changelog

Description of the Change

Use the new bottom edge

The new SDK Bottom edge allows us to remove the PageWithBottomEdge custom component.

To post a comment you must log in.
lp:~nik90/ubuntu-clock-app/new-bottom-edge updated on 2016-02-25
446. By Nekhelesh Ramananthan on 2016-02-25

Removed PageWithBottomEdge upstream component

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/new-bottom-edge updated on 2016-02-25
447. By Nekhelesh Ramananthan on 2016-02-25

Updated copyright years

448. By Nekhelesh Ramananthan on 2016-02-25

Updated debian changelog

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/new-bottom-edge updated on 2016-02-25
449. By Nekhelesh Ramananthan on 2016-02-25

Updated cmake file

450. By Nekhelesh Ramananthan on 2016-02-25

Make hint text translatable

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/new-bottom-edge updated on 2016-02-25
451. By Nekhelesh Ramananthan on 2016-02-25

Show hint for two seconds at app startup

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/new-bottom-edge updated on 2016-02-25
452. By Nekhelesh Ramananthan on 2016-02-25

Merged lp:ubuntu-clock-app

453. By Nekhelesh Ramananthan on 2016-02-25

Updated debian changelog

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

It is working perfectly for me.
Thanks.

review: Approve
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/MainPage.qml'
2--- app/MainPage.qml 2016-02-20 08:13:21 +0000
3+++ app/MainPage.qml 2016-02-25 23:11:58 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2015 Canonical Ltd
7+ * Copyright (C) 2015-2016 Canonical Ltd
8 *
9 * This file is part of Ubuntu Clock App
10 *
11@@ -26,17 +26,17 @@
12 import "stopwatch"
13 import "components"
14
15-PageWithBottomEdge {
16+Page {
17 id: _mainPage
18 objectName: "mainPage"
19
20- // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2015:10:05:16:10:15"
21+ // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2016:10:05:16:10:15"
22 property string notLocalizedDateTimeString
23
24 // String with localized time, eg.: "4:10 PM"
25 property string localizedTimeString
26
27- // String with localized date, eg.: "Thursday, 17 September 2015"
28+ // String with localized date, eg.: "Thursday, 17 September 2016"
29 property string localizedDateString
30
31 // Property to keep track of an app cold start status
32@@ -49,9 +49,25 @@
33 property var alarmModel
34
35 flickable: null
36- bottomEdgeTitle: _mainPage.visible ? alarmUtils.set_bottom_edge_title(alarmModel, notLocalizedDateTimeString)
37- : i18n.tr("No active alarms")
38- bottomEdgePageComponent: AlarmPage {}
39+
40+ Timer {
41+ id: hideBottomEdgeHintTimer
42+ interval: 3000
43+ onTriggered: bottomEdge.hint.status = BottomEdgeHint.Inactive
44+ }
45+
46+ BottomEdge {
47+ id: bottomEdge
48+ height: parent.height
49+ hint.iconName: "alarm-clock"
50+ hint.text: i18n.tr("Alarms")
51+ hint.status: BottomEdgeHint.Active
52+ contentComponent: AlarmPage {
53+ width: bottomEdge.width
54+ height: bottomEdge.height
55+ }
56+ Component.onCompleted: hideBottomEdgeHintTimer.start()
57+ }
58
59 AlarmUtils {
60 id: alarmUtils
61
62=== modified file 'app/alarm/AlarmDelegate.qml'
63--- app/alarm/AlarmDelegate.qml 2016-02-16 15:51:20 +0000
64+++ app/alarm/AlarmDelegate.qml 2016-02-25 23:11:58 +0000
65@@ -1,5 +1,5 @@
66 /*
67- * Copyright (C) 2014-2015 Canonical Ltd
68+ * Copyright (C) 2014-2016 Canonical Ltd
69 *
70 * This file is part of Ubuntu Clock App
71 *
72
73=== modified file 'app/alarm/AlarmLabel.qml'
74--- app/alarm/AlarmLabel.qml 2015-10-22 16:49:23 +0000
75+++ app/alarm/AlarmLabel.qml 2016-02-25 23:11:58 +0000
76@@ -1,5 +1,5 @@
77 /*
78- * Copyright (C) 2014-2015 Canonical Ltd
79+ * Copyright (C) 2014-2016 Canonical Ltd
80 *
81 * This file is part of Ubuntu Clock App
82 *
83
84=== modified file 'app/alarm/AlarmList.qml'
85--- app/alarm/AlarmList.qml 2015-10-22 16:49:23 +0000
86+++ app/alarm/AlarmList.qml 2016-02-25 23:11:58 +0000
87@@ -1,5 +1,5 @@
88 /*
89- * Copyright (C) 2014-2015 Canonical Ltd
90+ * Copyright (C) 2014-2016 Canonical Ltd
91 *
92 * This file is part of Ubuntu Clock App
93 *
94@@ -31,7 +31,7 @@
95 signal selectAll()
96
97 clip: true
98- anchors.fill: parent
99+ currentIndex: -1
100
101 Timer {
102 id: alarmTimer
103@@ -71,7 +71,7 @@
104 if (selectMode) {
105 selected = !selected
106 } else {
107- pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
108+ mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
109 }
110 }
111
112
113=== modified file 'app/alarm/AlarmModelComponent.qml'
114--- app/alarm/AlarmModelComponent.qml 2015-10-22 16:49:23 +0000
115+++ app/alarm/AlarmModelComponent.qml 2016-02-25 23:11:58 +0000
116@@ -1,5 +1,5 @@
117 /*
118- * Copyright (C) 2014-2015 Canonical Ltd
119+ * Copyright (C) 2014-2016 Canonical Ltd
120 *
121 * This file is part of Ubuntu Clock App
122 *
123
124=== modified file 'app/alarm/AlarmPage.qml'
125--- app/alarm/AlarmPage.qml 2015-10-22 16:49:23 +0000
126+++ app/alarm/AlarmPage.qml 2016-02-25 23:11:58 +0000
127@@ -1,5 +1,5 @@
128 /*
129- * Copyright (C) 2014-2015 Canonical Ltd
130+ * Copyright (C) 2014-2016 Canonical Ltd
131 *
132 * This file is part of Ubuntu Clock App
133 *
134@@ -24,102 +24,105 @@
135
136 readonly property bool isAlarmPage: true
137
138- title: i18n.tr("Alarms")
139 objectName: 'AlarmPage'
140- flickable: null
141+ header: standardHeader
142
143 Component.onCompleted: console.log("[LOG]: Alarm Page loaded")
144
145- states: [
146- PageHeadState {
147- name: "default"
148- head: alarmPage.head
149- when: !alarmListView.ViewItems.selectMode
150-
151- backAction: Action {
152- iconName: "down"
153- text: i18n.tr("Back")
154- onTriggered: {
155- pageStack.pop()
156- }
157- }
158-
159- actions: [
160- Action {
161- objectName: "addAlarmAction"
162- iconName: "add"
163- text: i18n.tr("Alarm")
164- onTriggered: {
165- pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
166- }
167- }
168- ]
169- },
170-
171- PageHeadState {
172- name: "selection"
173- head: alarmPage.head
174- when: alarmListView.ViewItems.selectMode
175-
176- backAction: Action {
177+ PageHeader {
178+ id: standardHeader
179+ title: i18n.tr("Alarms")
180+ leadingActionBar.actions: [
181+ Action {
182+ text: "close"
183+ iconName: "go-down"
184+ onTriggered: {
185+ bottomEdge.collapse()
186+ }
187+ }
188+ ]
189+ trailingActionBar.actions: [
190+ Action {
191+ objectName: "addAlarmAction"
192+ iconName: "add"
193+ text: i18n.tr("Alarm")
194+ onTriggered: {
195+ mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
196+ }
197+ }
198+ ]
199+ }
200+
201+ PageHeader {
202+ id: selectionHeader
203+ visible: alarmListView.ViewItems.selectMode
204+ leadingActionBar.actions: [
205+ Action {
206 iconName: "back"
207 text: i18n.tr("Back")
208 onTriggered: {
209+ alarmPage.header = standardHeader
210 alarmListView.ViewItems.selectMode = false
211 }
212 }
213-
214- actions: [
215- Action {
216- text: {
217- if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
218- return i18n.tr("Select None")
219- } else {
220- return i18n.tr("Select All")
221- }
222- }
223-
224- iconSource: {
225- if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
226- return Qt.resolvedUrl("../graphics/select-none.svg")
227- } else {
228- return Qt.resolvedUrl("../graphics/select.svg")
229- }
230- }
231-
232- onTriggered: {
233- if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
234- alarmListView.clearSelection()
235- } else {
236- alarmListView.selectAll()
237- }
238- }
239- },
240-
241- Action {
242- iconName: "delete"
243- text: i18n.tr("Delete")
244- enabled: alarmListView.ViewItems.selectedIndices.length !== 0
245-
246- onTriggered: {
247- var items = alarmListView.ViewItems.selectedIndices
248-
249- for(var i=0; i < alarmListView.ViewItems.selectedIndices.length; i++) {
250- var alarm = alarmModel.get(alarmListView.ViewItems.selectedIndices[i])
251- alarm.cancel()
252- }
253-
254- alarmListView.closeSelection()
255- }
256- }
257- ]
258- }
259- ]
260+ ]
261+
262+ trailingActionBar.actions: [
263+ Action {
264+ text: {
265+ if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
266+ return i18n.tr("Select None")
267+ } else {
268+ return i18n.tr("Select All")
269+ }
270+ }
271+
272+ iconSource: {
273+ if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
274+ return Qt.resolvedUrl("../graphics/select-none.svg")
275+ } else {
276+ return Qt.resolvedUrl("../graphics/select.svg")
277+ }
278+ }
279+
280+ onTriggered: {
281+ if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
282+ alarmListView.clearSelection()
283+ } else {
284+ alarmListView.selectAll()
285+ }
286+ }
287+ },
288+
289+ Action {
290+ iconName: "delete"
291+ text: i18n.tr("Delete")
292+ enabled: alarmListView.ViewItems.selectedIndices.length !== 0
293+
294+ onTriggered: {
295+ var items = alarmListView.ViewItems.selectedIndices
296+
297+ for(var i=0; i < alarmListView.ViewItems.selectedIndices.length; i++) {
298+ var alarm = alarmModel.get(alarmListView.ViewItems.selectedIndices[i])
299+ alarm.cancel()
300+ }
301+
302+ alarmListView.closeSelection()
303+ }
304+ }
305+ ]
306+ }
307
308 AlarmList {
309 id: alarmListView
310 model: alarmModel
311- anchors.fill: parent
312+ anchors {
313+ top: alarmPage.header.bottom
314+ left: parent.left
315+ right: parent.right
316+ bottom: parent.bottom
317+ }
318+
319 localTime: {
320 return new Date
321 (
322@@ -137,7 +140,7 @@
323 Loader {
324 id: emptyStateLoader
325 anchors {
326- top: parent.top
327+ top: alarmPage.header.bottom
328 topMargin: units.gu(5)
329 left: parent.left
330 right: parent.right
331
332=== modified file 'app/alarm/AlarmRepeat.qml'
333--- app/alarm/AlarmRepeat.qml 2016-02-15 21:09:17 +0000
334+++ app/alarm/AlarmRepeat.qml 2016-02-25 23:11:58 +0000
335@@ -1,5 +1,5 @@
336 /*
337- * Copyright (C) 2014-2015 Canonical Ltd
338+ * Copyright (C) 2014-2016 Canonical Ltd
339 *
340 * This file is part of Ubuntu Clock App
341 *
342
343=== modified file 'app/alarm/AlarmSettingsPage.qml'
344--- app/alarm/AlarmSettingsPage.qml 2016-02-15 20:02:54 +0000
345+++ app/alarm/AlarmSettingsPage.qml 2016-02-25 23:11:58 +0000
346@@ -1,5 +1,5 @@
347 /*
348- * Copyright (C) 2014-2015 Canonical Ltd
349+ * Copyright (C) 2014-2016 Canonical Ltd
350 *
351 * This file is part of Ubuntu Clock App
352 *
353
354=== modified file 'app/alarm/AlarmUtils.qml'
355--- app/alarm/AlarmUtils.qml 2015-12-11 02:13:16 +0000
356+++ app/alarm/AlarmUtils.qml 2016-02-25 23:11:58 +0000
357@@ -1,5 +1,5 @@
358 /*
359- * Copyright (C) 2014-2015 Canonical Ltd
360+ * Copyright (C) 2014-2016 Canonical Ltd
361 *
362 * This file is part of Ubuntu Clock App
363 *
364@@ -50,39 +50,6 @@
365 }
366 }
367
368- // Function to set the bottom edge title with "Next Active in..."
369- function set_bottom_edge_title(alarmModel, clockTimeString) {
370- var bottom_edge_title = i18n.tr("No active alarms")
371-
372- var clockTime = new Date
373- (
374- clockTimeString.split(":")[0],
375- clockTimeString.split(":")[1] - 1,
376- clockTimeString.split(":")[2],
377- clockTimeString.split(":")[3],
378- clockTimeString.split(":")[4],
379- clockTimeString.split(":")[5],
380- 0
381- )
382- /*
383- Check if alarm model received is valid and has saved alarms and only
384- then proceed to find the next active alarm.
385- */
386- if (!alarmModel || !alarmModel.count) {
387- return bottom_edge_title
388- }
389-
390- var activeAlarmDate = _get_next_active_alarm(alarmModel, clockTime)
391-
392- // Return immediately if there are no active alarms found
393- if (!activeAlarmDate) {
394- return bottom_edge_title
395- }
396-
397- bottom_edge_title = i18n.tr("Next Alarm %1").arg(get_time_to_alarm(activeAlarmDate, clockTime))
398- return bottom_edge_title
399- }
400-
401 function get_utc_time(dateTime) {
402 return new Date(dateTime.getUTCFullYear(),
403 dateTime.getUTCMonth(),
404@@ -153,27 +120,6 @@
405 INTERNAL FUNCTIONS
406 */
407
408- /*
409- Function to get the next active alarm. This function ignores alarms in the
410- past and also iteratively looks through every alarm since the alarm model
411- does not always list the active alarms in chronological order.
412- */
413- function _get_next_active_alarm(alarmModel, clockTime) {
414- var activeAlarmDate = undefined
415-
416- for (var i=0; i<alarmModel.count; i++) {
417- var currentAlarm = alarmModel.get(i)
418- if (currentAlarm.enabled && currentAlarm.date > clockTime) {
419- if (activeAlarmDate === undefined ||
420- currentAlarm.date < activeAlarmDate) {
421- activeAlarmDate = currentAlarm.date
422- }
423- }
424- }
425-
426- return activeAlarmDate
427- }
428-
429 // Function to split time (in ms) into days, hours and minutes
430 function _split_time(totalTime) {
431 // increase by a minute, so we could make a nicer time
432
433=== modified file 'app/alarm/EditAlarmPage.qml'
434--- app/alarm/EditAlarmPage.qml 2016-02-17 22:19:15 +0000
435+++ app/alarm/EditAlarmPage.qml 2016-02-25 23:11:58 +0000
436@@ -1,5 +1,5 @@
437 /*
438- * Copyright (C) 2014-2015 Canonical Ltd
439+ * Copyright (C) 2014-2016 Canonical Ltd
440 *
441 * This file is part of Ubuntu Clock App
442 *
443@@ -31,22 +31,26 @@
444 property var tempAlarm
445 property bool isNewAlarm: true
446
447- title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
448 visible: false
449
450- head.actions: Action {
451- id: saveAlarmButton
452- iconName: "ok"
453- objectName: "saveAlarmAction"
454- text: i18n.tr("Alarm")
455- onTriggered: {
456- if(isNewAlarm) {
457- saveNewAlarm()
458- }
459- else {
460- updateAlarm()
461- }
462- }
463+ header: PageHeader {
464+ title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
465+ trailingActionBar.actions: [
466+ Action {
467+ id: saveAlarmButton
468+ iconName: "ok"
469+ objectName: "saveAlarmAction"
470+ text: i18n.tr("Alarm")
471+ onTriggered: {
472+ if(isNewAlarm) {
473+ saveNewAlarm()
474+ }
475+ else {
476+ updateAlarm()
477+ }
478+ }
479+ }
480+ ]
481 }
482
483 Component.onCompleted: {
484@@ -225,7 +229,7 @@
485 id: _alarmColumn
486
487 width: parent.width
488- anchors.top: parent.top
489+ anchors.top: _addAlarmPage.header.bottom
490
491 DatePicker {
492 id: _timePicker
493
494=== modified file 'app/alarm/SoundPeerPicker.qml'
495--- app/alarm/SoundPeerPicker.qml 2015-10-22 16:49:23 +0000
496+++ app/alarm/SoundPeerPicker.qml 2016-02-25 23:11:58 +0000
497@@ -1,5 +1,5 @@
498 /*
499- * Copyright (C) 2015 Canonical Ltd
500+ * Copyright (C) 2016 Canonical Ltd
501 *
502 * This file is part of Ubuntu Clock App
503 *
504
505=== modified file 'app/clock/ClockPage.qml'
506--- app/clock/ClockPage.qml 2016-02-18 14:47:46 +0000
507+++ app/clock/ClockPage.qml 2016-02-25 23:11:58 +0000
508@@ -1,5 +1,5 @@
509 /*
510- * Copyright (C) 2014-2015 Canonical Ltd
511+ * Copyright (C) 2014-2016 Canonical Ltd
512 *
513 * This file is part of Ubuntu Clock App
514 *
515@@ -31,13 +31,13 @@
516 // Property to keep track of the clock mode
517 property alias isDigital: clock.isDigital
518
519- // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2015:10:05:16:10:15"
520+ // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2016:10:05:16:10:15"
521 property string notLocalizedClockTimeString
522
523 // String with localized time, eg.: "4:10 PM"
524 property string localizedClockTimeString
525
526- // String with localized date, eg.: "Thursday, 17 September 2015"
527+ // String with localized date, eg.: "Thursday, 17 September 2016"
528 property string localizedClockDateString
529
530 // Property to keep track of app cold start status
531
532=== modified file 'app/clock/MainClock.qml'
533--- app/clock/MainClock.qml 2016-02-17 19:53:15 +0000
534+++ app/clock/MainClock.qml 2016-02-25 23:11:58 +0000
535@@ -1,5 +1,5 @@
536 /*
537- * Copyright (C) 2014-2015 Canonical Ltd
538+ * Copyright (C) 2014-2016 Canonical Ltd
539 *
540 * This file is part of Ubuntu Clock App
541 *
542
543=== modified file 'app/components/ActionIcon.qml'
544--- app/components/ActionIcon.qml 2016-02-15 16:00:47 +0000
545+++ app/components/ActionIcon.qml 2016-02-25 23:11:58 +0000
546@@ -1,5 +1,5 @@
547 /*
548- * Copyright (C) 2015 Canonical Ltd
549+ * Copyright (C) 2015-2016 Canonical Ltd
550 *
551 * This file is part of Ubuntu Clock App
552 *
553
554=== modified file 'app/components/AnalogMode.qml'
555--- app/components/AnalogMode.qml 2016-02-22 13:21:13 +0000
556+++ app/components/AnalogMode.qml 2016-02-25 23:11:58 +0000
557@@ -1,5 +1,5 @@
558 /*
559- * Copyright (C) 2014-2015 Canonical Ltd
560+ * Copyright (C) 2014-2016 Canonical Ltd
561 *
562 * This file is part of Ubuntu Clock App
563 *
564
565=== modified file 'app/components/AnalogShadow.qml'
566--- app/components/AnalogShadow.qml 2015-10-22 16:49:23 +0000
567+++ app/components/AnalogShadow.qml 2016-02-25 23:11:58 +0000
568@@ -1,5 +1,5 @@
569 /*
570- * Copyright (C) 2014-2015 Canonical Ltd
571+ * Copyright (C) 2014-2016 Canonical Ltd
572 *
573 * This file is part of Ubuntu Clock App
574 *
575
576=== modified file 'app/components/Clock.qml'
577--- app/components/Clock.qml 2016-02-15 17:05:25 +0000
578+++ app/components/Clock.qml 2016-02-25 23:11:58 +0000
579@@ -1,5 +1,5 @@
580 /*
581- * Copyright (C) 2014-2015 Canonical Ltd
582+ * Copyright (C) 2014-2016 Canonical Ltd
583 *
584 * This file is part of Ubuntu Clock App
585 *
586@@ -41,13 +41,13 @@
587 Item {
588 id: _clockContainer
589
590- // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2015:10:05:16:10:15"
591+ // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2016:10:05:16:10:15"
592 property string notLocalizedDateTimeString
593
594 // String with localized time, eg.: "4:10 PM"
595 property string localizedTimeString
596
597- // String with localized date, eg.: "Thursday, 17 September 2015"
598+ // String with localized date, eg.: "Thursday, 17 September 2016"
599 property string localizedDateString
600
601 // Property to keep track of the clock mode
602
603=== modified file 'app/components/ClockCircle.qml'
604--- app/components/ClockCircle.qml 2016-02-18 15:34:29 +0000
605+++ app/components/ClockCircle.qml 2016-02-25 23:11:58 +0000
606@@ -1,5 +1,5 @@
607 /*
608- * Copyright (C) 2014-2015 Canonical Ltd
609+ * Copyright (C) 2014-2016 Canonical Ltd
610 *
611 * This file is part of Ubuntu Clock App
612 *
613
614=== modified file 'app/components/DigitalMode.qml'
615--- app/components/DigitalMode.qml 2016-02-17 19:53:15 +0000
616+++ app/components/DigitalMode.qml 2016-02-25 23:11:58 +0000
617@@ -1,5 +1,5 @@
618 /*
619- * Copyright (C) 2014-2015 Canonical Ltd
620+ * Copyright (C) 2014-2016 Canonical Ltd
621 *
622 * This file is part of Ubuntu Clock App
623 *
624
625=== modified file 'app/components/DigitalShadow.qml'
626--- app/components/DigitalShadow.qml 2015-10-22 16:49:23 +0000
627+++ app/components/DigitalShadow.qml 2016-02-25 23:11:58 +0000
628@@ -1,5 +1,5 @@
629 /*
630- * Copyright (C) 2014-2015 Canonical Ltd
631+ * Copyright (C) 2014-2016 Canonical Ltd
632 *
633 * This file is part of Ubuntu Clock App
634 *
635
636=== modified file 'app/components/EmptyState.qml'
637--- app/components/EmptyState.qml 2016-02-16 17:29:34 +0000
638+++ app/components/EmptyState.qml 2016-02-25 23:11:58 +0000
639@@ -1,5 +1,5 @@
640 /*
641- * Copyright (C) 2014-2015 Canonical Ltd
642+ * Copyright (C) 2014-2016 Canonical Ltd
643 *
644 * This file is part of Ubuntu Clock App
645 *
646
647=== modified file 'app/components/ExpandableListItem.qml'
648--- app/components/ExpandableListItem.qml 2016-02-15 19:36:13 +0000
649+++ app/components/ExpandableListItem.qml 2016-02-25 23:11:58 +0000
650@@ -1,5 +1,5 @@
651 /*
652- * Copyright (C) 2015 Canonical Ltd
653+ * Copyright (C) 2015-2016 Canonical Ltd
654 *
655 * This file is part of Ubuntu Clock App
656 *
657
658=== modified file 'app/components/HeaderNavigation.qml'
659--- app/components/HeaderNavigation.qml 2016-02-17 22:19:15 +0000
660+++ app/components/HeaderNavigation.qml 2016-02-25 23:11:58 +0000
661@@ -1,5 +1,5 @@
662 /*
663- * Copyright (C) 2015 Canonical Ltd
664+ * Copyright (C) 2016 Canonical Ltd
665 *
666 * This file is part of Ubuntu Clock App
667 *
668
669=== modified file 'app/components/Shadow.qml'
670--- app/components/Shadow.qml 2015-10-22 16:49:23 +0000
671+++ app/components/Shadow.qml 2016-02-25 23:11:58 +0000
672@@ -1,5 +1,5 @@
673 /*
674- * Copyright (C) 2014-2015 Canonical Ltd
675+ * Copyright (C) 2014-2016 Canonical Ltd
676 *
677 * This file is part of Ubuntu Clock App
678 *
679
680=== modified file 'app/stopwatch/LapListView.qml'
681--- app/stopwatch/LapListView.qml 2016-02-17 22:19:15 +0000
682+++ app/stopwatch/LapListView.qml 2016-02-25 23:11:58 +0000
683@@ -1,5 +1,5 @@
684 /*
685- * Copyright (C) 2015 Canonical Ltd
686+ * Copyright (C) 2015-2016 Canonical Ltd
687 *
688 * This file is part of Ubuntu Clock App
689 *
690
691=== modified file 'app/stopwatch/StopwatchFace.qml'
692--- app/stopwatch/StopwatchFace.qml 2016-02-16 17:07:09 +0000
693+++ app/stopwatch/StopwatchFace.qml 2016-02-25 23:11:58 +0000
694@@ -1,5 +1,5 @@
695 /*
696- * Copyright (C) 2015 Canonical Ltd
697+ * Copyright (C) 2015-2016 Canonical Ltd
698 *
699 * This file is part of Ubuntu Clock App
700 *
701
702=== modified file 'app/stopwatch/StopwatchPage.qml'
703--- app/stopwatch/StopwatchPage.qml 2016-02-17 22:19:15 +0000
704+++ app/stopwatch/StopwatchPage.qml 2016-02-25 23:11:58 +0000
705@@ -1,5 +1,5 @@
706 /*
707- * Copyright (C) 2015 Canonical Ltd
708+ * Copyright (C) 2015-2016 Canonical Ltd
709 *
710 * This file is part of Ubuntu Clock App
711 *
712
713=== modified file 'app/ubuntu-clock-app.qml'
714--- app/ubuntu-clock-app.qml 2016-02-25 17:50:48 +0000
715+++ app/ubuntu-clock-app.qml 2016-02-25 23:11:58 +0000
716@@ -1,5 +1,5 @@
717 /*
718- * Copyright (C) 2014-2015 Canonical Ltd
719+ * Copyright (C) 2014-2016 Canonical Ltd
720 *
721 * This file is part of Ubuntu Clock App
722 *
723@@ -126,8 +126,6 @@
724 */
725
726 alarmModel: alarmModelLoader.item
727- bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready && alarmModelLoader.item.isReady && isClockPage
728-
729 /*
730 FIXME: When the upstream QT bug at
731 https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed
732
733=== modified file 'app/upstreamcomponents/CMakeLists.txt'
734--- app/upstreamcomponents/CMakeLists.txt 2015-08-29 01:27:20 +0000
735+++ app/upstreamcomponents/CMakeLists.txt 2016-02-25 23:11:58 +0000
736@@ -1,8 +1,6 @@
737 set(UPSTREAM_COMPONENTS_QML_JS_FILES
738- FakeHeader.qml
739 FastScroll.js
740 FastScroll.qml
741- PageWithBottomEdge.qml
742 )
743
744 # make the files visible in the qtcreator tree
745
746=== removed file 'app/upstreamcomponents/FakeHeader.qml'
747--- app/upstreamcomponents/FakeHeader.qml 2015-12-11 02:11:11 +0000
748+++ app/upstreamcomponents/FakeHeader.qml 1970-01-01 00:00:00 +0000
749@@ -1,39 +0,0 @@
750-/*
751- * Copyright (C) 2014-2015 Canonical Ltd
752- *
753- * This file is part of Ubuntu Clock App
754- *
755- * Ubuntu Clock App is free software: you can redistribute it and/or modify
756- * it under the terms of the GNU General Public License version 3 as
757- * published by the Free Software Foundation.
758- *
759- * Ubuntu Clock App is distributed in the hope that it will be useful,
760- * but WITHOUT ANY WARRANTY; without even the implied warranty of
761- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
762- * GNU General Public License for more details.
763- *
764- * You should have received a copy of the GNU General Public License
765- * along with this program. If not, see <http://www.gnu.org/licenses/>.
766- */
767-
768-import QtQuick 2.4
769-import Ubuntu.Components 1.3
770-
771-Column {
772- id: fakeHeader
773-
774- height: units.gu(6.125)
775-
776- Rectangle {
777- height: units.gu(6)
778- width: parent.width
779- color: Theme.palette.normal.background
780- }
781-
782- Rectangle {
783- color: "#C9C9C9"
784- height: units.gu(0.125)
785- anchors.left: parent.left
786- anchors.right: parent.right
787- }
788-}
789
790=== removed file 'app/upstreamcomponents/PageWithBottomEdge.qml'
791--- app/upstreamcomponents/PageWithBottomEdge.qml 2015-12-11 02:11:11 +0000
792+++ app/upstreamcomponents/PageWithBottomEdge.qml 1970-01-01 00:00:00 +0000
793@@ -1,449 +0,0 @@
794-/*
795- * Copyright (C) 2014 Canonical, Ltd.
796- *
797- * This program is free software; you can redistribute it and/or modify
798- * it under the terms of the GNU General Public License as published by
799- * the Free Software Foundation; version 3.
800- *
801- * This program is distributed in the hope that it will be useful,
802- * but WITHOUT ANY WARRANTY; without even the implied warranty of
803- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
804- * GNU General Public License for more details.
805- *
806- * You should have received a copy of the GNU General Public License
807- * along with this program. If not, see <http://www.gnu.org/licenses/>.
808- */
809-
810-/*
811- Example:
812-
813- MainView {
814- objectName: "mainView"
815-
816- applicationName: "com.ubuntu.developer.boiko.bottomedge"
817-
818- width: units.gu(100)
819- height: units.gu(75)
820-
821- Component {
822- id: pageComponent
823-
824- PageWithBottomEdge {
825- id: mainPage
826- title: i18n.tr("Main Page")
827-
828- Rectangle {
829- anchors.fill: parent
830- color: "white"
831- }
832-
833- bottomEdgePageComponent: Page {
834- title: "Contents"
835- anchors.fill: parent
836- //anchors.topMargin: contentsPage.flickable.contentY
837-
838- ListView {
839- anchors.fill: parent
840- model: 50
841- delegate: ListItems.Standard {
842- text: "One Content Item: " + index
843- }
844- }
845- }
846- bottomEdgeTitle: i18n.tr("Bottom edge action")
847- }
848- }
849-
850- PageStack {
851- id: stack
852- Component.onCompleted: stack.push(pageComponent)
853- }
854- }
855-
856-*/
857-
858-import QtQuick 2.4
859-import Ubuntu.Components 1.3
860-
861-Page {
862- id: page
863-
864- property alias bottomEdgePageComponent: edgeLoader.sourceComponent
865- property alias bottomEdgePageSource: edgeLoader.source
866- property alias bottomEdgeTitle: tipLabel.text
867- property bool bottomEdgeEnabled: true
868- property int bottomEdgeExpandThreshold: page.height * 0.2
869- property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
870- property bool reloadBottomEdgePage: true
871-
872- readonly property alias bottomEdgePage: edgeLoader.item
873- readonly property bool isReady: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active)
874- readonly property bool isCollapsed: (bottomEdge.y === page.height)
875- readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
876-
877- property bool _showEdgePageWhenReady: false
878- property int _areaWhenExpanded: 0
879-
880- signal bottomEdgeReleased()
881- signal bottomEdgeDismissed()
882-
883- function showBottomEdgePage(source, properties)
884- {
885- edgeLoader.setSource(source, properties)
886- _showEdgePageWhenReady = true
887- }
888-
889- function setBottomEdgePage(source, properties)
890- {
891- edgeLoader.setSource(source, properties)
892- }
893-
894- function _pushPage()
895- {
896- if (edgeLoader.status === Loader.Ready) {
897- edgeLoader.item.active = true
898- page.pageStack.push(edgeLoader.item)
899- if (edgeLoader.item.flickable) {
900- edgeLoader.item.flickable.contentY = -page.header.height
901- edgeLoader.item.flickable.returnToBounds()
902- }
903- if (edgeLoader.item.ready)
904- edgeLoader.item.ready()
905- }
906- }
907-
908-
909- Component.onCompleted: {
910- // avoid a binding on the expanded height value
911- var expandedHeight = height;
912- _areaWhenExpanded = expandedHeight;
913- }
914-
915- onActiveChanged: {
916- if (active) {
917- bottomEdge.state = "collapsed"
918- }
919- }
920-
921- onBottomEdgePageLoadedChanged: {
922- if (_showEdgePageWhenReady && bottomEdgePageLoaded) {
923- bottomEdge.state = "expanded"
924- _showEdgePageWhenReady = false
925- }
926- }
927-
928- Rectangle {
929- id: bgVisual
930-
931- color: "black"
932- anchors.fill: page
933- opacity: 0.7 * ((page.height - bottomEdge.y) / page.height)
934- z: 1
935- }
936-
937- UbuntuShape {
938- id: tip
939- objectName: "bottomEdgeTip"
940-
941- property bool hiden: (activeFocus === false) ||
942- ((bottomEdge.y - units.gu(1)) < tip.y)
943-
944- property bool isAnimating: true
945-
946- enabled: mouseArea.enabled
947- visible: page.bottomEdgeEnabled
948- anchors {
949- bottom: parent.bottom
950- horizontalCenter: bottomEdge.horizontalCenter
951- bottomMargin: hiden ? - height + units.gu(1) : -units.gu(1)
952- Behavior on bottomMargin {
953- SequentialAnimation {
954- // wait some msecs in case of the focus change again, to avoid flickering
955- PauseAnimation {
956- duration: 300
957- }
958- UbuntuNumberAnimation {
959- duration: UbuntuAnimation.SnapDuration
960- }
961- ScriptAction {
962- script: tip.isAnimating = false
963- }
964- }
965- }
966- }
967-
968- z: 1
969- width: tipLabel.paintedWidth + units.gu(6)
970- height: bottomEdge.tipHeight + units.gu(1)
971- backgroundColor: Theme.palette.normal.overlay
972- Label {
973- id: tipLabel
974-
975- anchors {
976- top: parent.top
977- left: parent.left
978- right: parent.right
979- }
980- height: bottomEdge.tipHeight
981- verticalAlignment: Text.AlignVCenter
982- horizontalAlignment: Text.AlignHCenter
983- opacity: tip.hiden ? 0.0 : 1.0
984- Behavior on opacity {
985- UbuntuNumberAnimation {
986- duration: UbuntuAnimation.SnapDuration
987- }
988- }
989- }
990- }
991-
992- Rectangle {
993- id: shadow
994-
995- anchors {
996- left: parent.left
997- right: parent.right
998- bottom: parent.bottom
999- }
1000- height: units.gu(1)
1001- z: 1
1002- opacity: 0.0
1003- gradient: Gradient {
1004- GradientStop { position: 0.0; color: "transparent" }
1005- GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
1006- }
1007- }
1008-
1009- MouseArea {
1010- id: mouseArea
1011-
1012- property real previousY: -1
1013- property string dragDirection: "None"
1014-
1015- preventStealing: true
1016- drag {
1017- axis: Drag.YAxis
1018- target: bottomEdge
1019- minimumY: bottomEdge.pageStartY
1020- maximumY: page.height
1021- }
1022- enabled: edgeLoader.status == Loader.Ready
1023- visible: page.bottomEdgeEnabled
1024-
1025- anchors {
1026- left: parent.left
1027- right: parent.right
1028- bottom: parent.bottom
1029- }
1030- height: bottomEdge.tipHeight
1031- z: 1
1032-
1033- onReleased: {
1034- page.bottomEdgeReleased()
1035- if ((dragDirection === "BottomToTop") &&
1036- bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
1037- bottomEdge.state = "expanded"
1038- } else {
1039- bottomEdge.state = "collapsed"
1040- }
1041- previousY = -1
1042- dragDirection = "None"
1043- }
1044-
1045- onPressed: {
1046- previousY = mouse.y
1047- tip.forceActiveFocus()
1048- }
1049-
1050- onMouseYChanged: {
1051- var yOffset = previousY - mouseY
1052- // skip if was a small move
1053- if (Math.abs(yOffset) <= units.gu(2)) {
1054- return
1055- }
1056- previousY = mouseY
1057- dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom"
1058- }
1059- }
1060-
1061- FakeHeader {
1062- id: fakeHeader
1063-
1064- anchors {
1065- left: parent.left
1066- right: parent.right
1067- }
1068- y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)
1069- z: bgVisual.z + 1
1070-
1071- Behavior on y {
1072- UbuntuNumberAnimation {
1073- duration: UbuntuAnimation.SnapDuration
1074- }
1075- }
1076- }
1077-
1078- Rectangle {
1079- id: bottomEdge
1080- objectName: "bottomEdge"
1081-
1082- readonly property int tipHeight: units.gu(3)
1083- readonly property int pageStartY: fakeHeader.height
1084-
1085- z: 1
1086- color: Theme.palette.normal.background
1087- clip: true
1088- anchors {
1089- left: parent.left
1090- right: parent.right
1091- }
1092- height: page.height
1093- y: height
1094-
1095- visible: !page.isCollapsed
1096- state: "collapsed"
1097- states: [
1098- State {
1099- name: "collapsed"
1100- PropertyChanges {
1101- target: bottomEdge
1102- y: bottomEdge.height
1103- }
1104- PropertyChanges {
1105- target: fakeHeader
1106- y: -fakeHeader.height
1107- }
1108- },
1109- State {
1110- name: "expanded"
1111- PropertyChanges {
1112- target: bottomEdge
1113- y: bottomEdge.pageStartY
1114- }
1115- PropertyChanges {
1116- target: fakeHeader
1117- y: 0
1118- }
1119- },
1120- State {
1121- name: "floating"
1122- when: mouseArea.drag.active
1123- PropertyChanges {
1124- target: shadow
1125- opacity: 1.0
1126- }
1127- }
1128- ]
1129-
1130- transitions: [
1131- Transition {
1132- to: "expanded"
1133- SequentialAnimation {
1134- alwaysRunToEnd: true
1135- ParallelAnimation {
1136- SmoothedAnimation {
1137- target: bottomEdge
1138- property: "y"
1139- duration: UbuntuAnimation.FastDuration
1140- easing.type: Easing.Linear
1141- }
1142- SmoothedAnimation {
1143- target: fakeHeader
1144- property: "y"
1145- duration: UbuntuAnimation.FastDuration
1146- easing.type: Easing.Linear
1147- }
1148- }
1149- SmoothedAnimation {
1150- target: edgeLoader
1151- property: "anchors.topMargin"
1152- to: - units.gu(4)
1153- duration: UbuntuAnimation.FastDuration
1154- easing.type: Easing.Linear
1155- }
1156- SmoothedAnimation {
1157- target: edgeLoader
1158- property: "anchors.topMargin"
1159- to: 0
1160- duration: UbuntuAnimation.FastDuration
1161- easing: UbuntuAnimation.StandardEasing
1162- }
1163- ScriptAction {
1164- script: page._pushPage()
1165- }
1166- }
1167- },
1168- Transition {
1169- from: "expanded"
1170- to: "collapsed"
1171- SequentialAnimation {
1172- alwaysRunToEnd: true
1173-
1174- ScriptAction {
1175- script: {
1176- Qt.inputMethod.hide()
1177- edgeLoader.item.parent = edgeLoader
1178- edgeLoader.item.anchors.fill = edgeLoader
1179- edgeLoader.item.active = false
1180- }
1181- }
1182- ParallelAnimation {
1183- SmoothedAnimation {
1184- target: bottomEdge
1185- property: "y"
1186- duration: UbuntuAnimation.SlowDuration
1187- }
1188- SmoothedAnimation {
1189- target: fakeHeader
1190- property: "y"
1191- duration: UbuntuAnimation.SlowDuration
1192- }
1193- }
1194- ScriptAction {
1195- script: {
1196- // destroy current bottom page
1197- if (page.reloadBottomEdgePage) {
1198- edgeLoader.active = false
1199- } else {
1200- tip.forceActiveFocus()
1201- }
1202-
1203- // notify
1204- page.bottomEdgeDismissed()
1205-
1206- edgeLoader.active = true
1207- }
1208- }
1209- }
1210- },
1211- Transition {
1212- from: "floating"
1213- to: "collapsed"
1214- UbuntuNumberAnimation {
1215- target: bottomEdge
1216- property: "opacity"
1217- }
1218- }
1219- ]
1220-
1221- Loader {
1222- id: edgeLoader
1223-
1224- asynchronous: true
1225- anchors.fill: parent
1226- //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
1227- Binding {
1228- target: edgeLoader.status === Loader.Ready ? edgeLoader : null
1229- property: "anchors.topMargin"
1230- value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
1231- when: !page.isReady
1232- }
1233-
1234- onLoaded: {
1235- tip.forceActiveFocus()
1236- if (page.isReady && edgeLoader.item.active !== true) {
1237- page._pushPage()
1238- }
1239- }
1240- }
1241- }
1242-}
1243
1244=== modified file 'app/upstreamcomponents/README.components'
1245--- app/upstreamcomponents/README.components 2015-08-29 01:27:20 +0000
1246+++ app/upstreamcomponents/README.components 2016-02-25 23:11:58 +0000
1247@@ -4,10 +4,6 @@
1248
1249 #### Links
1250
1251-PageWithBottomEdge.qml
1252-
1253-https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml
1254-
1255 FastScroll.js
1256
1257 https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/FastScroll.js
1258
1259=== modified file 'app/worldclock/AddWorldCityButton.qml'
1260--- app/worldclock/AddWorldCityButton.qml 2016-02-17 19:53:15 +0000
1261+++ app/worldclock/AddWorldCityButton.qml 2016-02-25 23:11:58 +0000
1262@@ -1,5 +1,5 @@
1263 /*
1264- * Copyright (C) 2014-2015 Canonical Ltd
1265+ * Copyright (C) 2014-2016 Canonical Ltd
1266 *
1267 * This file is part of Ubuntu Clock App
1268 *
1269
1270=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
1271--- app/worldclock/UserWorldCityDelegate.qml 2016-02-17 21:30:07 +0000
1272+++ app/worldclock/UserWorldCityDelegate.qml 2016-02-25 23:11:58 +0000
1273@@ -1,5 +1,5 @@
1274 /*
1275- * Copyright (C) 2014-2015 Canonical Ltd
1276+ * Copyright (C) 2014-2016 Canonical Ltd
1277 *
1278 * This file is part of Ubuntu Clock App
1279 *
1280@@ -33,6 +33,7 @@
1281
1282 height: units.gu(9)
1283 divider.visible: false
1284+ highlightColor: "Transparent"
1285
1286 Item {
1287 id: delegate
1288
1289=== modified file 'app/worldclock/UserWorldCityList.qml'
1290--- app/worldclock/UserWorldCityList.qml 2015-10-22 16:49:23 +0000
1291+++ app/worldclock/UserWorldCityList.qml 2016-02-25 23:11:58 +0000
1292@@ -1,5 +1,5 @@
1293 /*
1294- * Copyright (C) 2014-2015 Canonical Ltd
1295+ * Copyright (C) 2014-2016 Canonical Ltd
1296 *
1297 * This file is part of Ubuntu Clock App
1298 *
1299@@ -21,12 +21,13 @@
1300 import U1db 1.0 as U1db
1301 import Ubuntu.Components 1.3
1302
1303-ListView {
1304+UbuntuListView {
1305 id: worldCityColumn
1306 objectName: "userWorldCityRepeater"
1307
1308 clip: true
1309 anchors.fill: parent
1310+ currentIndex: -1
1311
1312 onFlickStarted: {
1313 forceActiveFocus()
1314
1315=== modified file 'app/worldclock/WorldCityList.qml'
1316--- app/worldclock/WorldCityList.qml 2016-02-25 18:41:20 +0000
1317+++ app/worldclock/WorldCityList.qml 2016-02-25 23:11:58 +0000
1318@@ -1,5 +1,5 @@
1319 /*
1320- * Copyright (C) 2014-2015 Canonical Ltd
1321+ * Copyright (C) 2014-2016 Canonical Ltd
1322 *
1323 * This file is part of Ubuntu Clock App
1324 *
1325
1326=== modified file 'backend/modules/Alarm/backend.cpp'
1327--- backend/modules/Alarm/backend.cpp 2015-08-26 23:35:50 +0000
1328+++ backend/modules/Alarm/backend.cpp 2016-02-25 23:11:58 +0000
1329@@ -1,5 +1,5 @@
1330 /*
1331- * Copyright (C) 2014-2015 Canonical Ltd
1332+ * Copyright (C) 2014-2016 Canonical Ltd
1333 *
1334 * This file is part of Ubuntu Clock App
1335 *
1336
1337=== modified file 'backend/modules/Alarm/backend.h'
1338--- backend/modules/Alarm/backend.h 2015-08-25 15:29:02 +0000
1339+++ backend/modules/Alarm/backend.h 2016-02-25 23:11:58 +0000
1340@@ -1,5 +1,5 @@
1341 /*
1342- * Copyright (C) 2014-2015 Canonical Ltd
1343+ * Copyright (C) 2014-2016 Canonical Ltd
1344 *
1345 * This file is part of Ubuntu Clock App
1346 *
1347
1348=== modified file 'backend/modules/Alarm/settings.cpp'
1349--- backend/modules/Alarm/settings.cpp 2015-08-25 15:29:02 +0000
1350+++ backend/modules/Alarm/settings.cpp 2016-02-25 23:11:58 +0000
1351@@ -1,5 +1,5 @@
1352 /*
1353- * Copyright (C) 2014-2015 Canonical Ltd
1354+ * Copyright (C) 2014-2016 Canonical Ltd
1355 *
1356 * This file is part of Ubuntu Clock App
1357 *
1358
1359=== modified file 'backend/modules/Alarm/settings.h'
1360--- backend/modules/Alarm/settings.h 2015-08-25 15:29:02 +0000
1361+++ backend/modules/Alarm/settings.h 2016-02-25 23:11:58 +0000
1362@@ -1,5 +1,5 @@
1363 /*
1364- * Copyright (C) 2014-2015 Canonical Ltd
1365+ * Copyright (C) 2014-2016 Canonical Ltd
1366 *
1367 * This file is part of Ubuntu Clock App
1368 *
1369
1370=== modified file 'backend/modules/Alarm/sound.cpp'
1371--- backend/modules/Alarm/sound.cpp 2015-08-25 15:41:50 +0000
1372+++ backend/modules/Alarm/sound.cpp 2016-02-25 23:11:58 +0000
1373@@ -1,5 +1,5 @@
1374 /*
1375- * Copyright (C) 2015 Canonical Ltd
1376+ * Copyright (C) 2015-2016 Canonical Ltd
1377 *
1378 * This file is part of Ubuntu Clock App
1379 *
1380
1381=== modified file 'backend/modules/Alarm/sound.h'
1382--- backend/modules/Alarm/sound.h 2015-09-11 13:54:12 +0000
1383+++ backend/modules/Alarm/sound.h 2016-02-25 23:11:58 +0000
1384@@ -1,5 +1,5 @@
1385 /*
1386- * Copyright (C) 2015 Canonical Ltd
1387+ * Copyright (C) 2015-2016 Canonical Ltd
1388 *
1389 * This file is part of Ubuntu Clock App
1390 *
1391
1392=== modified file 'backend/modules/Stopwatch/backend.cpp'
1393--- backend/modules/Stopwatch/backend.cpp 2015-09-09 21:30:53 +0000
1394+++ backend/modules/Stopwatch/backend.cpp 2016-02-25 23:11:58 +0000
1395@@ -1,5 +1,5 @@
1396 /*
1397- * Copyright (C) 2015 Canonical Ltd
1398+ * Copyright (C) 2015-2016 Canonical Ltd
1399 *
1400 * This file is part of Ubuntu Clock App
1401 *
1402
1403=== modified file 'backend/modules/Stopwatch/backend.h'
1404--- backend/modules/Stopwatch/backend.h 2015-08-24 23:37:28 +0000
1405+++ backend/modules/Stopwatch/backend.h 2016-02-25 23:11:58 +0000
1406@@ -1,5 +1,5 @@
1407 /*
1408- * Copyright (C) 2015 Canonical Ltd
1409+ * Copyright (C) 2015-2016 Canonical Ltd
1410 *
1411 * This file is part of Ubuntu Clock App
1412 *
1413
1414=== modified file 'backend/modules/Stopwatch/engine.cpp'
1415--- backend/modules/Stopwatch/engine.cpp 2015-09-11 13:37:43 +0000
1416+++ backend/modules/Stopwatch/engine.cpp 2016-02-25 23:11:58 +0000
1417@@ -1,6 +1,6 @@
1418 /*****************************************************************************
1419- * Copyright: 2015 Michael Zanetti <michael_zanetti@gmx.net> *
1420- * 2015 Bartosz Kosiorek <gang65@poczta.onet.pl> *
1421+ * Copyright: 2015-2016 Michael Zanetti <michael_zanetti@gmx.net> *
1422+ * 2015-2016 Bartosz Kosiorek <gang65@poczta.onet.pl> *
1423 * *
1424 * This prject is free software: you can redistribute it and/or modify *
1425 * it under the terms of the GNU General Public License as published by *
1426
1427=== modified file 'backend/modules/Stopwatch/engine.h'
1428--- backend/modules/Stopwatch/engine.h 2015-09-11 13:37:43 +0000
1429+++ backend/modules/Stopwatch/engine.h 2016-02-25 23:11:58 +0000
1430@@ -1,6 +1,6 @@
1431 /*****************************************************************************
1432- * Copyright: 2015 Michael Zanetti <michael_zanetti@gmx.net> *
1433- * 2015 Bartosz Kosiorek <gang65@poczta.onet.pl> *
1434+ * Copyright: 2015-2016 Michael Zanetti <michael_zanetti@gmx.net> *
1435+ * 2015-2016 Bartosz Kosiorek <gang65@poczta.onet.pl> *
1436 * *
1437 * This prject is free software: you can redistribute it and/or modify *
1438 * it under the terms of the GNU General Public License as published by *
1439
1440=== modified file 'backend/modules/Stopwatch/formattime.cpp'
1441--- backend/modules/Stopwatch/formattime.cpp 2016-02-15 15:05:13 +0000
1442+++ backend/modules/Stopwatch/formattime.cpp 2016-02-25 23:11:58 +0000
1443@@ -1,5 +1,5 @@
1444 /*
1445- * Copyright (C) 2015 Canonical Ltd
1446+ * Copyright (C) 2015-2016 Canonical Ltd
1447 *
1448 * This file is part of Ubuntu Clock App
1449 *
1450
1451=== modified file 'backend/modules/Stopwatch/formattime.h'
1452--- backend/modules/Stopwatch/formattime.h 2015-09-11 13:54:12 +0000
1453+++ backend/modules/Stopwatch/formattime.h 2016-02-25 23:11:58 +0000
1454@@ -1,5 +1,5 @@
1455 /*
1456- * Copyright (C) 2015 Canonical Ltd
1457+ * Copyright (C) 2015-2016 Canonical Ltd
1458 *
1459 * This file is part of Ubuntu Clock App
1460 *
1461
1462=== modified file 'backend/modules/WorldClock/backend.cpp'
1463--- backend/modules/WorldClock/backend.cpp 2015-08-26 23:30:10 +0000
1464+++ backend/modules/WorldClock/backend.cpp 2016-02-25 23:11:58 +0000
1465@@ -1,5 +1,5 @@
1466 /*
1467- * Copyright (C) 2015 Canonical Ltd
1468+ * Copyright (C) 2015-2016 Canonical Ltd
1469 *
1470 * This file is part of Ubuntu Clock App
1471 *
1472
1473=== modified file 'backend/modules/WorldClock/backend.h'
1474--- backend/modules/WorldClock/backend.h 2015-08-25 15:54:39 +0000
1475+++ backend/modules/WorldClock/backend.h 2016-02-25 23:11:58 +0000
1476@@ -1,5 +1,5 @@
1477 /*
1478- * Copyright (C) 2015 Canonical Ltd
1479+ * Copyright (C) 2015-2016 Canonical Ltd
1480 *
1481 * This file is part of Ubuntu Clock App
1482 *
1483
1484=== modified file 'backend/modules/WorldClock/datetime.cpp'
1485--- backend/modules/WorldClock/datetime.cpp 2015-10-06 22:34:27 +0000
1486+++ backend/modules/WorldClock/datetime.cpp 2016-02-25 23:11:58 +0000
1487@@ -1,5 +1,5 @@
1488 /*
1489- * Copyright (C) 2014-2015 Canonical Ltd
1490+ * Copyright (C) 2014-2016 Canonical Ltd
1491 *
1492 * This file is part of Ubuntu Clock App
1493 *
1494
1495=== modified file 'backend/modules/WorldClock/datetime.h'
1496--- backend/modules/WorldClock/datetime.h 2015-10-06 22:34:27 +0000
1497+++ backend/modules/WorldClock/datetime.h 2016-02-25 23:11:58 +0000
1498@@ -1,5 +1,5 @@
1499 /*
1500- * Copyright (C) 2014-2015 Canonical Ltd
1501+ * Copyright (C) 2014-2016 Canonical Ltd
1502 *
1503 * This file is part of Ubuntu Clock App
1504 *
1505
1506=== modified file 'backend/modules/WorldClock/generictimezonemodel.cpp'
1507--- backend/modules/WorldClock/generictimezonemodel.cpp 2015-08-29 01:27:20 +0000
1508+++ backend/modules/WorldClock/generictimezonemodel.cpp 2016-02-25 23:11:58 +0000
1509@@ -1,5 +1,5 @@
1510 /*
1511- * Copyright (C) 2014-2015 Canonical Ltd
1512+ * Copyright (C) 2014-2016 Canonical Ltd
1513 *
1514 * This file is part of Ubuntu Clock App
1515 *
1516
1517=== modified file 'backend/modules/WorldClock/generictimezonemodel.h'
1518--- backend/modules/WorldClock/generictimezonemodel.h 2015-08-29 01:27:20 +0000
1519+++ backend/modules/WorldClock/generictimezonemodel.h 2016-02-25 23:11:58 +0000
1520@@ -1,5 +1,5 @@
1521 /*
1522- * Copyright (C) 2014-2015 Canonical Ltd
1523+ * Copyright (C) 2014-2016 Canonical Ltd
1524 *
1525 * This file is part of Ubuntu Clock App
1526 *
1527
1528=== modified file 'backend/modules/WorldClock/geolocation.cpp'
1529--- backend/modules/WorldClock/geolocation.cpp 2015-08-25 15:54:39 +0000
1530+++ backend/modules/WorldClock/geolocation.cpp 2016-02-25 23:11:58 +0000
1531@@ -1,5 +1,5 @@
1532 /*
1533- * Copyright (C) 2014-2015 Canonical Ltd
1534+ * Copyright (C) 2014-2016 Canonical Ltd
1535 *
1536 * This file is part of Ubuntu Clock App
1537 *
1538
1539=== modified file 'backend/modules/WorldClock/geolocation.h'
1540--- backend/modules/WorldClock/geolocation.h 2015-08-25 15:54:39 +0000
1541+++ backend/modules/WorldClock/geolocation.h 2016-02-25 23:11:58 +0000
1542@@ -1,5 +1,5 @@
1543 /*
1544- * Copyright (C) 2014-2015 Canonical Ltd
1545+ * Copyright (C) 2014-2016 Canonical Ltd
1546 *
1547 * This file is part of Ubuntu Clock App
1548 *
1549
1550=== modified file 'backend/modules/WorldClock/jsontimezonemodel.cpp'
1551--- backend/modules/WorldClock/jsontimezonemodel.cpp 2015-08-25 16:11:38 +0000
1552+++ backend/modules/WorldClock/jsontimezonemodel.cpp 2016-02-25 23:11:58 +0000
1553@@ -1,5 +1,5 @@
1554 /*
1555- * Copyright (C) 2014-2015 Canonical Ltd
1556+ * Copyright (C) 2014-2016 Canonical Ltd
1557 *
1558 * This file is part of Ubuntu Clock App
1559 *
1560
1561=== modified file 'backend/modules/WorldClock/jsontimezonemodel.h'
1562--- backend/modules/WorldClock/jsontimezonemodel.h 2015-08-25 16:11:38 +0000
1563+++ backend/modules/WorldClock/jsontimezonemodel.h 2016-02-25 23:11:58 +0000
1564@@ -1,5 +1,5 @@
1565 /*
1566- * Copyright (C) 2014-2015 Canonical Ltd
1567+ * Copyright (C) 2014-2016 Canonical Ltd
1568 *
1569 * This file is part of Ubuntu Clock App
1570 *
1571
1572=== modified file 'backend/modules/WorldClock/statictimezonemodel.cpp'
1573--- backend/modules/WorldClock/statictimezonemodel.cpp 2015-09-10 11:10:13 +0000
1574+++ backend/modules/WorldClock/statictimezonemodel.cpp 2016-02-25 23:11:58 +0000
1575@@ -1,5 +1,5 @@
1576 /*
1577- * Copyright (C) 2015 Canonical Ltd
1578+ * Copyright (C) 2015-2016 Canonical Ltd
1579 *
1580 * This file is part of Ubuntu Clock App
1581 *
1582
1583=== modified file 'backend/modules/WorldClock/statictimezonemodel.h'
1584--- backend/modules/WorldClock/statictimezonemodel.h 2015-08-25 16:11:38 +0000
1585+++ backend/modules/WorldClock/statictimezonemodel.h 2016-02-25 23:11:58 +0000
1586@@ -1,5 +1,5 @@
1587 /*
1588-* Copyright (C) 2015 Canonical Ltd
1589+* Copyright (C) 2015-2016 Canonical Ltd
1590 *
1591 * This file is part of Ubuntu Clock App
1592 *
1593
1594=== modified file 'backend/modules/WorldClock/timezonemodel.cpp'
1595--- backend/modules/WorldClock/timezonemodel.cpp 2015-10-06 22:02:45 +0000
1596+++ backend/modules/WorldClock/timezonemodel.cpp 2016-02-25 23:11:58 +0000
1597@@ -1,5 +1,5 @@
1598 /*
1599- * Copyright (C) 2014-2015 Canonical Ltd
1600+ * Copyright (C) 2014-2016 Canonical Ltd
1601 *
1602 * This file is part of Ubuntu Clock App
1603 *
1604
1605=== modified file 'backend/modules/WorldClock/timezonemodel.h'
1606--- backend/modules/WorldClock/timezonemodel.h 2015-09-17 05:36:41 +0000
1607+++ backend/modules/WorldClock/timezonemodel.h 2016-02-25 23:11:58 +0000
1608@@ -1,5 +1,5 @@
1609 /*
1610- * Copyright (C) 2014-2015 Canonical Ltd
1611+ * Copyright (C) 2014-2016 Canonical Ltd
1612 *
1613 * This file is part of Ubuntu Clock App
1614 *
1615
1616=== modified file 'debian/changelog'
1617--- debian/changelog 2016-02-02 23:45:47 +0000
1618+++ debian/changelog 2016-02-25 23:11:58 +0000
1619@@ -5,10 +5,26 @@
1620 * Move to use the new SDK components v1.3 (LP: #1508363)
1621 * Fix continously move the alarm volume slider to the desired value (LP: #1492584)
1622 * Fix wrong alarm caption which appears during high load (LP: #1530000)
1623+ * Implemented new UI design according to design specs (LP: #1528241)
1624+ * Removed SURU bar from all views (LP: #1543492)
1625+
1626+ [ Nicholas Skaggs ]
1627+ * Fixed test launching and added option for building with SDK
1628+ * Removed fixtures and debug_print_trees
1629
1630 [ Andrew Hayzen ]
1631 * Fixes for various autopilot issues (LP: #1535488)
1632
1633+ [ Michal Predotka ]
1634+ * Fix stopwatch start button being too wide (LP: #1543475)
1635+ * Updated all list items to the new ListItemLayout (LP: #1543472)
1636+ * Added ability to start/stop stopwatch by clicking on clock face (LP: #1543479)
1637+ * Fix settings page list items using the wrong font color (LP: #1543501)
1638+
1639+ [ Nekhelesh Ramananthan ]
1640+ * Fix 'Shutter' effect animation on title bar when opening bottom edge (LP: #1543496)
1641+ * Migrate to the new SDK Bottom edge (LP: #1549988)
1642+
1643 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +0100
1644
1645 ubuntu-clock-app (3.6) vivid; urgency=medium
1646
1647=== modified file 'po/com.ubuntu.clock.pot'
1648--- po/com.ubuntu.clock.pot 2016-02-17 21:47:42 +0000
1649+++ po/com.ubuntu.clock.pot 2016-02-25 23:11:58 +0000
1650@@ -1,6 +1,6 @@
1651 # SOME DESCRIPTIVE TITLE.
1652 # Copyright (C) YEAR Canonical Ltd.
1653-# This file is distributed under the same license as the PACKAGE package.
1654+# This file is distributed under the same license as the package.
1655 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
1656 #
1657 #, fuzzy
1658@@ -8,7 +8,7 @@
1659 msgstr ""
1660 "Project-Id-Version: \n"
1661 "Report-Msgid-Bugs-To: \n"
1662-"POT-Creation-Date: 2016-02-17 22:46+0100\n"
1663+"POT-Creation-Date: 2016-02-26 00:06+0100\n"
1664 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1665 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1666 "Language-Team: LANGUAGE <LL@li.org>\n"
1667@@ -18,51 +18,46 @@
1668 "Content-Transfer-Encoding: 8bit\n"
1669 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
1670
1671-#: ../app/MainPage.qml:53 ../app/alarm/AlarmUtils.qml:55
1672-msgid "No active alarms"
1673+#: ../app/MainPage.qml:63 ../app/alarm/AlarmPage.qml:34
1674+msgid "Alarms"
1675 msgstr ""
1676
1677 #: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
1678-#: ../app/alarm/EditAlarmPage.qml:294
1679+#: ../app/alarm/EditAlarmPage.qml:297
1680 msgid "Label"
1681 msgstr ""
1682
1683-#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:101
1684-#: ../app/worldclock/UserWorldCityList.qml:69
1685+#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:99
1686+#: ../app/worldclock/UserWorldCityList.qml:70
1687 msgid "Delete"
1688 msgstr ""
1689
1690-#: ../app/alarm/AlarmPage.qml:27
1691-msgid "Alarms"
1692+#: ../app/alarm/AlarmPage.qml:48 ../app/alarm/EditAlarmPage.qml:43
1693+#: ../app/alarm/EditAlarmPage.qml:188
1694+msgid "Alarm"
1695 msgstr ""
1696
1697-#: ../app/alarm/AlarmPage.qml:41 ../app/alarm/AlarmPage.qml:66
1698-#: ../app/worldclock/WorldCityList.qml:79
1699+#: ../app/alarm/AlarmPage.qml:62 ../app/worldclock/WorldCityList.qml:79
1700 msgid "Back"
1701 msgstr ""
1702
1703-#: ../app/alarm/AlarmPage.qml:51 ../app/alarm/EditAlarmPage.qml:41
1704-#: ../app/alarm/EditAlarmPage.qml:185
1705-msgid "Alarm"
1706-msgstr ""
1707-
1708-#: ../app/alarm/AlarmPage.qml:76
1709+#: ../app/alarm/AlarmPage.qml:74
1710 msgid "Select None"
1711 msgstr ""
1712
1713-#: ../app/alarm/AlarmPage.qml:78 ../app/alarm/AlarmRepeat.qml:59
1714+#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:59
1715 msgid "Select All"
1716 msgstr ""
1717
1718-#: ../app/alarm/AlarmPage.qml:152
1719+#: ../app/alarm/AlarmPage.qml:155
1720 msgid "No saved alarms"
1721 msgstr ""
1722
1723-#: ../app/alarm/AlarmPage.qml:153
1724+#: ../app/alarm/AlarmPage.qml:156
1725 msgid "Tap the + icon to add an alarm"
1726 msgstr ""
1727
1728-#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:279
1729+#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:282
1730 msgid "Repeat"
1731 msgstr ""
1732
1733@@ -104,7 +99,7 @@
1734 msgid "Change time and date"
1735 msgstr ""
1736
1737-#: ../app/alarm/AlarmSound.qml:30 ../app/alarm/EditAlarmPage.qml:314
1738+#: ../app/alarm/AlarmSound.qml:30 ../app/alarm/EditAlarmPage.qml:317
1739 msgid "Sound"
1740 msgstr ""
1741
1742@@ -136,39 +131,34 @@
1743 msgid "Daily"
1744 msgstr ""
1745
1746-#: ../app/alarm/AlarmUtils.qml:82
1747-#, qt-format
1748-msgid "Next Alarm %1"
1749-msgstr ""
1750-
1751-#: ../app/alarm/AlarmUtils.qml:103
1752+#: ../app/alarm/AlarmUtils.qml:70
1753 msgid "Alarm Passed"
1754 msgstr ""
1755
1756-#: ../app/alarm/AlarmUtils.qml:113
1757+#: ../app/alarm/AlarmUtils.qml:80
1758 #, no-c-format, qt-format
1759 msgid "in %1d %2h %3m"
1760 msgstr ""
1761
1762-#: ../app/alarm/AlarmUtils.qml:123
1763+#: ../app/alarm/AlarmUtils.qml:90
1764 #, no-c-format, qt-format
1765 msgid "in %1h %2m"
1766 msgstr ""
1767
1768-#: ../app/alarm/AlarmUtils.qml:132
1769+#: ../app/alarm/AlarmUtils.qml:99
1770 #, no-c-format, qt-format
1771 msgid "in %1m"
1772 msgstr ""
1773
1774-#: ../app/alarm/EditAlarmPage.qml:34
1775+#: ../app/alarm/EditAlarmPage.qml:37
1776 msgid "New alarm"
1777 msgstr ""
1778
1779-#: ../app/alarm/EditAlarmPage.qml:34
1780+#: ../app/alarm/EditAlarmPage.qml:37
1781 msgid "Edit alarm"
1782 msgstr ""
1783
1784-#: ../app/alarm/EditAlarmPage.qml:337
1785+#: ../app/alarm/EditAlarmPage.qml:339
1786 msgid "Delete alarm"
1787 msgstr ""
1788
1789@@ -177,7 +167,7 @@
1790 msgid "Add sound from"
1791 msgstr ""
1792
1793-#: ../app/clock/ClockPage.qml:245
1794+#: ../app/clock/ClockPage.qml:244
1795 msgid "Retrieving location..."
1796 msgstr ""
1797
1798@@ -222,37 +212,37 @@
1799
1800 #. TRANSLATORS: this indicates if the time in a world clock
1801 #. is behind or ahead of the time at the current location
1802-#: ../app/worldclock/UserWorldCityDelegate.qml:135
1803+#: ../app/worldclock/UserWorldCityDelegate.qml:136
1804 msgid "behind"
1805 msgstr ""
1806
1807-#: ../app/worldclock/UserWorldCityDelegate.qml:136
1808+#: ../app/worldclock/UserWorldCityDelegate.qml:137
1809 msgid "ahead"
1810 msgstr ""
1811
1812 #. TRANSLATORS: the first argument is hour, followed by
1813 #. minute, and the translation for either 'behind' or
1814 #. 'ahead'
1815-#: ../app/worldclock/UserWorldCityDelegate.qml:146
1816+#: ../app/worldclock/UserWorldCityDelegate.qml:147
1817 #, qt-format
1818 msgid "%1h %2m %3"
1819 msgstr ""
1820
1821 #. TRANSLATORS: the first argument is hour, followed by the
1822 #. translation for either 'behind' or 'ahead'
1823-#: ../app/worldclock/UserWorldCityDelegate.qml:155
1824+#: ../app/worldclock/UserWorldCityDelegate.qml:156
1825 #, qt-format
1826 msgid "%1h %2"
1827 msgstr ""
1828
1829 #. TRANSLATORS: the first argument is minute, followed by the
1830 #. translation for either 'behind' or 'ahead'
1831-#: ../app/worldclock/UserWorldCityDelegate.qml:163
1832+#: ../app/worldclock/UserWorldCityDelegate.qml:164
1833 #, qt-format
1834 msgid "%1m %2"
1835 msgstr ""
1836
1837-#: ../app/worldclock/UserWorldCityDelegate.qml:169
1838+#: ../app/worldclock/UserWorldCityDelegate.qml:170
1839 msgid "Same time"
1840 msgstr ""
1841
1842
1843=== modified file 'tests/unit/ClockTestCase.qml'
1844--- tests/unit/ClockTestCase.qml 2016-02-25 17:07:00 +0000
1845+++ tests/unit/ClockTestCase.qml 2016-02-25 23:11:58 +0000
1846@@ -1,5 +1,5 @@
1847 /*
1848- * Copyright (C) 2014-2015 Canonical Ltd
1849+ * Copyright (C) 2014-2016 Canonical Ltd
1850 *
1851 * This file is part of Ubuntu Clock App
1852 *
1853
1854=== modified file 'tests/unit/MockClockApp.qml'
1855--- tests/unit/MockClockApp.qml 2015-10-22 16:49:23 +0000
1856+++ tests/unit/MockClockApp.qml 2016-02-25 23:11:58 +0000
1857@@ -1,5 +1,5 @@
1858 /*
1859- * Copyright (C) 2014-2015 Canonical Ltd
1860+ * Copyright (C) 2014-2016 Canonical Ltd
1861 *
1862 * This file is part of Ubuntu Clock App
1863 *
1864
1865=== modified file 'tests/unit/tst_alarm.qml'
1866--- tests/unit/tst_alarm.qml 2015-12-11 02:13:16 +0000
1867+++ tests/unit/tst_alarm.qml 2016-02-25 23:11:58 +0000
1868@@ -1,5 +1,5 @@
1869 /*
1870- * Copyright (C) 2014-2015 Canonical Ltd
1871+ * Copyright (C) 2014-2016 Canonical Ltd
1872 *
1873 * This file is part of Ubuntu Clock App
1874 *
1875
1876=== modified file 'tests/unit/tst_alarmLabel.qml'
1877--- tests/unit/tst_alarmLabel.qml 2016-02-25 17:07:00 +0000
1878+++ tests/unit/tst_alarmLabel.qml 2016-02-25 23:11:58 +0000
1879@@ -1,5 +1,5 @@
1880 /*
1881- * Copyright (C) 2014-2015 Canonical Ltd
1882+ * Copyright (C) 2014-2016 Canonical Ltd
1883 *
1884 * This file is part of Ubuntu Clock App
1885 *
1886
1887=== modified file 'tests/unit/tst_alarmRepeat.qml'
1888--- tests/unit/tst_alarmRepeat.qml 2016-02-25 17:40:26 +0000
1889+++ tests/unit/tst_alarmRepeat.qml 2016-02-25 23:11:58 +0000
1890@@ -1,5 +1,5 @@
1891 /*
1892- * Copyright (C) 2014-2015 Canonical Ltd
1893+ * Copyright (C) 2014-2016 Canonical Ltd
1894 *
1895 * This file is part of Ubuntu Clock App
1896 *
1897
1898=== modified file 'tests/unit/tst_alarmSound.qml'
1899--- tests/unit/tst_alarmSound.qml 2015-10-22 16:49:23 +0000
1900+++ tests/unit/tst_alarmSound.qml 2016-02-25 23:11:58 +0000
1901@@ -1,5 +1,5 @@
1902 /*
1903- * Copyright (C) 2014-2015 Canonical Ltd
1904+ * Copyright (C) 2014-2016 Canonical Ltd
1905 *
1906 * This file is part of Ubuntu Clock App
1907 *
1908
1909=== modified file 'tests/unit/tst_alarmUtils.qml'
1910--- tests/unit/tst_alarmUtils.qml 2016-02-25 17:40:26 +0000
1911+++ tests/unit/tst_alarmUtils.qml 2016-02-25 23:11:58 +0000
1912@@ -1,5 +1,5 @@
1913 /*
1914- * Copyright (C) 2014-2015 Canonical Ltd
1915+ * Copyright (C) 2014-2016 Canonical Ltd
1916 *
1917 * This file is part of Ubuntu Clock App
1918 *
1919
1920=== modified file 'tests/unit/tst_stopwatchUtils.qml'
1921--- tests/unit/tst_stopwatchUtils.qml 2016-02-25 17:40:26 +0000
1922+++ tests/unit/tst_stopwatchUtils.qml 2016-02-25 23:11:58 +0000
1923@@ -1,5 +1,5 @@
1924 /*
1925- * Copyright (C) 2015 Canonical Ltd
1926+ * Copyright (C) 2015-2016 Canonical Ltd
1927 *
1928 * This file is part of Ubuntu Clock App
1929 *
1930
1931=== modified file 'tests/unit/tst_worldClock.qml'
1932--- tests/unit/tst_worldClock.qml 2015-10-22 16:49:23 +0000
1933+++ tests/unit/tst_worldClock.qml 2016-02-25 23:11:58 +0000
1934@@ -1,5 +1,5 @@
1935 /*
1936- * Copyright (C) 2014-2015 Canonical Ltd
1937+ * Copyright (C) 2014-2016 Canonical Ltd
1938 *
1939 * This file is part of Ubuntu Clock App
1940 *

Subscribers

People subscribed via source and target branches