Merge lp:~mardy/ubuntu-system-settings-online-accounts/window-raising into lp:~mardy/ubuntu-system-settings-online-accounts/master

[Alberto Mardegan]

When processing completes, raise the caller application

Under unity8, use QDesktopServices to raise the application which invoked OA. Also, avoid queuing requests to open OA from the System Settings.

[David Barth (dbarth)]

The workarounds are fine. Hopefully they won't be needed for long.

review: Approve

=== modified file 'src/panel-request.cpp'
--- src/panel-request.cpp	2014-05-09 10:52:01 +0000
+++ src/panel-request.cpp	2014-05-30 11:54:13 +0000
@@ -23,6 +23,8 @@
 #include "globals.h"
 #include "panel-request.h"
 
+#include <QDesktopServices>
+#include <QGuiApplication>
 #include <QStandardPaths>
 #include <QQmlContext>
 #include <QQmlEngine>
@@ -101,6 +103,10 @@
 
     if (!visible) {
         q->setResult(QVariantMap());
+        /* FIXME HACK: remove when window reparenting is implemented */
+        if (QGuiApplication::platformName().startsWith("ubuntu")) {
+            QDesktopServices::openUrl(QUrl("application:///ubuntu-system-settings.desktop"));
+        }
     }
 }
 
 
=== modified file 'src/provider-request.cpp'
--- src/provider-request.cpp	2014-02-03 10:27:39 +0000
+++ src/provider-request.cpp	2014-05-30 11:54:13 +0000
@@ -24,6 +24,8 @@
 #include "globals.h"
 #include "provider-request.h"
 
+#include <QDesktopServices>
+#include <QGuiApplication>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQuickItem>
@@ -133,6 +135,14 @@
 
     if (!visible) {
         q->setResult(QVariantMap());
+        /* FIXME HACK: remove when window reparenting is implemented */
+        QString profile =
+            m_applicationInfo.value(QStringLiteral("profile")).toString();
+        if (QGuiApplication::platformName().startsWith("ubuntu") &&
+            !profile.isEmpty()) {
+            QDesktopServices::openUrl(
+                QUrl(QString("application:///%1.desktop").arg(profile)));
+        }
     }
 }
 
 
=== modified file 'system-settings-plugin/plugin.cpp'
--- system-settings-plugin/plugin.cpp	2013-09-09 10:56:53 +0000
+++ system-settings-plugin/plugin.cpp	2014-05-30 11:54:13 +0000
@@ -36,13 +36,20 @@
     QQmlComponent *pageComponent(QQmlEngine *engine,
                                  QObject *parent = 0) Q_DECL_OVERRIDE;
 
+private Q_SLOTS:
+    void onFinished();
+
 private:
     OnlineAccountsClient::Setup m_setup;
+    bool m_isOpen;
 };
 
 Item::Item(const QVariantMap &staticData, QObject *parent):
-    ItemBase(staticData, parent)
+    ItemBase(staticData, parent),
+    m_isOpen(false)
 {
+    QObject::connect(&m_setup, SIGNAL(finished()),
+                     this, SLOT(onFinished()));
 }
 
 Item::~Item()
@@ -54,11 +61,20 @@
 {
     Q_UNUSED(engine);
     Q_UNUSED(parent);
-    qDebug() << "Opening Online Accounts";
-    m_setup.exec();
+
+    if (!m_isOpen) {
+        qDebug() << "Opening Online Accounts";
+        m_isOpen = true;
+        m_setup.exec();
+    }
     return 0;
 }
 
+void Item::onFinished()
+{
+    m_isOpen = false;
+}
+
 Plugin::Plugin():
     QObject()
 {