Merge lp:~rpadovani/webbrowser-app/1351165 into lp:webbrowser-app

[Riccardo Padovani]

Enabled swipe gesture to delete a bookmark from the new tab view

Enabled swipe gesture to delete a bookmark from the new tab view

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:762
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1188/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5891
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/387
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/387/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/387
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7143
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14614
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4396
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4396/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1188/rebuild

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/webbrowser-app/1351165]

763. By Riccardo Padovani on 2014-10-17

Merged from prerequisite branch

764. By Riccardo Padovani on 2014-10-17

Reverted QtQuick version bump

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:764
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6016
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/398
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7268
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14798
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4470
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4470/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1199/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

At a quick glance, that looks good, thanks for working on this!

I don’t think the onBookmarkRemoved handler in NewTabView.qml is needed: the sections should be made dynamic without having to manually add/remove them, but that can be addressed separately (for which I filed bug #1389605).

So I would suggest to remove the handler for now, and with that it should be good (still need to do some functional testing on a device).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:764
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1237/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6474
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4294/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/436
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/436/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/436
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15461
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3646/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4688
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4688/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1237/rebuild

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/webbrowser-app/1351165]

765. By Riccardo Padovani on 2014-11-05

Removed onBookmarkRemoved handler in NewTabView.qml

[Riccardo Padovani (rpadovani)]

> At a quick glance, that looks good, thanks for working on this!
>
> I don’t think the onBookmarkRemoved handler in NewTabView.qml is needed: the
> sections should be made dynamic without having to manually add/remove them,
> but that can be addressed separately (for which I filed bug #1389605).
>
> So I would suggest to remove the handler for now, and with that it should be
> good (still need to do some functional testing on a device).

Makes sense, done!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:765
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1242/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/441
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/441/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/441
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15493
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4701
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4701/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1242/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good and works fine, thanks Riccardo!

review: Approve

=== modified file 'src/app/webbrowser/BookmarksList.qml'
--- src/app/webbrowser/BookmarksList.qml	2014-10-10 17:39:16 +0000
+++ src/app/webbrowser/BookmarksList.qml	2014-11-05 19:10:24 +0000
@@ -27,6 +27,7 @@
     property alias footerLabelVisible: footerLabel.visible
 
     signal bookmarkClicked(url url)
+    signal bookmarkRemoved(url url)
     signal footerLabelClicked()
 
     spacing: units.gu(1)
@@ -35,8 +36,10 @@
 
     Repeater {
         id: bookmarksListRepeater
+        property var _currentSwipedItem: null
 
         delegate: UrlDelegate{
+            id: urlDelegate
             width: bookmarksList.width
             height: units.gu(5)
 
@@ -45,6 +48,81 @@
             url: model.url
 
             onItemClicked: bookmarkClicked(model.url)
+
+            property var removalAnimation
+            function remove() {
+                removalAnimation.start()
+            }
+
+            onSwippingChanged: {
+                bookmarksListRepeater._updateSwipeState(urlDelegate)
+            }
+
+            onSwipeStateChanged: {
+                bookmarksListRepeater._updateSwipeState(urlDelegate)
+            }
+
+            leftSideAction: Action {
+                iconName: "delete"
+                text: i18n.tr("Delete")
+                onTriggered: {
+                    urlDelegate.remove()
+                }
+            }
+
+            ListView.onRemove: ScriptAction {
+                script: {
+                    if (bookmarksListRepeater._currentSwipedItem === urlDelegate) {
+                        bookmarksListRepeater._currentSwipedItem = null
+                    }
+                }
+            }
+
+            removalAnimation: SequentialAnimation {
+                alwaysRunToEnd: true
+
+                PropertyAction {
+                    target: urlDelegate
+                    property: "ListView.delayRemove"
+                    value: true
+                }
+
+                UbuntuNumberAnimation {
+                    target: urlDelegate
+                    property: "height"
+                    to: 0
+                }
+
+                PropertyAction {
+                    target: urlDelegate
+                    property: "ListView.delayRemove"
+                    value: false
+                }
+
+                ScriptAction {
+                    script: {
+                        bookmarkRemoved(model.url)
+                    }
+                }
+            }
+        }
+
+        function _updateSwipeState(item) {
+            if (item.swipping) {
+                return
+            }
+
+            if (item.swipeState !== "Normal") {
+                if (bookmarksListRepeater._currentSwipedItem !== item) {
+                    if (bookmarksListRepeater._currentSwipedItem) {
+                        bookmarksListRepeater._currentSwipedItem.resetSwipe()
+                    }
+                    bookmarksListRepeater._currentSwipedItem = item
+                }
+            } else if (item.swipeState !== "Normal"
+            && bookmarksListRepeater._currentSwipedItem === item) {
+                bookmarksListRepeater._currentSwipedItem = null
+            }
         }
     }
 

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2014-10-07 08:32:45 +0000
+++ src/app/webbrowser/Browser.qml	2014-11-05 19:10:24 +0000
@@ -474,6 +474,7 @@
                             currentWebview.url = url
                             currentWebview.forceActiveFocus()
                         }
+                        onBookmarkRemoved: browser.bookmarksModel.remove(url)
                         onHistoryEntryClicked: {
                             currentWebview.url = url
                             currentWebview.forceActiveFocus()

=== modified file 'src/app/webbrowser/NewTabView.qml'
--- src/app/webbrowser/NewTabView.qml	2014-09-10 13:53:02 +0000
+++ src/app/webbrowser/NewTabView.qml	2014-11-05 19:10:24 +0000
@@ -29,6 +29,7 @@
     property QtObject historyModel
 
     signal bookmarkClicked(url url)
+    signal bookmarkRemoved(url url)
     signal historyEntryClicked(url url)
 
     QtObject {
@@ -142,6 +143,7 @@
             footerLabelVisible: bookmarksListModel.unlimitedCount > internal.bookmarksCountLimit
 
             onBookmarkClicked: newTabView.bookmarkClicked(url)
+            onBookmarkRemoved: newTabView.bookmarkRemoved(url)
             onFooterLabelClicked: internal.seeMoreBookmarksView = !internal.seeMoreBookmarksView
         }
     }