Ubuntu Calendar App

Merge lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader into lp:ubuntu-calendar-app

  1. NewHeader
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 287
Merged at revision: 285
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader
Merge into: lp:ubuntu-calendar-app
Diff against target: 143 lines (+24/-19)
5 files modified
EventDetails.qml (+11/-10)
NewEvent.qml (+0/-3)
calendar.qml (+3/-2)
tests/autopilot/calendar_app/tests/test_calendar.py (+6/-3)
tests/autopilot/calendar_app/tests/test_monthview.py (+4/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson (community) Approve
Review via email: mp+220481@code.launchpad.net

Commit message

Changing to use new header.

Description of the change

Changing to use new header.

To make new header work under 14.04

Ubuntu SDK Release PPA for Ubuntu 14.04 LTS, 12.04 LTS and 13.10.

Upgrade with:

sudo add-apt-repository ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get dist-upgrade && sudo apt-get install ubuntu-sdk

https://launchpad.net/~ubuntu-sdk-team/+archive/ppa/+index?batch=75&memo=150&start=150

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

This looks great, the only one small thing that needs to be fixed is that the header text color goes to black when the New Event page is pushed onto the page stack.

review: Needs Fixing
lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
280. By Kunal Parmar

typo resolved

Revision history for this message
Victor Thompson (vthompson) wrote :

Approve, but I'd recommend that the new bug for setting the header text color be added as commentary to be fixed in the future.

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

FAILED: Continuous integration, rev:279
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/475/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2757
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2757/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/294
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/309
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/33

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

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

FAILED: Continuous integration, rev:280
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/476/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2759
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2759/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/296
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/310
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/34

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
281. By Kunal Parmar

merge from trunk

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

FAILED: Continuous integration, rev:281
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/477/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2760
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2760/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/297
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/297/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/311
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/35

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
282. By Kunal Parmar

test case changed to used new header

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

FAILED: Continuous integration, rev:282
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/478/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2762
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2762/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/299
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/312
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/36

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Looks like the same desktop errors are appearing here as well.

lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
283. By Kunal Parmar

One more attempt to fix AP

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

FAILED: Continuous integration, rev:283
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/482/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2778
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2778/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/315
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/316
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/40

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
284. By Kunal Parmar

changed according to new color

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

FAILED: Continuous integration, rev:284
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/492/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2817
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2817/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/354
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/354/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/326
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/50

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
285. By Kunal Parmar

object name moved to action to resolve AP

286. By Kunal Parmar

merge from trunk

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

FAILED: Continuous integration, rev:286
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/494/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2829
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2829/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/366
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/328
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/52

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/NewHeader updated
287. By Kunal Parmar

test case fix

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

PASSED: Continuous integration, rev:287
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/495/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2830
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/367
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/329
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/53

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

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

On the desktop I'm seeing additional "Today" and "New Event" icons in the month, year and agenda views.

http://imgur.com/JZ3aDSg

review: Needs Fixing
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

I'm told this issue is in the SDK and a fix is already in staging, so I won't block this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventDetails.qml'
2--- EventDetails.qml 2014-05-22 11:17:12 +0000
3+++ EventDetails.qml 2014-05-23 12:00:44 +0000
4@@ -15,25 +15,24 @@
5 property string detailColor :"grey"
6 property var model;
7
8- anchors.fill: parent
9+ anchors{
10+ left: parent.left
11+ right: parent.right
12+ bottom: parent.bottom
13+ }
14+
15 flickable: null
16
17+ title: "Event Details"
18+
19 Component.onCompleted: {
20- if( pageStack.header )
21- pageStack.header.visible = false;
22 showEvent(event);
23 }
24
25- Component.onDestruction: {
26- if( pageStack.header )
27- pageStack.header.visible = true;
28- }
29-
30 Connections{
31 target: pageStack
32 onCurrentPageChanged:{
33 if( pageStack.currentPage === root) {
34- pageStack.header.visible = false;
35 showEvent(event);
36 }
37 }
38@@ -217,7 +216,9 @@
39
40 Flickable{
41 id: flicable
42- anchors.fill: parent
43+ width: parent.width
44+ height: parent.height
45+ clip: true
46
47 contentHeight: column.height + units.gu(3) /*top margin + spacing */
48 contentWidth: parent.width
49
50=== modified file 'NewEvent.qml'
51--- NewEvent.qml 2014-05-22 15:56:29 +0000
52+++ NewEvent.qml 2014-05-23 12:00:44 +0000
53@@ -24,9 +24,6 @@
54 property bool isEdit: false
55
56 Component.onCompleted: {
57-
58- pageStack.header.visible = true;
59-
60 // If startDate is setted by argument we have to not change it
61 //Set the nearest current time.
62 var newDate = new Date();
63
64=== modified file 'calendar.qml'
65--- calendar.qml 2014-05-22 15:46:22 +0000
66+++ calendar.qml 2014-05-23 12:00:44 +0000
67@@ -6,6 +6,7 @@
68
69 MainView {
70 id: mainView
71+ useDeprecatedToolbar: false
72
73 // Argument during startup
74 Arguments {
75@@ -191,10 +192,10 @@
76 id: commonToolBar
77
78 ToolbarButton {
79- objectName: "todaybutton"
80 action: Action {
81 iconSource: Qt.resolvedUrl("calendar-today.svg");
82 text: i18n.tr("Today");
83+ objectName: "todaybutton"
84 onTriggered: {
85 tabs.currentDay = (new Date()).midnight();
86 if(yearViewLoader.item ) yearViewLoader.item.currentYear = tabs.currentDay.getFullYear();
87@@ -209,8 +210,8 @@
88 }
89 }
90 ToolbarButton {
91- objectName: "neweventbutton"
92 action: Action {
93+ objectName: "neweventbutton"
94 iconSource: Qt.resolvedUrl("new-event.svg");
95 text: i18n.tr("New Event");
96 onTriggered: {
97
98=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
99--- tests/autopilot/calendar_app/tests/test_calendar.py 2014-05-17 00:05:35 +0000
100+++ tests/autopilot/calendar_app/tests/test_calendar.py 2014-05-23 12:00:44 +0000
101@@ -48,11 +48,13 @@
102 """test add new event """
103 #go to today
104 self.main_view.switch_to_tab("dayTab")
105- self.main_view.open_toolbar().click_button("todaybutton")
106+ header = self.main_view.get_header()
107+ header.click_action_button('todaybutton')
108 num_events = self.main_view.get_num_events()
109
110 #click on new event button
111- self.main_view.open_toolbar().click_button("neweventbutton")
112+ header = self.main_view.get_header()
113+ header.click_action_button('neweventbutton')
114 self.assertThat(self.main_view.get_new_event,
115 Eventually(Not(Is(None))))
116
117@@ -92,7 +94,8 @@
118 self.pointing_device.click_object(save_button)
119
120 #verify that the event has been created in timeline
121- self.main_view.open_toolbar().click_button("todaybutton")
122+ header = self.main_view.get_header()
123+ header.click_action_button('todaybutton')
124 self.main_view.switch_to_tab("dayTab")
125 self.assertThat(self.main_view.get_num_events,
126 Eventually(NotEquals(num_events)))
127
128=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
129--- tests/autopilot/calendar_app/tests/test_monthview.py 2014-05-22 10:02:54 +0000
130+++ tests/autopilot/calendar_app/tests/test_monthview.py 2014-05-23 12:00:44 +0000
131@@ -75,8 +75,11 @@
132
133 def _go_to_today(self, delta):
134 self._assert_today()
135+
136 self._change_month(delta)
137- self.main_view.open_toolbar().click_button("todaybutton")
138+ header = self.main_view.get_header()
139+ header.click_action_button('todaybutton')
140+
141 self._assert_today()
142
143 def test_monthview_go_to_today_next_month(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: