Merge lp:~lukas-kde/unity8/notificationsNewline into lp:unity8

[Lukáš Tinkl]

Revert to using plaintext instead of HTML-like markup for the notifications

Revert to using plaintext instead of HTML-like markup for the notifications

In the long term, we should fix unity-notifications to support a HTML subset according the the spec: http://www.galago-project.org/specs/notification/0.9/x161.html

Cf. https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1504256

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2000
http://jenkins.qa.ubuntu.com/job/unity8-ci/6436/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4566
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/676
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4563
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24091
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/815
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24087

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6436/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Enough
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-09-24 12:51:59 +0000
+++ qml/Notifications/Notification.qml	2015-10-08 19:35:54 +0000
@@ -283,7 +283,7 @@
                         fontSize: "medium"
                         color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
                         elide: Text.ElideRight
-                        textFormat: Text.StyledText
+                        textFormat: Text.PlainText
                     }
 
                     Label {
@@ -300,7 +300,7 @@
                         wrapMode: Text.WordWrap
                         maximumLineCount: type == Notification.SnapDecision ? 12 : 2
                         elide: Text.ElideRight
-                        textFormat: Text.StyledText
+                        textFormat: Text.PlainText
                     }
                 }