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

[Mihir Soni]

This fix resolve following changes :

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

This fix resolve following changes :

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:528
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/979/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1247
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1247/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/537

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

This needs to be done only for DayView

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calendar-app/DesignFix-1]

529. By Mihir Soni on 2014-10-24

Fixed weekview , added Year string in YearView

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:529
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/982/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1252
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/540

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

looks good

review: Approve

=== 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 @@
 
     width: parent.width
 
+    anchors {
+        left :parent.left
+        right: parent.right
+        leftMargin: type == ViewType.ViewTypeDay ? units.gu(6) : 0
+        rightMargin: type == ViewType.ViewTypeDay ? units.gu(3): 0
+    }
+
     function getAllDayEvents(startDate, endDate) {
         var map = {};
         var items = model.getItems(startDate,endDate);
@@ -111,8 +118,8 @@
                         text =  i18n.tr("%1 ev.").arg(events.length)
                     } else {
                         if( events.length > 1) {
-                           // TRANSLATORS: the argument refers to the number of all day events
-                           text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)
+                            // TRANSLATORS: the argument refers to the number of all day events
+                            text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)
                         } else {
                             text = events[0].displayLabel;
                         }

=== 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 @@
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction
         ]
+        contents: Label {
+            id:year
+            objectName:"yearLabel"
+            fontSize: "x-large"
+            text: i18n.tr("Year %1").arg(currentYear)
+        }
     }
 
     PathViewBase {