Unity 8

Merge lp:~cimi/unity8/fix1544909 into lp:unity8

  1. fix1544909
  2. Merge into trunk
Proposed by Andrea Cimitan on 2016-02-12
Status: Merged
Approved by: Michał Sawicz on 2016-03-10
Approved revision: 2181
Merged at revision: 2230
Proposed branch: lp:~cimi/unity8/fix1544909
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
qml/Notifications/Notification.qml (+1/-1)
To merge this branch: bzr merge lp:~cimi/unity8/fix1544909
Reviewer Review Type Date Requested Status
Michał Sawicz 2016-02-12 Approve on 2016-03-10
Unity8 CI Bot continuous-integration Needs Fixing on 2016-03-10
Review via email: mp+285852@code.launchpad.net

Commit Message

Use Text.Wrap for body notification text

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
will ask popey to test, or I will
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

To post a comment you must log in.
Michał Sawicz (saviq) :
review: Approve
Michał Sawicz (saviq) wrote :

Please merge trunk

review: Needs Fixing
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2180
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/644/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/849/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/865/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/865/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/863/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/863/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/863/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/863/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/863/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/863/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/644/rebuild

review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) wrote :

> Please merge trunk
conflicts resolved

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2181
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/648/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/369
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/369
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/369
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/853
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/869
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/869
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/867/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/648/rebuild

review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) :
review: Abstain
Michał Sawicz (saviq) wrote :

We need to scroll the view to contain the text entry after having rated.

review: Needs Fixing
Michał Sawicz (saviq) wrote :

D'uh, wrong MP.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Notifications/Notification.qml'
2--- qml/Notifications/Notification.qml 2016-02-29 11:31:46 +0000
3+++ qml/Notifications/Notification.qml 2016-03-10 09:43:05 +0000
4@@ -297,7 +297,7 @@
5 visible: body != "" && type !== Notification.Confirmation
6 fontSize: "small"
7 color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
8- wrapMode: Text.WordWrap
9+ wrapMode: Text.Wrap
10 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
11 elide: Text.ElideRight
12 textFormat: Text.PlainText

Subscribers

People subscribed via source and target branches