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