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

[Kunal Parmar]

Resolves Bug #1364985

Resolves Bug #1364985

Calendar name list in Calendar View needs to be ellided or support multi line

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

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

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me!!
Thanks kunal for MR.

review: Approve

=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2014-09-20 20:16:46 +0000
+++ CalendarChoicePopup.qml	2014-09-28 11:56:21 +0000
@@ -85,6 +85,7 @@
                 elide: Text.ElideRight
                 opacity: checkBox.checked ? 1.0 : 0.8
                 color: UbuntuColors.midAubergine
+                width: parent.width - calendarColorCode.width - checkBox.width - units.gu(6) /*margins*/
                 anchors {
                     left: calendarColorCode.right
                     margins: units.gu(2)

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-09-24 11:31:57 +0000
+++ NewEvent.qml	2014-09-28 11:56:21 +0000
@@ -508,7 +508,7 @@
                     model: root.model.getCollections();
 
                     delegate: OptionSelectorDelegate{
-                        text: modelData.name
+                        text: modelData.name                        
 
                         UbuntuShape{
                             id: calColor