Unity 8

Merge lp://staging/~macslow/unity8/replace-combo-button-fix-1384730 into lp://staging/unity8

replace-combo-button-fix-1384730
Merge into trunk

Proposed by Mirco Müller on 2014-10-31

Status:

Merged

Approved by:

Albert Astals Cid on 2014-11-07

Approved revision:

1383

Merged at revision:

1424

Proposed branch:

lp://staging/~macslow/unity8/replace-combo-button-fix-1384730

Merge into:

lp://staging/unity8

Diff against target:

656 lines (+418/-153)

5 files modified

qml/Notifications/Notification.qml (+8/-99)
qml/Notifications/OptionToggle.qml (+123/-0)
tests/qmltests/CMakeLists.txt (+1/-0)
tests/qmltests/Notifications/tst_Notifications.qml (+0/-54)
tests/qmltests/Notifications/tst_OptionToggle.qml (+286/-0)

To merge this branch:

bzr merge lp://staging/~macslow/unity8/replace-combo-button-fix-1384730

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-11-07
Albert Astals Cid (community)		2014-10-31	Approve on 2014-11-07
Review via email: mp+240283@code.staging.launchpad.net

Commit message

Replace ComboButton in snap-decision notifications, used for additional actions (> 3 actions), with custom widget immune to accidental taps.

Description of the change

Replace ComboButton in snap-decision notifications, used for additional actions (> 3 actions), with custom widget immune to accidental taps.

You can test it with the examples/sd-example-incoming-call.py Python-script from lp:unity-notifications.

For the reviewers convenience, here's a video the new widget in action: https://www.youtube.com/watch?v=iQ10vdpn6Cw

* 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?
Not applicable.

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

Revision history for this message

Mirco Müller (macslow) wrote on 2014-10-31:

Current state of this branch in action... https://www.youtube.com/watch?v=iQ10vdpn6Cw

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-04:

FAILED: Continuous integration, rev:1375
http://jenkins.qa.ubuntu.com/job/unity8-ci/4818/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6459/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1914/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1912/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7711/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~macslow/unity8/replace-combo-button-fix-1384730 updated on 2014-11-04

1376. By Mirco Müller on 2014-11-04: Merged with trunk and fixed conflicts.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-11-05:

Text conflict in tests/qmltests/CMakeLists.txt
Text conflict in tests/qmltests/Notifications/tst_Notifications.qml
2 conflicts encountered.

lp://staging/~macslow/unity8/replace-combo-button-fix-1384730 updated on 2014-11-06

1377. By Mirco Müller on 2014-11-06: Merged with trunk and resolved conflicts.
1378. By Mirco Müller on 2014-11-06: Update icon-visibility-check for notification's OptionToggle-qmltest.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-06:

FAILED: Continuous integration, rev:1378
http://jenkins.qa.ubuntu.com/job/unity8-ci/4836/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/22/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~macslow/unity8/replace-combo-button-fix-1384730 updated on 2014-11-06

1379. By Mirco Müller on 2014-11-06: Doh.
1380. By Mirco Müller on 2014-11-06: Added a small debug-output, so one sees something on the terminal when running tryOptionToggle and clicking on an action.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-06:

FAILED: Continuous integration, rev:1379
http://jenkins.qa.ubuntu.com/job/unity8-ci/4838/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/26/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-06:

FAILED: Continuous integration, rev:1380
http://jenkins.qa.ubuntu.com/job/unity8-ci/4839/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/30/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-11-07:

/tmp/buildd/unity8-8.01+15.04.20141104bzr1380pkg0vivid16/tests/qmltests/Notifications/tst_Notifications.qml: bad whitespace in line 270

review: Needs Fixing

lp://staging/~macslow/unity8/replace-combo-button-fix-1384730 updated on 2014-11-07

1381. By Mirco Müller on 2014-11-07: *sigh* qtcreator is very odd with regards to whitespaces.
1382. By Mirco Müller on 2014-11-07: Removed copyNpaste error.