Ubuntu UI Toolkit

Merge lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 into lp:ubuntu-ui-toolkit

fix-1213046
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2013-09-18

Status:

Merged

Approved by:

Bill Filler on 2013-09-30

Approved revision:

761

Merged at revision:

772

Proposed branch:

lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046

Merge into:

lp:ubuntu-ui-toolkit

Diff against target:

225 lines (+91/-5)

4 files modified

CHANGES (+1/-0)
components.api (+1/-0)
examples/ubuntu-ui-toolkit-gallery/ListItems.qml (+1/-0)
modules/Ubuntu/Components/ListItems/Empty.qml (+88/-5)

To merge this branch:

bzr merge lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-30
Bill Filler (community)			Approve on 2013-09-30
Gustavo Pichorim Boiko (community)		2013-09-18	Needs Fixing on 2013-09-23
Review via email: mp+186223@code.launchpad.net

Commit message

Added "confirmRemoval" in ListItem.Empty

This will ask for confirmation before remove the item.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-18:

FAILED: Continuous integration, rev:751
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/670/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1085/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/527/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/527/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3569/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1087/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-19:

FAILED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/679/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3619/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/536/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/536/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3631/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1149/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-20:

FAILED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/689/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3719/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/546/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/546/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3731/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1249/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-23:

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

review: Approve (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-09-23:

32 + Defines if the item need confirmation before remove by swiping

I'm no native English speaker, but I think this should read:

Defines if the item needs confirmation before removing by swiping

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

FAILED: Continuous integration, rev:755
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/738/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3996/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1514/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

FAILED: Continuous integration, rev:755
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/741/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4005/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1523/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1528/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/227/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/227/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4012/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1530/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-09-24:

It looks like changes introduced by the following MP may have broken this:
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/alarm-status/+merge/186285

That MP was merged into trunk just before the build failures started for ubuntu-ui-toolkit-ci/738. It also appears to change the 'alarm' feature which is also implicated by the failure message seen in all the builds:

QQmlComponent: Component is not ready
WARNING: default alarm manager not installed, using "memory" manager.
This manager may not provide all the needed features.

lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 updated on 2013-09-24

756. By Renato Araujo Oliveira Filho on 2013-09-24: Merged mainline.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

FAILED: Continuous integration, rev:756
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/745/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1549/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4030/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1551/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 updated on 2013-09-26

757. By Renato Araujo Oliveira Filho on 2013-09-26: Merged mainline.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

FAILED: Continuous integration, rev:757
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/767/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1660/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1662/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2013-09-27:

You need to update components.api.

lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 updated on 2013-09-27

758. By Renato Araujo Oliveira Filho on 2013-09-27: Fixed components.api.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-27:

FAILED: Continuous integration, rev:758
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/782/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1748/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/639/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/639/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1750/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 updated on 2013-09-27

759. By Renato Araujo Oliveira Filho on 2013-09-27: Updated components.api.
760. By Renato Araujo Oliveira Filho on 2013-09-27: Updated documentation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-27:

FAILED: Continuous integration, rev:760
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/788/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/645
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/645/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4242
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1761
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1478

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 updated on 2013-09-30

761. By Renato Araujo Oliveira Filho on 2013-09-30: Merged mainline.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2013-09-30:

approve

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-09-30:

review: Approve (continuous-integration)

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:

Brian Blevins

Caco V. Topia

Jaroslavas Karmazinas

Renato Araujo Oliveira Filho

Ubuntu SDK team

to status/vote changes:

william

 === modified file 'CHANGES'
 --- CHANGES	2013-09-12 13:56:14 +0000
 +++ CHANGES	2013-09-30 12:01:05 +0000
@@ -9,6 +9,7 @@
  API Changes
  ***********
++* ADDED IN: ListItem.Empty: property bool confirmRemoval
  * ADDED IN: OptionSelectorDelegate: property bool constrainImage
  * ADDED IN: Empty: property alias divider
  * ADDED IN: ListItems/OptionSelector: signal delegateSelected()
 === modified file 'components.api'
 --- components.api	2013-09-27 21:17:50 +0000
 +++ components.api	2013-09-30 12:01:05 +0000
@@ -401,6 +401,7 @@
      property bool selected
      property bool highlightWhenPressed
      property bool removable
++    property bool confirmRemoval
      readonly property string swipingState
      signal itemRemoved
      property int __height
 === modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
 --- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2013-09-03 10:12:39 +0000
 +++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2013-09-30 12:01:05 +0000
@@ -142,6 +142,7 @@
          delegate: ListItem.Standard {
              text: i18n.tr("Slide to remove")
              removable: true
++            confirmRemoval: (index % 2)
              backgroundIndicator: Rectangle {
                  anchors.fill: parent
                  color: Theme.palette.normal.base
 === modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
 --- modules/Ubuntu/Components/ListItems/Empty.qml	2013-09-18 02:26:23 +0000
 +++ modules/Ubuntu/Components/ListItems/Empty.qml	2013-09-30 12:01:05 +0000
@@ -97,6 +97,13 @@
      /*!
        \preliminary
++      Defines if the item needs confirmation before removing by swiping.
++      \qmlproperty bool confirmRemoval
++     */
++    property alias confirmRemoval: confirmRemovalDialog.visible
++
++    /*!
++      \preliminary
        \qmlproperty string swipingState
        The current swiping state ("SwipingLeft", "SwipingRight", "")
       */
@@ -174,7 +181,7 @@
          /*! \internal
            Defines the offset limit to consider the item removed
           */
--        readonly property int itemMoveOffset: width * 0.3
++        readonly property int itemMoveOffset: confirmRemoval ?  width * 0.5 : width * 0.3
          /*! \internal
            Defines the inital pressed possition
@@ -211,10 +218,13 @@
              Resets the item dragging state
           */
          function resetDrag() {
++            body.x = 0
              pressedPosition = -1
              __mouseArea.drag.target = null
              held = false
              removeItem = false
++            backgroundIndicator.opacity = 0.0
++            backgroundIndicator.visible = false
              backgroundIndicator.state = ""
+         }
@@ -223,7 +233,9 @@
          */
          function commitDrag() {
              if (removeItem) {
--                removeItemAnimation.start()
++                if (!confirmRemoval) {
++                    removeItemAnimation.start()
++                }
              } else {
                  resetDrag()
+             }
@@ -244,10 +256,14 @@
              } else if (held == true) {
                  held = false
                  removeItem = true
++                var finalX = body.width
++                if (emptyListItem.confirmRemoval) {
++                    finalX = itemMoveOffset
++                }
                  if (body.x > 0) {
--                    body.x = body.width
++                    body.x = finalX
                  } else {
--                    body.x = body.width * -1
++                    body.x = -finalX
+                 }
+             }
+         }
@@ -307,6 +323,7 @@
              id: backgroundIndicator
              opacity: 0.0
++            visible: false
              anchors {
                  left: parent.left
                  right: parent.right
@@ -314,18 +331,73 @@
                  bottom: parent.bottom
+             }
++            Item {
++                id: confirmRemovalDialog
++
++                width: units.gu(15)
++                anchors {
++                    top: parent.top
++                    bottom: parent.bottom
++                }
++
++                Row {
++                    anchors {
++                        top: parent.top
++                        bottom:  parent.bottom
++                        left: parent.left
++                        right: parent.right
++                        leftMargin: units.gu(2)
++                        rightMargin: units.gu(2)
++                    }
++
++                    spacing: units.gu(2)
++                    Image {
++                        source: "artwork/delete.png"
++                        fillMode: Image.Pad
++                        anchors {
++                            top: parent.top
++                            bottom: parent.bottom
++                        }
++                        width: units.gu(5)
++                    }
++                    Label {
++                        text: i18n.tr("Delete")
++                        verticalAlignment: Text.AlignVCenter
++                        anchors {
++                            top: parent.top
++                            bottom: parent.bottom
++                        }
++                        width: units.gu(7)
++                        fontSize: "medium"
++                    }
++                }
++
++                MouseArea {
++                    anchors.fill: parent
++                    onClicked: removeItemAnimation.start()
++                }
++            }
++
++
              states: [
                  State {
                      name: "SwipingRight"
++
                      AnchorChanges {
                          target: backgroundIndicator
                          anchors.left: parent.left
                          anchors.right: body.left
+                     }
++
                      PropertyChanges {
                          target: backgroundIndicator
                          opacity: 1.0
+                     }
++
++                    PropertyChanges {
++                        target: confirmRemovalDialog
++                        x: body.x - confirmRemovalDialog.width - units.gu(2)
++                    }
                  },
                  State {
                      name: "SwipingLeft"
@@ -334,10 +406,16 @@
                          anchors.left: body.right
                          anchors.right: parent.right
+                     }
++
                      PropertyChanges {
                          target: backgroundIndicator
                          opacity: 1.0
+                     }
++
++                    PropertyChanges {
++                        target: confirmRemovalDialog
++                        x: units.gu(2)
++                    }
+                 }
+             ]
+         }
@@ -375,12 +453,17 @@
+             }
+         }
++        onClicked: {
++            if (body.x != 0) {
++                priv.resetDrag()
++            }
++        }
++
          onReleased: {
              priv.endDrag();
+         }
          onCanceled: {
--
              priv.endDrag();
+         }
+     }
 === added file 'modules/Ubuntu/Components/ListItems/artwork/delete@8.png'
 Binary files modules/Ubuntu/Components/ListItems/artwork/delete@8.png	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/ListItems/artwork/delete@8.png	2013-09-30 12:01:05 +0000 differ

Ubuntu UI Toolkit

Merge lp:~renatofilho/ubuntu-ui-toolkit/fix-1213046 into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers