Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1508440 into lp:ubuntu-calendar-app

[Arthur Mello]

Set event's title with strike-through text when user is not attending it

Set event's title with strike-through text when user is not attending it

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1508440]

804. By Arthur Mello on 2016-03-28

Merge with trunk

805. By Arthur Mello on 2016-03-28

Use alias

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1508440]

806. By Arthur Mello on 2016-03-28

Do not change collor of declined events

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2016-03-22 20:14:49 +0000
+++ EventBubble.qml	2016-03-28 18:14:49 +0000
@@ -38,6 +38,7 @@
     property Flickable flickable;
     property bool isEventBubble: true
     property real minimumHeight: units.gu(4)
+    property alias strikeoutTitle: eventTitle.font.strikeout
 
     readonly property bool isSingleLine: (infoBubble.height < (minimumHeight * 2))
     readonly property real startTimeInMinutes: event ? CanlendarCanvas.minutesSince(infoBubble.anchorDate, event.startDateTime) : 0.0
@@ -64,11 +65,10 @@
             }
 
             if( endDateTime >= now) {
+                bg.color = collection.color
+
                 if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {
-                    //if owner of account is not attending event the dim it
-                    bg.color = Qt.tint( collection.color, "#aaffffff" );
-                } else {
-                    bg.color = collection.color
+                    infoBubble.strikeoutTitle = true;
                 }
             } else {
                 //if event is on past then add some white color to original color