Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/elide into lp:ubuntu-ui-toolkit/staging

  1. elide
  2. Merge into staging
Proposed by Tim Peeters
Status: Merged
Approved by: Cris Dywan
Approved revision: 1056
Merged at revision: 1052
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/elide
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 35 lines (+3/-2)
2 files modified
modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml (+2/-1)
tests/resources/toolbar/headerTools.qml (+1/-1)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/elide
Reviewer Review Type Date Requested Status
Cris Dywan Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+219437@code.launchpad.net

Description of the change

Elide titles in the header that are too long to fit.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1056
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/229
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/229/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/224/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Would be nice if we could test that elision actually works/ is enabled… though it doesn't look like we can easily test it right now across different form factors so I'll approve with my eyes shut ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml 2014-05-06 16:25:45 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml 2014-05-13 22:09:58 +0000
4@@ -159,16 +159,17 @@
5
6 Label {
7 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
8-
9 visible: !styledItem.contents
10 anchors {
11 left: parent.left
12+ right: parent.right
13 verticalCenter: parent.verticalCenter
14 }
15 text: styledItem.title
16 font.weight: headerStyle.fontWeight
17 fontSize: headerStyle.fontSize
18 color: headerStyle.textColor
19+ elide: Text.ElideRight
20 }
21
22 Item {
23
24=== modified file 'tests/resources/toolbar/headerTools.qml'
25--- tests/resources/toolbar/headerTools.qml 2014-05-01 12:04:44 +0000
26+++ tests/resources/toolbar/headerTools.qml 2014-05-13 22:09:58 +0000
27@@ -30,7 +30,7 @@
28 }
29
30 Page {
31- title: "test page"
32+ title: "This is a long title for the test page"
33
34 Label {
35 anchors.centerIn: parent

Subscribers

People subscribed via source and target branches