Merge lp:~abreu-alexandre/ubuntu-html5-theme/oxide-backport-14.04 into lp:ubuntu-html5-theme/14.04

[Alexandre Abreu]

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-06 22:51:33 +0000
+++ CMakeLists.txt	2014-12-01 14:06:45 +0000
@@ -2,6 +2,10 @@
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 
+# make non compiled files (QML, JS, images, etc.) visible in QtCreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.png *.py *.pot *.po *.qdoc *.qdocconf *.css *.html)
+
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})
 # Standard install paths
 include(GNUInstallDirs)
 

=== modified file 'src/plugin/Ubuntu/WebApps/CordovaLoader.qml'
--- src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-02-10 16:15:29 +0000
+++ src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-12-01 14:06:45 +0000
@@ -23,6 +23,11 @@
 
     property string htmlIndexDirectory
 
+    // Remote Inspector Properties
+    property string remoteInspectorEnabled
+    property string remoteInspectorPort
+    property string remoteInspectorHost
+
     // Cordova plugin instance
     property var cordovaInstance: null
 

=== modified file 'src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml'
--- src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml	2014-02-10 17:58:49 +0000
+++ src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml	2014-12-01 14:06:45 +0000
@@ -25,11 +25,13 @@
 
     property var bindingMainWebview: null
 
+    signal ready()
+
     /*!
       \internal
      */
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(bindingMainWebview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(bindingMainWebview);
     }
 
     /*!
@@ -53,6 +55,8 @@
             bindee: root
             injectExtraUbuntuApis: true
             requiresInit: false
+
+            onUserScriptsInjected: root.ready()
         }
     }
 }

=== modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
--- src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-03-29 15:04:02 +0000
+++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-12-01 14:06:45 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.1
+import Ubuntu.Components.Extras.Browser 0.2
 
 
 /*!
@@ -35,6 +35,16 @@
 
     /*!
       \preliminary
+      The properties hold whether the remote debugging interface should be enabled for the
+      Web View. The host ip and port for accessing the remote interface should be provided.
+      */
+
+    property alias remoteInspectorEnabled: cordovaWebviewProvider.remoteInspectorEnabled
+    property alias remoteInspectorHost: cordovaWebviewProvider.remoteInspectorHost
+    property alias remoteInspectorPort: cordovaWebviewProvider.remoteInspectorPort
+
+    /*!
+      \preliminary
       The property holds the path to the filesystem location where the 'index.html'
       file can be found (root of the HTML5 application).
 
@@ -107,22 +117,9 @@
             UbuntuWebView {
                 url: mainPage._getAppStartupIndexFileUri()
 
-                experimental.preferences.localStorageEnabled: true
-                experimental.preferences.offlineWebApplicationCacheEnabled: true
-                experimental.preferences.universalAccessFromFileURLsAllowed: true
-                experimental.preferences.webGLEnabled: true
-
-                experimental.databaseQuotaDialog: Item {
-                    Timer {
-                        interval: 1
-                        running: true
-                        onTriggered: {
-                            model.accept(model.expectedUsage)
-                        }
-                    }
-                }
-                // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
-                experimental.preferences.developerExtrasEnabled: true
+                preferences.localStorageEnabled: true
+                preferences.allowUniversalAccessFromFileUrls: true
+                preferences.appCacheEnabled: true
             }
         }
 

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-04-03 13:57:30 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-12-01 14:06:45 +0000
@@ -142,6 +142,10 @@
     QString wwwfolderArg;
     bool maximized = false;
 
+    QString remoteInspectorHost = "";
+    QString remoteInspectorPort = QString::number(REMOTE_INSPECTOR_PORT);
+    bool remoteInspectorEnabled = false;
+
     QStringList arguments = app.arguments();
     arguments.pop_front();
 
@@ -159,20 +163,13 @@
         else
         if (argument.contains(INSPECTOR))
         {
-            QString host;
+            remoteInspectorEnabled = true;
             Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
                 if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
-                    host = address.toString();
+                    remoteInspectorHost = address.toString();
                     break;
                 }
             }
-            QString server;
-            if (host.isEmpty()) {
-                server = QString::number(REMOTE_INSPECTOR_PORT);
-            } else {
-                server = QString("%1:%2").arg(host, QString::number(REMOTE_INSPECTOR_PORT));
-            }
-            qputenv("QTWEBKIT_INSPECTOR_SERVER", server.toUtf8());
         }
         else
         {
@@ -226,6 +223,9 @@
         return EXIT_FAILURE;
     }
     view.rootObject()->setProperty("htmlIndexDirectory", wwwFolder.canonicalFilePath());
+    view.rootObject()->setProperty("remoteInspectorEnabled", remoteInspectorEnabled);
+    view.rootObject()->setProperty("remoteInspectorHost", remoteInspectorHost);
+    view.rootObject()->setProperty("remoteInspectorPort", remoteInspectorPort);
 
     view.setTitle(QCoreApplication::applicationName());
     view.setResizeMode(QQuickView::SizeRootObjectToView);