Ubuntu UI Toolkit

Merge lp://qastaging/~daker/ubuntu-ui-toolkit/fix.1333228 into lp://qastaging/ubuntu-ui-toolkit/staging

fix.1333228
Merge into staging

Proposed by Adnane Belmadiaf on 2017-02-25

Status:

Merged

Approved by:

Cris Dywan on 2017-03-01

Approved revision:

2190

Merged at revision:

2183

Proposed branch:

lp://qastaging/~daker/ubuntu-ui-toolkit/fix.1333228

Merge into:

lp://qastaging/ubuntu-ui-toolkit/staging

Diff against target:

163 lines (+108/-3)

3 files modified

examples/ubuntu-ui-toolkit-gallery/Toggles.qml (+43/-0)
src/imports/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+17/-3)
tests/unit/visual/tst_toggles.13.qml (+48/-0)

To merge this branch:

bzr merge lp://qastaging/~daker/ubuntu-ui-toolkit/fix.1333228

Related bugs:

Bug #1333228: [sdk] Clicking on checkbox label should toggle the checkbox	Medium	Fix Released
Bug #1442851: Checkbox labels ellipsized on phone screen in portrait orientation	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration	2017-02-25	Approve on 2017-03-01
Cris Dywan			Approve on 2017-03-01
Review via email: mp+318311@code.qastaging.launchpad.net

Commit message

Add support for CheckBox label when set
Add more tests for checkbox

Description of the change

Add support for CheckBox label when set
Add support for multiline label
Add more tests for checkbox

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2017-02-26:

PASSED: Continuous integration, rev:2183
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1469/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7782/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1469/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2017-02-26:

PASSED: Continuous integration, rev:2183
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1684/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7783/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1684/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2017-02-26:

PASSED: Continuous integration, rev:2183
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/911/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1684
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1469
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7784/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7783
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7782

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/911/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2017-02-28:

> text: "This a checkbox \n a multiline label \n with long texte"

This reads a bit awkward. How about:

"This is a checkbox\nwith a label\nspanning several lines"

> property int checkedState: checked ? Qt.Checked : Qt.Unchecked

Please drop this from the branch. We essentially don't want to introduce any new features to existing components that will be superseded by QQC2 components eventually. In this case http://doc.qt.io/qt-5/qml-qtquick-controls-checkbox.html#checkedState-prop .

> + count = styledItem.text.split("\n").length

How about using http://doc.qt.io/qt-5/qml-qtquick-text.html#lineCount-prop here. Or better yet, max(contentHeight, units.gu(2))?