Merge lp:~mardy/signon-ui/no-webkit-1547647 into lp:~online-accounts/signon-ui/16.04

[Alberto Mardegan]

Update Ubuntu.Web backend, make it the default on Unity

Bring the oxide-based WebView in par with the implementation used in ubuntu-system-settings-online-accounts.
Make it the default when running under a Unity session.

Update Ubuntu.Web backend, make it the default on Unity

Bring the oxide-based WebView in par with the implementation used in ubuntu-system-settings-online-accounts.
Make it the default when running under a Unity session.

Unmerged revisions

147. By Alberto Mardegan on 2016-04-06

Use UbuntuWebView in Unity

146. By Alberto Mardegan on 2016-04-06

Improve oxide webview

145. By Alberto Mardegan on 2016-04-04

Use plain Item as base

144. By Alberto Mardegan on 2016-04-04

WIP

=== modified file 'src/qml/DefaultPage.qml'
--- src/qml/DefaultPage.qml	2013-10-11 07:23:04 +0000
+++ src/qml/DefaultPage.qml	2016-07-12 15:37:17 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Page {
     Loader {

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2014-04-23 09:29:07 +0000
+++ src/qml/MainWindow.qml	2016-07-12 15:37:17 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
-MainView {
+Item {
     id: root
     width: units.gu(60)
     height: units.gu(90)

=== modified file 'src/qml/WebView.qml'
--- src/qml/WebView.qml	2014-04-22 09:35:17 +0000
+++ src/qml/WebView.qml	2016-07-12 15:37:17 +0000
@@ -1,24 +1,36 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.2
-import com.canonical.Oxide 1.0
-
-UbuntuWebView {
+import Ubuntu.Components 1.3
+import Ubuntu.Web 0.2
+
+WebView {
+    id: root
+
     Component.onCompleted: url = signonRequest.startUrl
 
-    onLoadingChanged: {
+    onLoadingStateChanged: {
         console.log("Loading changed")
-        if (loading) {
+        if (loading && !lastLoadFailed) {
             signonRequest.onLoadStarted()
         } else if (lastLoadSucceeded) {
             signonRequest.onLoadFinished(true)
-        } else {
+        } else if (lastLoadFailed) {
             signonRequest.onLoadFinished(false)
         }
     }
     onUrlChanged: signonRequest.currentUrl = url
 
-    context: UbuntuWebContext {
+    context: WebContext {
         dataPath: rootDir
     }
+
+    /* Taken from webbrowser-app */
+    ProgressBar {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: units.dp(3)
+        showProgressPercentage: false
+        visible: root.loading
+        value: root.loadProgress / 100
+    }
 }

=== modified file 'src/qquick-dialog.cpp'
--- src/qquick-dialog.cpp	2014-04-07 12:39:16 +0000
+++ src/qquick-dialog.cpp	2016-07-12 15:37:17 +0000
@@ -33,7 +33,6 @@
     QQuickView(parent)
 {
     setResizeMode(QQuickView::SizeRootObjectToView);
-    setWindowState(Qt::WindowFullScreen);
 }
 
 Dialog::~Dialog()
@@ -42,6 +41,7 @@
 
 void Dialog::show(WId parent, ShowMode mode)
 {
+    create();
 #if HAS_FOREIGN_QWINDOW
     if (mode != TopLevel) {
         QWindow *parentWindow = QWindow::fromWinId(parent);

=== modified file 'src/request.cpp'
--- src/request.cpp	2015-07-13 08:57:18 +0000
+++ src/request.cpp	2016-07-12 15:37:17 +0000
@@ -312,10 +312,8 @@
     if (parameters.contains(SSOUI_KEY_OPENURL)) {
 #ifdef USE_UBUNTU_WEB_VIEW
         TRACE() << "Platform:" << QGuiApplication::platformName();
-        /* We need to use the RemoteRequest implementation in UbuntuTouch,
-         * because displaying of QtWidgets is not working there. This is a
-         * workaround which can be revisited later. */
         if (QGuiApplication::platformName().startsWith("ubuntu") ||
+            qgetenv("XDG_CURRENT_DESKTOP") == QByteArray("Unity") ||
             qgetenv("SSOUI_USE_UBUNTU_WEB_VIEW") == QByteArray("1")) {
             return new UbuntuBrowserRequest(connection, message,
                                             parameters, parent);

=== modified file 'src/ubuntu-browser-request.cpp'
--- src/ubuntu-browser-request.cpp	2014-04-25 11:53:59 +0000
+++ src/ubuntu-browser-request.cpp	2016-07-12 15:37:17 +0000
@@ -226,6 +226,8 @@
     Q_Q(UbuntuBrowserRequest);
 
     TRACE() << "Browser dialog closed";
+    QObject::disconnect(m_dialog, SIGNAL(finished(int)),
+                        this, SLOT(onFinished()));
 
     QVariantMap reply;
     QUrl url = m_responseUrl.isEmpty() ? m_currentUrl : m_responseUrl;