Merge lp:~mardy/signon-ui/auth-1610206 into lp:signon-ui

[Alberto Mardegan]

Unify QML and QWidget code paths

[lp:~mardy/signon-ui/auth-1610206]

149. By Alberto Mardegan on 2016-11-02

Unify QML and QWidget code paths (LP: #1610206)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[lp:~mardy/signon-ui/auth-1610206]

150. By Alberto Mardegan on 2016-11-04

Use QT logging categories

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-06 09:17:36 +0000
+++ debian/changelog	2016-11-04 09:26:22 +0000
@@ -1,3 +1,11 @@
+signon-ui (0.17+16.04.20160406-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Remove dependency on libgstreamer-plugins-base0.10-dev 
+  * Unify QML and QWidget code paths (LP: #1610206)
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 02 Nov 2016 13:55:35 +0300
+
 signon-ui (0.17+16.04.20160406-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'debian/control'
--- debian/control	2014-09-16 09:27:40 +0000
+++ debian/control	2016-11-04 09:26:22 +0000
@@ -8,7 +8,6 @@
                libaccounts-qt5-dev,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev | libgles2-dev,
-               libgstreamer-plugins-base0.10-dev,
                libicu-dev,
                libnotify-dev,
                libproxy-dev,
 
=== modified file 'src/debug.cpp'
--- src/debug.cpp	2011-11-23 07:57:45 +0000
+++ src/debug.cpp	2016-11-04 09:26:22 +0000
@@ -20,10 +20,18 @@
 
 #include "debug.h"
 
+Q_LOGGING_CATEGORY(DBG_SIGNON_UI, "signon", QtWarningMsg)
+
 int appLoggingLevel = 1; // criticals
 
 void setLoggingLevel(int level)
 {
+    if (level >= 1) {
+        QLoggingCategory::setFilterRules("signon.warning=true");
+        if (level >= 2) {
+            QLoggingCategory::setFilterRules("signon.debug=true");
+        }
+    }
     appLoggingLevel = level;
 }
 
 
=== modified file 'src/debug.h'
--- src/debug.h	2011-11-23 07:57:45 +0000
+++ src/debug.h	2016-11-04 09:26:22 +0000
@@ -20,21 +20,13 @@
 #ifndef SIGNON_UI_DEBUG_H
 #define SIGNON_UI_DEBUG_H
 
-#include <QDebug>
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(DBG_SIGNON_UI)
 
 /* 0 - fatal, 1 - critical(default), 2 - info/debug */
 extern int appLoggingLevel;
 
-static inline bool debugEnabled()
-{
-    return appLoggingLevel >= 2;
-}
-
-static inline bool criticalsEnabled()
-{
-    return appLoggingLevel >= 1;
-}
-
 static inline int loggingLevel()
 {
     return appLoggingLevel;
@@ -42,15 +34,10 @@
 
 void setLoggingLevel(int level);
 
-#ifdef DEBUG_ENABLED
-    #define TRACE() \
-        if (debugEnabled()) qDebug() << __FILE__ << __LINE__ << __func__
-    #define BLAME() \
-        if (criticalsEnabled()) qCritical() << __FILE__ << __LINE__ << __func__
-#else
-    #define TRACE() while (0) qDebug()
-    #define BLAME() while (0) qDebug()
-#endif
+#define TRACE() \
+    qCDebug(DBG_SIGNON_UI) << __FILE__ << __LINE__ << __func__
+#define BLAME() \
+    qCWarning(DBG_SIGNON_UI) << __FILE__ << __LINE__ << __func__
 
 #endif // SIGNON_UI_DEBUG_H
 
 
=== modified file 'src/qquick-dialog.cpp'
--- src/qquick-dialog.cpp	2016-04-04 11:51:22 +0000
+++ src/qquick-dialog.cpp	2016-11-04 09:26:22 +0000
@@ -18,9 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define HAS_FOREIGN_QWINDOW (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) || \
-                             defined(FORCE_FOREIGN_QWINDOW))
-
 #include "qquick-dialog.h"
 
 #include "debug.h"
@@ -39,22 +36,6 @@
 {
 }
 
-void Dialog::show(WId parent, ShowMode mode)
-{
-    create();
-#if HAS_FOREIGN_QWINDOW
-    if (mode != TopLevel) {
-        QWindow *parentWindow = QWindow::fromWinId(parent);
-        if (mode == Transient) {
-            setTransientParent(parentWindow);
-        } else if (mode == Embedded) {
-            setParent(parentWindow);
-        }
-    }
-#endif
-    QQuickView::show();
-}
-
 void Dialog::accept()
 {
     done(Dialog::Accepted);
 
=== modified file 'src/qquick-dialog.h'
--- src/qquick-dialog.h	2014-04-07 12:39:16 +0000
+++ src/qquick-dialog.h	2016-11-04 09:26:22 +0000
@@ -45,8 +45,6 @@
     explicit Dialog(QWindow *parent = 0);
     ~Dialog();
 
-    void show(WId parent, ShowMode mode);
-
 public Q_SLOTS:
     void accept();
     void reject();
 
=== modified file 'src/request.cpp'
--- src/request.cpp	2016-04-06 08:00:59 +0000
+++ src/request.cpp	2016-11-04 09:26:22 +0000
@@ -18,7 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define HAS_XEMBED (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
 #define HAS_FOREIGN_QWINDOW (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) || \
                              defined(FORCE_FOREIGN_QWINDOW))
 #include "request.h"
@@ -29,9 +28,6 @@
 #include "browser-request.h"
 #include "debug.h"
 #include "dialog-request.h"
-#if HAS_XEMBED
-#include "embed-manager.h"
-#endif
 #include "errors.h"
 #include "indicator-service.h"
 #ifndef UNIT_TESTS
@@ -81,13 +77,10 @@
     }
 
 private Q_SLOTS:
-#if HAS_XEMBED
-    void onEmbedError();
-#endif
     void onIndicatorCallFinished(QDBusPendingCallWatcher *watcher);
 
 private:
-    void setWidget(QWidget *widget);
+    bool setWindow(QWindow *window);
     Accounts::Account *findAccount();
     bool dispatchToIndicator();
     void onIndicatorCallSucceeded();
@@ -100,7 +93,7 @@
     QVariantMap m_clientData;
     bool m_inProgress;
     Accounts::Manager *m_accountManager;
-    QPointer<QWidget> m_widget;
+    QPointer<QWindow> m_window;
 };
 
 } // namespace
@@ -116,7 +109,7 @@
     m_parameters(parameters),
     m_inProgress(false),
     m_accountManager(0),
-    m_widget(0)
+    m_window(0)
 {
     if (parameters.contains(SSOUI_KEY_CLIENT_DATA)) {
         QVariant variant = parameters[SSOUI_KEY_CLIENT_DATA];
@@ -130,82 +123,42 @@
 {
 }
 
-void RequestPrivate::setWidget(QWidget *widget)
+bool RequestPrivate::setWindow(QWindow *window)
 {
-    if (m_widget != 0) {
+    if (m_window != 0) {
         BLAME() << "Widget already set";
-        return;
-    }
-
-    m_widget = widget;
-
-#if HAS_XEMBED
-    if (embeddedUi() && windowId() != 0) {
-        TRACE() << "Requesting widget embedding";
-        QX11EmbedWidget *embed =
-            EmbedManager::instance()->widgetFor(windowId());
-        QObject::connect(embed, SIGNAL(error(QX11EmbedWidget::Error)),
-                         this, SLOT(onEmbedError()),
-                         Qt::UniqueConnection);
-        QObject::connect(embed, SIGNAL(containerClosed()),
-                         widget, SLOT(close()));
-        QVBoxLayout *layout = new QVBoxLayout;
-        layout->addWidget(widget);
-        widget->show();
-        /* Delete any previous layout */
-        delete embed->layout();
-        embed->setLayout(layout);
-        embed->show();
-        return;
-    }
-#endif
+        return false;
+    }
+
+    m_window = window;
+
 #if HAS_FOREIGN_QWINDOW
     if (embeddedUi() && windowId() != 0) {
         TRACE() << "Requesting window embedding";
         QWindow *host = QWindow::fromWinId(windowId());
-        widget->show();
-        widget->windowHandle()->setParent(host);
-        return;
+        window->show();
+        window->setParent(host);
+        return true;
     }
 #endif
 
     /* If the window has no parent and the webcredentials indicator service is
      * up, dispatch the request to it. */
     if (windowId() == 0 && dispatchToIndicator()) {
-        return;
+        return false;
     }
 
-    widget->setWindowModality(Qt::WindowModal);
-    widget->show();
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    if (windowId() != 0) {
-        TRACE() << "Setting" << widget->effectiveWinId() << "transient for" << windowId();
-        XSetTransientForHint(QX11Info::display(),
-                             widget->effectiveWinId(),
-                             windowId());
-    }
-#endif
+    window->setModality(Qt::WindowModal);
+    window->show();
 #if HAS_FOREIGN_QWINDOW
     if (windowId() != 0) {
         TRACE() << "Requesting window reparenting";
         QWindow *parent = QWindow::fromWinId(windowId());
-        widget->windowHandle()->setTransientParent(parent);
+        window->setTransientParent(parent);
     }
 #endif
-}
-
-#if HAS_XEMBED
-void RequestPrivate::onEmbedError()
-{
-    Q_Q(Request);
-
-    QX11EmbedWidget *embed = qobject_cast<QX11EmbedWidget*>(sender());
-    TRACE() << "Embed error:" << embed->error();
-
-    q->fail(SIGNON_UI_ERROR_EMBEDDING_FAILED,
-            QString("Embedding signon UI failed: %1").arg(embed->error()));
-}
-#endif
+    return true;
+}
 
 Accounts::Account *RequestPrivate::findAccount()
 {
@@ -285,8 +238,8 @@
     if (watcher->isError()) {
         /* if the notification could not be delivered to the indicator, show
          * the widget. */
-        if (m_widget != 0)
-            m_widget->show();
+        if (m_window != 0)
+            m_window->show();
     } else {
         onIndicatorCallSucceeded();
     }
@@ -352,7 +305,15 @@
 void Request::setWidget(QWidget *widget)
 {
     Q_D(Request);
-    d->setWidget(widget);
+    if (d->setWindow(widget->windowHandle())) {
+        widget->show();
+    }
+}
+
+void Request::setWindow(QWindow *window)
+{
+    Q_D(Request);
+    d->setWindow(window);
 }
 
 uint Request::identity() const
 
=== modified file 'src/request.h'
--- src/request.h	2013-04-19 11:13:03 +0000
+++ src/request.h	2016-11-04 09:26:22 +0000
@@ -70,6 +70,7 @@
                      QObject *parent = 0);
 
     void setWidget(QWidget *widget);
+    void setWindow(QWindow *window);
 
 protected Q_SLOTS:
     void fail(const QString &name, const QString &message);
 
=== modified file 'src/ubuntu-browser-request.cpp'
--- src/ubuntu-browser-request.cpp	2016-04-04 10:26:46 +0000
+++ src/ubuntu-browser-request.cpp	2016-11-04 09:26:22 +0000
@@ -190,7 +190,7 @@
 
 void UbuntuBrowserRequestPrivate::onLoadFinished(bool ok)
 {
-    Q_Q(const UbuntuBrowserRequest);
+    Q_Q(UbuntuBrowserRequest);
 
     TRACE() << "Load finished" << ok;
 
@@ -201,9 +201,7 @@
 
     if (!m_dialog->isVisible()) {
         if (m_responseUrl.isEmpty()) {
-            Dialog::ShowMode mode = (q->windowId() == 0) ? Dialog::TopLevel :
-                q->embeddedUi() ? Dialog::Embedded : Dialog::Transient;
-            m_dialog->show(q->windowId(), mode);
+            q->setWindow(m_dialog);
         } else {
             onFinished();
         }