Unity 8

Merge lp:~macslow/unity8/fix-1305885 into lp:unity8

fix-1305885
Merge into trunk

Proposed by Mirco Müller on 2014-07-22

Status:

Merged

Approved by:

Michael Zanetti on 2014-08-13

Approved revision:

1068

Merged at revision:

1149

Proposed branch:

lp:~macslow/unity8/fix-1305885

Merge into:

lp:unity8

Diff against target:

36 lines (+8/-0)

2 files modified

qml/Notifications/Notification.qml (+3/-0)
qml/Notifications/NotificationMenuItemFactory.qml (+5/-0)

To merge this branch:

bzr merge lp:~macslow/unity8/fix-1305885

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2014-07-22	Approve on 2014-08-13
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-08-09
Review via email: mp+227726@code.launchpad.net

Commit message

Allow ENTER/RETURN in a TextField to accept a snap-decision notification.

Description of the change

Allow ENTER/RETURN in a TextField to accept a snap-decision notification.

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

lp:~macslow/unity8/fix-1305885 updated on 2014-07-22

1063. By Mirco Müller on 2014-07-22: Replaced findChild() with signal-based solution to allow the TextField's accept method to trigger the notifications accept-action.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

FAILED: Continuous integration, rev:1062
http://jenkins.qa.ubuntu.com/job/unity8-ci/3530/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2314
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/532
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/624
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/624
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3523
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10221

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

FAILED: Continuous integration, rev:1063
http://jenkins.qa.ubuntu.com/job/unity8-ci/3538/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2328
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/632
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/632
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10232

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-07-24:

See inline

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-28:

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

review: Approve (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-04:

Bump?

Revision history for this message

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

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

review: Approve (continuous-integration)

lp:~macslow/unity8/fix-1305885 updated on 2014-08-06

1064. By Mirco Müller on 2014-08-06: Merged with trunk
1065. By Mirco Müller on 2014-08-06: Made code a bit tighter.

Revision history for this message

Mirco Müller (macslow) wrote on 2014-08-06:

Fixed mentioned issues.

lp:~macslow/unity8/fix-1305885 updated on 2014-08-06

1066. By Mirco Müller on 2014-08-06: Argl!

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-08-07:

I think a test would make sense here... Could we add one?

review: Needs Information

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-08-07:

code looks ok to me now.

Revision history for this message

Mirco Müller (macslow) wrote on 2014-08-07:

I'm adding a qml-test just now.

Revision history for this message

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

Mocking the needed UnityMenuModel hint to trigger a snap-decision with a TextEntry isn't very straight forward for a qml-test currently. We need to look into this later.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-08-08:

Sorry, I just realized you're reaching out of context with the notification.accept() call.

Why not just adding the acceped() signal to NotificationMenuItemFactory.qml and then add the handler inside the NotificationMenuItemFactory {} in Notification.qml?

review: Needs Fixing

lp:~macslow/unity8/fix-1305885 updated on 2014-08-08

1067. By Mirco Müller on 2014-08-08: Avoid using accessing notification in MenuItemFactory.
1068. By Mirco Müller on 2014-08-08: Merged with trunk *sigh*

Revision history for this message

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

Updated the branch with suggested fix.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-09:

FAILED: Continuous integration, rev:1068
http://jenkins.qa.ubuntu.com/job/unity8-ci/3833/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3243
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/835/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/927
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/927/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4488/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11194

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-08-13:

ok. happy now :)

* Did you perform an exploratory manual test run of the code change and any related functionality?

yip yip

* Did CI run pass? If not, please explain why.

no... unrelated failures

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mirco Müller

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Notifications/Notification.qml'
2	--- qml/Notifications/Notification.qml 2014-07-17 09:37:51 +0000
3	+++ qml/Notifications/Notification.qml 2014-08-08 11:04:22 +0000
4	@@ -311,6 +311,9 @@
5	onLoaded: {
6	notification.fullscreen = Qt.binding(function() { return fullscreen; });
7	}
8	+ onAccepted: {
9	+ notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
10	+ }
11	}
12	}
13	}
14
15	=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
16	--- qml/Notifications/NotificationMenuItemFactory.qml 2014-07-22 12:13:02 +0000
17	+++ qml/Notifications/NotificationMenuItemFactory.qml 2014-08-08 11:04:22 +0000
18	@@ -30,6 +30,8 @@
19	property int maxHeight
20	readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
21
22	+ signal accepted()
23	+
24	property var _map: {
25	"com.canonical.snapdecision.textfield": textfield,
26	"com.canonical.snapdecision.pinlock" : pinLock,
27	@@ -82,6 +84,9 @@
28	onTextChanged: {
29	menuModel.changeState(menuIndex, text);
30	}
31	+ onAccepted: {
32	+ menuFactory.accepted()
33	+ }
34	}
35
36	Row {