Merge lp:~saviq/unity8/fix-generic-preview into lp:unity8

[Michał Sawicz]

Fix generic preview wrapping and force rich text parsing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity8-ci/602/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2175/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/603
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2181
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2181/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1846/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity8-ci/609/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2186
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1059/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/610
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2192
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2192/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1855

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity8-ci/622/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/623
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2216
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1880

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

As test, look for Elephant in the home scope and longpress in the one from the Info category

You'll see that without this, the text gets out of screen

[Albert Astals Cid (aacid)]

There's some small problems with wrapping sometimes, but it is a definite improvement over what we have, so i'm approving this and will log a bug about the wrapping since i don't see anything on our side that may be causing it (i.e. may very well be a Qt bug)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/212/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1120/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/211/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2304/console

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Much nicer

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/213/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1487/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2305/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/unity8-ci/649/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/650/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/649/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2306/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/214/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1491
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/213
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/213/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2312
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2312/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1958

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/216/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/215
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2317
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2317/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1963

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/217/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1498
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/216
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2325
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2325/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1971

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Dash/Generic/GenericPreview.qml'
--- Dash/Generic/GenericPreview.qml	2013-08-09 10:06:19 +0000
+++ Dash/Generic/GenericPreview.qml	2013-08-16 09:08:14 +0000
@@ -74,25 +74,33 @@
         spacing: units.gu(2)
 
         Label {
+            anchors { left: parent.left; right: parent.right }
             visible: text != ""
             fontSize: "medium"
             opacity: 0.6
             color: "white"
-            text: previewData.subtitle
+            text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")
             style: Text.Raised
             styleColor: "black"
             wrapMode: Text.WordWrap
+            textFormat: Text.RichText
+            // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
+            onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
         }
 
         Label {
+            anchors { left: parent.left; right: parent.right }
             visible: text != ""
             fontSize: "small"
             opacity: 0.6
             color: "white"
-            text: previewData.description
+            text: previewData.description.replace(/[\r\n]+/g, "<br />")
             style: Text.Raised
             styleColor: "black"
             wrapMode: Text.WordWrap
+            textFormat: Text.RichText
+            // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
+            onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
         }
     }
 }