Ubuntu Calendar App

Merge lp:~osomon/ubuntu-calendar-app/reload-function-not-signal into lp:ubuntu-calendar-app

  1. reload-function-not-signal
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 99
Merged at revision: 104
Proposed branch: lp:~osomon/ubuntu-calendar-app/reload-function-not-signal
Merge into: lp:ubuntu-calendar-app
Diff against target: 48 lines (+5/-4)
3 files modified
EventListModel.qml (+3/-2)
EventViewBase.qml (+1/-1)
TimeLineBase.qml (+1/-1)
To merge this branch: bzr merge lp:~osomon/ubuntu-calendar-app/reload-function-not-signal
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Kunal Parmar Approve
Review via email: mp+183521@code.launchpad.net

Commit message

Make EventListModel.reload() a function, not a signal.

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

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/40/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/147
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/40

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

looks good to me

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/12/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/170
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/12

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventListModel.qml'
2--- EventListModel.qml 2013-03-27 23:09:07 +0000
3+++ EventListModel.qml 2013-09-02 18:10:47 +0000
4@@ -8,15 +8,16 @@
5 property var termStart: new Date()
6 property var termLength: Date.msPerDay
7
8- signal reload
9+ signal reloaded
10
11- onReload: {
12+ function reload() {
13 var t0 = termStart.getTime()
14 var t1 = t0 + termLength
15 model.clear()
16 DataService.getEvents(t0, t1, model)
17 // for (var i = 0; i < model.count; ++i)
18 // DataService.printEvent(model.get(i))
19+ reloaded()
20 }
21 Component.onCompleted: {
22 reload()
23
24=== modified file 'EventViewBase.qml'
25--- EventViewBase.qml 2013-06-02 02:33:33 +0000
26+++ EventViewBase.qml 2013-09-02 18:10:47 +0000
27@@ -23,7 +23,7 @@
28 termStart: dayStart
29 termLength: Date.msPerDay
30
31- onReload: {
32+ onReloaded: {
33 modelRefreshed();
34 }
35 }
36
37=== modified file 'TimeLineBase.qml'
38--- TimeLineBase.qml 2013-08-27 14:41:12 +0000
39+++ TimeLineBase.qml 2013-09-02 18:10:47 +0000
40@@ -14,7 +14,7 @@
41 termStart: bubbleOverLay.day.midnight()
42 termLength: Date.msPerDay
43
44- onReload: {
45+ onReloaded: {
46 bubbleOverLay.createEvents();
47 }
48 }

Subscribers

People subscribed via source and target branches

to status/vote changes: