Merge lp:~tpeeters/ubuntu-ui-toolkit/listitem-textarea into lp:ubuntu-ui-toolkit

[Tim Peeters]

Remove mouse parameters from AbstractButton's signals.

Remove mouse parameters from AbstractButton's signals.

[Tim Peeters (tpeeters)]

See linked bug why I made this change. We are not using keyboard handling anywhere, do we really need it now? Also, the clicked() signal currently needs a mouse parameter that the keyboard events cannot give it.

review: Needs Information

[Michał Sawicz (saviq)]

Even if not right now, we need support for keyboard navigation really soon. The core apps that are being developed might be as useful on the Ubuntu desktop, and IMO instead of removing this, we should fix it, if it poses problems.

The fix, IMO, should be that ListItem.Empty should not inherit AbstractButton.

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:416
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1011/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1011

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1011/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

I must agree with saviq. But why an abstract button's clicked() signal must bring a mouse event with it? It is a component, the signal is emitted when the mouse click happens on button area, and I guess noone really cares the details of the click. If they really do, they can connect to __mouseArea to get that.

[Tim Peeters (tpeeters)]

Removing the var mouse from the clicked events seems to work fine everywhere and it removes the error messages. But still the TextArea forwards the key events to its parent, so they get eaten by the ListItem.Empty instead of added inside the TextArea.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1012/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1012

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1012/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

I'm happy with that API change but it must be documented in CHANGES.

review: Needs Fixing

[Florian Boucault (fboucault)]

Note that the actual bug #1166840 is being fixed by Zsombor separately.

[Zsombor Egri (zsombi)]

The bug was taken away from this MR. Tim, please proceed with the MR.

[Tim Peeters (tpeeters)]

Is there still a good reason to remove the mouse parameter?

review: Needs Information

[lp:~tpeeters/ubuntu-ui-toolkit/listitem-textarea]

421. By Tim Peeters on 2013-04-15

Empty commit to figure out some launchpad weirdness

422. By Tim Peeters on 2013-04-15

remove mouse parameter in remaining clicked() and pressAndHold() calls

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:422
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1020
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1020
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1020

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1020/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

The mouse parameter for the signals of AbstractButton were removed (and CHANGES was updated), but the Keys are no longer touched in this MR.

=== modified file 'CHANGES'
--- CHANGES	2013-04-12 12:09:26 +0000
+++ CHANGES	2013-04-15 18:51:29 +0000
@@ -15,7 +15,8 @@
 API Changes
 ***********
 
-* None
+* clicked() and pressAndHold() signals of AbstractButton no longer take a mouse
+  parameter as input.
 
 SDK 0.1.42
 ##########

=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2013-03-15 18:20:36 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2013-04-15 18:51:29 +0000
@@ -35,7 +35,7 @@
        This handler is called when there is a mouse click on the button
        and the button is not disabled.
     */
-    signal clicked(var mouse)
+    signal clicked()
 
     Keys.onEnterPressed: clicked()
     Keys.onReturnPressed: clicked()
@@ -44,7 +44,7 @@
       \preliminary
       This handler is called when there is a long press.
      */
-    signal pressAndHold(var mouse)
+    signal pressAndHold()
 
     /*!
      \preliminary
@@ -80,12 +80,12 @@
 
         onClicked: {
             if (button.__acceptEvents) {
-                button.clicked(mouse)
+                button.clicked()
             }
         }
         onPressAndHold: {
             if (button.__acceptEvents) {
-                button.pressAndHold(mouse)
+                button.pressAndHold()
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2013-03-20 19:15:15 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2013-04-15 18:51:29 +0000
@@ -55,7 +55,7 @@
     property AbstractButton control
 
     /*! \internal */
-    onClicked: control.clicked(mouse)
+    onClicked: control.clicked()
     pressed: __mouseArea.pressed || control.__mouseArea.pressed
     /*! \internal */
     onPressedChanged: control.pressed = singleControlListItem.pressed

=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2013-03-20 18:35:06 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2013-04-15 18:51:29 +0000
@@ -249,21 +249,17 @@
 
             onClicked: {
                 if (control && __mouseArea.mouseX < progressionHelper.x) {
-                    control.clicked(mouse)
-                    mouse.accepted = true
+                    control.clicked();
                 } else {
-                    listItem.clicked(mouse)
-                    mouse.accepted = true
+                    listItem.clicked();
                 }
             }
 
             onPressAndHold: {
                 if (control && __mouseArea.mouseX < progressionHelper.x) {
-                    control.pressAndHold(mouse)
-                    mouse.accepted = true
+                    control.pressAndHold();
                 } else {
-                    listItem.pressAndHold(mouse)
-                    mouse.accepted = true
+                    listItem.pressAndHold();
                 }
             }
         }