Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1231729 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Delay destruction of the delegate until the edit page is popped

Use ListView.delayRemove feature to delay the destruction of the delegate until
we have removed the edit page from the stack.

Delay destruction of the delegate until the edit page is popped

Use ListView.delayRemove feature to delay the destruction of the delegate until
we have removed the edit page from the stack.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-saucy-amd64-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-online-accounts-ci/43/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'src/AccountEditPage.qml'
--- src/AccountEditPage.qml	2013-06-05 11:33:39 +0000
+++ src/AccountEditPage.qml	2013-10-02 10:50:40 +0000
@@ -22,8 +22,12 @@
 import "constants.js" as Constants
 
 Page {
+    id: root
+
     property variant accountHandle
 
+    signal finished
+
     title: account.provider.displayName
 
     Account {
@@ -42,7 +46,7 @@
             target: loader.item
             onFinished: {
                 console.log("====== PLUGIN FINISHED ======")
-                pageStack.pop()
+                root.finished()
             }
         }
     }

=== modified file 'src/AccountItem.qml'
--- src/AccountItem.qml	2013-05-30 13:00:54 +0000
+++ src/AccountItem.qml	2013-10-02 10:50:40 +0000
@@ -22,7 +22,10 @@
 import Ubuntu.OnlineAccounts 0.1
 
 ListItem.Subtitled {
+    property variant accountHandle
     property variant globalServiceHandle
+    property variant __editPage: null
+    property bool running: false
 
     text: providerName
     subText: displayName
@@ -30,8 +33,29 @@
     progression: true
     opacity: globalService.enabled ? 1 : 0.5
 
-    resources: AccountService {
-        id: globalService
-        objectHandle: globalServiceHandle
+    resources: [
+        AccountService {
+            id: globalService
+            objectHandle: globalServiceHandle
+        },
+        Component {
+            id: accountEditPage
+            AccountEditPage {}
+        }
+    ]
+
+    onClicked: {
+        __editPage = accountEditPage.createObject(null, {
+            "accountHandle": accountHandle })
+        __editPage.finished.connect(__onEditFinished)
+        pageStack.push(__editPage)
+        running = true;
+    }
+
+    function __onEditFinished() {
+        __editPage.destroy(1000)
+        __editPage = null
+        pageStack.pop()
+        running = false
     }
 }

=== modified file 'src/AccountsPage.qml'
--- src/AccountsPage.qml	2013-07-11 10:06:49 +0000
+++ src/AccountsPage.qml	2013-10-02 10:50:40 +0000
@@ -30,15 +30,19 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        Repeater {
+        ListView {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            interactive: false
+            height: contentHeight
             model: accountsModel
 
             delegate: AccountItem {
+                ListView.delayRemove: running
                 text: providerName
                 subText: displayName
+                accountHandle: account
                 globalServiceHandle: accountService
-                onClicked: pageStack.push(accountEditPage,
-                                          { accountHandle: account })
             }
         }
 
@@ -58,9 +62,4 @@
         id: newAccountPage
         NewAccountPage {}
     }
-
-    Component {
-        id: accountEditPage
-        AccountEditPage {}
-    }
 }