Ubuntu Clock App

Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status into lp:ubuntu-clock-app

  1. ubuntu-clock-fixed-bottomedge-status
  2. Merge into trunk
Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 298
Merged at revision: 298
Proposed branch: lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status
Merge into: lp:ubuntu-clock-app
Diff against target: 38 lines (+8/-1)
3 files modified
app/alarm/AlarmModelComponent.qml (+4/-0)
app/ubuntu-clock-app.qml (+1/-1)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+264781@code.launchpad.net

Commit message

Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)

Description of the change

Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:298
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/690/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/36
        deb: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/690/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

This should have been reviewed.
On Jul 14, 2015 8:45 PM, <email address hidden> wrote:

> The proposal to merge
> lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status into
> lp:ubuntu-clock-app has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status/+merge/264781
> --
> Your team Ubuntu Clock Developers is requested to review the proposed
> merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status
> into lp:ubuntu-clock-app.
>

Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Hello Victor.

This MR was already reviewed with:
https://code.launchpad.net/~nik90/ubuntu-clock-app/fixed-bottomedge-status

This MR is only copy of these.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmModelComponent.qml'
2--- app/alarm/AlarmModelComponent.qml 2014-10-10 19:58:31 +0000
3+++ app/alarm/AlarmModelComponent.qml 2015-07-15 00:07:53 +0000
4@@ -21,5 +21,9 @@
5
6 AlarmModel {
7 id: alarmModel
8+
9+ property bool isReady: false
10+
11 Component.onCompleted: console.log("[LOG]: Alarm Database loaded")
12+ onModelReset: isReady = true
13 }
14
15=== modified file 'app/ubuntu-clock-app.qml'
16--- app/ubuntu-clock-app.qml 2015-01-22 00:11:57 +0000
17+++ app/ubuntu-clock-app.qml 2015-07-15 00:07:53 +0000
18@@ -133,7 +133,7 @@
19 */
20
21 alarmModel: alarmModelLoader.item
22- bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready
23+ bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready && alarmModelLoader.item.isReady
24 clockTime: new Date
25 (
26 localTimeSource.localDateString.split(":")[0],
27
28=== modified file 'debian/changelog'
29--- debian/changelog 2015-07-10 19:42:45 +0000
30+++ debian/changelog 2015-07-15 00:07:53 +0000
31@@ -1,5 +1,8 @@
32 ubuntu-clock-app (3.4ubuntu2) UNRELEASED; urgency=medium
33
34+ [Nekhelesh Ramananthan]
35+ * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
36+
37 [ Nicholas Skaggs ]
38 * Update testing layout.
39

Subscribers

People subscribed via source and target branches