Merge lp:~mihirsoni/ubuntu-calendar-app/DesignFix-1 into lp:ubuntu-calendar-app

Proposed by Mihir Soni
Status: Merged
Approved by: Kunal Parmar
Approved revision: 529
Merged at revision: 528
Proposed branch: lp:~mihirsoni/ubuntu-calendar-app/DesignFix-1
Merge into: lp:ubuntu-calendar-app
Diff against target: 45 lines (+15/-2)
2 files modified
AllDayEventComponent.qml (+9/-2)
YearView.qml (+6/-0)
To merge this branch: bzr merge lp:~mihirsoni/ubuntu-calendar-app/DesignFix-1
Reviewer Review Type Date Requested Status
Kunal Parmar Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+239560@code.launchpad.net

Commit message

This fix resolve following changes :

1. All day event width same as other events.
2. Header Label in year view to current year.

Description of the change

This fix resolve following changes :

1. All day event width same as other events.
2. Header Label in year view to current year.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

This needs to be done only for DayView

review: Needs Fixing
529. By Mihir Soni

Fixed weekview , added Year string in YearView

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

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml 2014-10-20 15:20:21 +0000
+++ AllDayEventComponent.qml 2014-10-24 14:30:41 +0000
@@ -33,6 +33,13 @@
3333
34 width: parent.width34 width: parent.width
3535
36 anchors {
37 left :parent.left
38 right: parent.right
39 leftMargin: type == ViewType.ViewTypeDay ? units.gu(6) : 0
40 rightMargin: type == ViewType.ViewTypeDay ? units.gu(3): 0
41 }
42
36 function getAllDayEvents(startDate, endDate) {43 function getAllDayEvents(startDate, endDate) {
37 var map = {};44 var map = {};
38 var items = model.getItems(startDate,endDate);45 var items = model.getItems(startDate,endDate);
@@ -111,8 +118,8 @@
111 text = i18n.tr("%1 ev.").arg(events.length)118 text = i18n.tr("%1 ev.").arg(events.length)
112 } else {119 } else {
113 if( events.length > 1) {120 if( events.length > 1) {
114 // TRANSLATORS: the argument refers to the number of all day events121 // TRANSLATORS: the argument refers to the number of all day events
115 text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)122 text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)
116 } else {123 } else {
117 text = events[0].displayLabel;124 text = events[0].displayLabel;
118 }125 }
119126
=== modified file 'YearView.qml'
--- YearView.qml 2014-10-22 18:39:27 +0000
+++ YearView.qml 2014-10-24 14:30:41 +0000
@@ -46,6 +46,12 @@
46 commonHeaderActions.showCalendarAction,46 commonHeaderActions.showCalendarAction,
47 commonHeaderActions.reloadAction47 commonHeaderActions.reloadAction
48 ]48 ]
49 contents: Label {
50 id:year
51 objectName:"yearLabel"
52 fontSize: "x-large"
53 text: i18n.tr("Year %1").arg(currentYear)
54 }
49 }55 }
5056
51 PathViewBase {57 PathViewBase {

Subscribers

People subscribed via source and target branches

to status/vote changes: