Ubuntu Calendar App

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

  1. Uitk1_3
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 🦄
Proposed branch: lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/Uitk1_3
Merge into: lp://qastaging/ubuntu-calendar-app
Diff against target: 803 lines (+76/-93)
38 files modified
AgendaView.qml (+1/-2)
AllDayEventComponent.qml (+1/-1)
CalendarChoicePopup.qml (+1/-1)
CalendarListButtonDelegate.qml (+1/-1)
ColorPickerDialog.qml (+1/-1)
ContactChoicePopup.qml (+1/-1)
DayView.qml (+1/-2)
Defines.js (+1/-1)
DeleteConfirmationDialog.qml (+1/-1)
EditEventConfirmationDialog.qml (+1/-1)
EventActions.qml (+4/-2)
EventBubble.qml (+1/-1)
EventDetails.qml (+1/-1)
EventReminder.qml (+1/-1)
EventRepetition.qml (+1/-1)
EventUtils.qml (+1/-1)
HeaderDateComponent.qml (+1/-1)
MonthComponent.qml (+1/-1)
MonthComponentDateDelegate.qml (+1/-1)
MonthView.qml (+1/-2)
NewEvent.qml (+1/-1)
NewEventEntryField.qml (+1/-1)
OnlineAccountsHelper.qml (+1/-1)
RecurrenceLabelDefines.qml (+1/-1)
Scroller.qml (+1/-1)
TimeLineBackground.qml (+1/-1)
TimeLineBase.qml (+1/-1)
TimeLineBaseComponent.qml (+1/-1)
TimeLineHeader.qml (+1/-1)
TimeLineHeaderComponent.qml (+1/-1)
TimeLineTimeScale.qml (+1/-1)
ViewHeader.qml (+1/-1)
WeekView.qml (+1/-2)
YearView.qml (+1/-2)
YearViewDelegate.qml (+1/-1)
calendar.qml (+1/-3)
calendarTests.qml (+1/-1)
po/com.ubuntu.calendar.pot (+36/-48)
To merge this branch: bzr merge lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/Uitk1_3
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Needs Fixing
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+276338@code.qastaging.launchpad.net

Commit message

Resolves Bug #1508363
Migrating to UITK 1.3

Description of the change

Resolves Bug #1508363
Migrating to UITK 1.3

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

PASSED: Continuous integration, rev:720
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/14/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/90/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/14/rebuild

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

PASSED: Continuous integration, rev:720
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1238/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/235

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

review: Approve (continuous-integration)
lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 updated
721. By Kunal Parmar

error resolved

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:721
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/15/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/91/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/15/rebuild

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

PASSED: Continuous integration, rev:721
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1239/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/236

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

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

Looks good, however the month name over-runs into the icons.

http://people.canonical.com/~alan/screenshots/device-2015-11-10-110730.png

I'm told we have two options:-

1) Implement our own header and elide the month name
or
2) Use the header, and remove one of the icons (we should have 3 max, we have 4 [burger menu, today, add event, kebab menu]).

I'd propose (2), but I'm not sure which icon to move to the kebab menu. Gut feeling is we should move 'add event' to the kebab menu now we've made it easy to add events by tapping on a time slot in the day view. The today icon should stay in the header as it's a useful tool to get back to today if you've been scanning around the calendar.

What do you think?

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

I think easiest option is 2), and Yes I agree, there ware many ways to create new event, but only one way to go to today. So I guess we should keep go to today available and move new event to menu.

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

Agreed! Lets do it.

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

There is bug in UITK which prevent us to move icon to tray
https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178

lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 updated
722. By Kunal Parmar

removed new event from tray

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

removed new event action from tray, this should resolve icon overlap issue

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:722
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/25/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/234/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/25/rebuild

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

test

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:723
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/26/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/235/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/26/rebuild

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

merge from trunk

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:724
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/27/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/236/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/27/rebuild

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

It still overlaps on long month names. I think we need to switch to the short version of the month name so they fit, or perhaps use a smaller font.

http://people.canonical.com/~alan/screenshots/device-2016-01-12-205023.png

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

This also duplicates https://code.launchpad.net/~dpniel/ubuntu-calendar-app/uitk-1.3/+merge/283591

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

Sorry, commented on wrong merge. I meant the other merge duplicates this. We need to reconcile these.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: