From 390fe520daaa7eef2cd1aa9d8149c65dfd39ddb7 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 21 Jun 2017 09:33:18 +0200 Subject: Immediately trigger a sync when creating an account ... and return to the mailview --- components/accounts/contents/ui/AccountWizard.qml | 4 ++++ components/accounts/contents/ui/AccountWizardPage.qml | 8 ++++++-- components/kube/contents/ui/Kube.qml | 6 ++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml index eff9fbb7..c5ec4ba3 100644 --- a/components/accounts/contents/ui/AccountWizard.qml +++ b/components/accounts/contents/ui/AccountWizard.qml @@ -73,6 +73,10 @@ Kube.Popup { Component { id: wizardPage AccountWizardPage { + onDone: { + popup.close() + Kube.Fabric.postMessage(Kube.Messages.componentDone, {}) + } } } } diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml index 07fbc73f..e77f0cd9 100644 --- a/components/accounts/contents/ui/AccountWizardPage.qml +++ b/components/accounts/contents/ui/AccountWizardPage.qml @@ -28,6 +28,7 @@ import org.kube.framework 1.0 as Kube Item { id: root property string accountType + signal done() Kube.AccountFactory { id: accountFactory @@ -118,7 +119,7 @@ Item { text: "Discard" onClicked: { - popup.close() + root.done() } } @@ -131,7 +132,10 @@ Item { text: "Save" onClicked: { loader.item.save() - popup.close() + + Kube.Fabric.postMessage(Kube.Messages.synchronize, {"accountId": loader.item.accountIdentifier}); + + root.done() } } } diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml index 11c63a8a..c6fbffb9 100644 --- a/components/kube/contents/ui/Kube.qml +++ b/components/kube/contents/ui/Kube.qml @@ -171,7 +171,7 @@ Controls2.ApplicationWindow { Kube.Listener { filter: Kube.Messages.componentDone - onMessageReceived: kubeViews.pop({immediate: true}) + onMessageReceived: kubeViews.pop(Controls2.StackView.Immediate) } //TODO replacing here while a composer is open is destructive @@ -186,9 +186,7 @@ Controls2.ApplicationWindow { } } function setAccountsView() { - if (currentItem != accountsView) { - kubeViews.replace(null, accountsView, Controls2.StackView.Immediate) - } + kubeViews.push(accountsView, {}, Controls2.StackView.Immediate) } function setLogView() { if (currentItem != logView) { -- cgit v1.2.3