An Ubuntu HTML5 application

diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/debian/changelog qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/debian/changelog --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/debian/changelog 2014-02-20 19:32:23.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/debian/changelog 2014-02-20 19:32:23.000000000 +0000 @@ -1,8 +1,18 @@ -qtcreator-plugin-ubuntu (2.8.1.2bzr96precise0) precise; urgency=low +qtcreator-plugin-ubuntu (2.8.1.3bzr98precise0) precise; urgency=low - * Automatic build of revision 96 + * Automatic build of revision 98 - -- PS Jenkins bot Tue, 18 Feb 2014 21:13:56 +0000 + -- PS Jenkins bot Thu, 20 Feb 2014 19:19:41 +0000 + +qtcreator-plugin-ubuntu (2.8.1.3-0ubuntu1) trusty; urgency=medium + + [ Alexandre Abreu ] + * Project template implements tab navigation by default, and has an + alternative pagestack example bundled in. (LP: #1271611) + * Enable the web inspector mode by default when running HTML5 apps from + QtCreator. (LP: #1281611) + + -- Daniel Holbach Tue, 18 Feb 2014 18:20:06 +0100 qtcreator-plugin-ubuntu (2.8.1.2-0ubuntu2) trusty; urgency=medium diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop 2014-02-20 19:19:34.000000000 +0000 @@ -1,6 +1,6 @@ [Desktop Entry] Name=%DISPLAYNAME% -Exec=/usr/bin/ubuntu-html5-app-launcher $@ --www=. +Exec=/usr/bin/ubuntu-html5-app-launcher $@ --www=www Icon=qmlscene Terminal=false Type=Application diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/index.html qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/index.html --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/index.html 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/index.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ - - - - - An Ubuntu HTML5 application - - - - - - - - - - - - - - - - - - - - - - - - -

- -

Hello World

- -

- - - -

- -

My List Header

-
- -
- -
Jane
- - - - - - - - - -
-
- -
- -
Mark
- - - - - - - - - -
-
- -
- -
Olivier
- - - - - - - - - -

- -

- - - -

- -

- - diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/js/app.js qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/js/app.js --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/js/app.js 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/js/app.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/** - * Wait before the DOM has been loaded before initializing the Ubuntu UI layer - */ -window.onload = function () { - var UI = new UbuntuUI(); - UI.init(); - - // Wire all the simple logic - document.getElementById('no').addEventListener('click', function() { - UI.dialog('dialog1').hide(); - }); - - function getContacts() { - return [].slice.call(document.querySelectorAll('#contacts li')); - }; - - var contacts = getContacts(); - contacts.forEach(function (contact) { - contact.addEventListener('click', function() { - contact.classList.add('selected'); - }); - }); - - function getSelectedContacts() { - var selectedContactInputs = [].slice.call(document.querySelectorAll('#contacts li label input:checked')); - return selectedContactInputs.map(function (contactInputElement) { return contactInputElement.parentNode.parentNode; }); - } - - function getContactName(contact) { - return contact.querySelector('p').innerHTML; - } - - function displayMessage(message) { - document.querySelector('#dialog1 h1').innerHTML = message; - UI.dialog('dialog1').show(); - }; - - document.getElementById('call').addEventListener('click', function() { - var sc = getSelectedContacts(); - if (! sc || sc.length !== 1) { - displayMessage('Please select one and only one contact'); - return; - } - displayMessage('Calling: ' + getContactName(sc[0])); - }); - - document.getElementById('text').addEventListener('click', function() { - var sc = getSelectedContacts(); - if (! sc || sc.length !== 1) { - displayMessage('Please select one and only one contact'); - return; - } - displayMessage('Texting: ' + getContactName(sc[0])); - }); - - // Add an event listener that is pending on the initialization - // of the platform layer API, if it is being used. - document.addEventListener("deviceready", function() { - if (console && console.log) - console.log('Platform layer API ready'); - }, false); -}; - diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/plugins.xml qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/plugins.xml --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/plugins.xml 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/plugins.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html 2014-02-20 19:19:34.000000000 +0000 @@ -0,0 +1,134 @@ + + + + + An Ubuntu HTML5 application + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

Hello World

+ +

+ + + +

+ +

My List Header

+
+ +
+ +
Jane
+ + + + + + + + + +
+
+ +
+ +
Mark
+ + + + + + + + + +
+
+ +
+ +
Olivier
+ + + + + + + + + +

+ +

+ + + +

+ +

+ + diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js 2014-02-20 19:19:34.000000000 +0000 @@ -0,0 +1,63 @@ +/** + * Wait before the DOM has been loaded before initializing the Ubuntu UI layer + */ +window.onload = function () { + var UI = new UbuntuUI(); + UI.init(); + + // Wire all the simple logic + document.getElementById('no').addEventListener('click', function() { + UI.dialog('dialog1').hide(); + }); + + function getContacts() { + return [].slice.call(document.querySelectorAll('#contacts li')); + }; + + var contacts = getContacts(); + contacts.forEach(function (contact) { + contact.addEventListener('click', function() { + contact.classList.add('selected'); + }); + }); + + function getSelectedContacts() { + var selectedContactInputs = [].slice.call(document.querySelectorAll('#contacts li label input:checked')); + return selectedContactInputs.map(function (contactInputElement) { return contactInputElement.parentNode.parentNode; }); + } + + function getContactName(contact) { + return contact.querySelector('p').innerHTML; + } + + function displayMessage(message) { + document.querySelector('#dialog1 h1').innerHTML = message; + UI.dialog('dialog1').show(); + }; + + document.getElementById('call').addEventListener('click', function() { + var sc = getSelectedContacts(); + if (! sc || sc.length !== 1) { + displayMessage('Please select one and only one contact'); + return; + } + displayMessage('Calling: ' + getContactName(sc[0])); + }); + + document.getElementById('text').addEventListener('click', function() { + var sc = getSelectedContacts(); + if (! sc || sc.length !== 1) { + displayMessage('Please select one and only one contact'); + return; + } + displayMessage('Texting: ' + getContactName(sc[0])); + }); + + // Add an event listener that is pending on the initialization + // of the platform layer API, if it is being used. + document.addEventListener("deviceready", function() { + if (console && console.log) + console.log('Platform layer API ready'); + }, false); +}; + diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/projectypes.json qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/projectypes.json --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/templates/wizards/ubuntu/projectypes.json 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/templates/wizards/ubuntu/projectypes.json 2014-02-20 19:19:34.000000000 +0000 @@ -98,19 +98,19 @@ "displayName": "HTML5 App", "id": "UbuntuAppSimpleHtml5", "description": "Template for creating a native HTML5 app Native HTML5 apps have unrestricted access to Platform APIs. This project contains only HTML/CSS and Javascript code. \n\nThe UI is designed for a mobile form-factor and uses the Ubuntu Touch design building blocks.\n\nUnlike the default Qt HTML5 template, there is no C++ code or compilation necessary for this application type", - "mainFile" : "index.html", + "mainFile" : "www/index.html", "files": [ { "fileName": "displayName.desktop" }, { - "fileName": "index.html" + "fileName": "www/index.html" }, { - "fileName": "js/app.js" + "fileName": "www/js/app.js" }, { - "fileName": "plugins.xml" + "fileName": "www/plugins.xml" } ] }, diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/ubuntu/menu.json qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/ubuntu/menu.json --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/share/qtcreator/ubuntu/menu.json 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/share/qtcreator/ubuntu/menu.json 2014-02-20 19:19:34.000000000 +0000 @@ -83,7 +83,7 @@ "ubuntuHtmlProjectRequired": true, "saveRequired": true, "actions": [ - "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %APPRUNNEREXECNAME% %FOLDERNAME% %DISPLAYNAME%.desktop ../%FOLDERNAME% /home/%USERNAME%/dev_tmp /home/%USERNAME%/.local/share/applications %USERNAME%@%IP% %PORT% --www= --inspector" + "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %APPRUNNEREXECNAME% %FOLDERNAME% %DISPLAYNAME%.desktop www /home/%USERNAME%/dev_tmp /home/%USERNAME%/.local/share/applications %USERNAME%@%IP% %PORT% --www= --inspector" ] }, { diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/src/ubuntu/ubuntuprojectapp.cpp qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/src/ubuntu/ubuntuprojectapp.cpp --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/src/ubuntu/ubuntuprojectapp.cpp 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/src/ubuntu/ubuntuprojectapp.cpp 2014-02-20 19:19:34.000000000 +0000 @@ -94,7 +94,7 @@ // load the mainFile if (m_projectType == QLatin1String(Constants::UBUNTU_HTMLPROJECT_TYPE)) { - mainFileName = Core::BaseFileWizard::buildFileName(projectPath, + mainFileName = Core::BaseFileWizard::buildFileName(projectPath + QLatin1String("/www"), QLatin1String("index"), QLatin1String("html")); } else { @@ -149,24 +149,29 @@ << " filter: \"*.desktop\"" << endl << " }" << endl << " Files {" << endl - << " filter: \"*.html\"" << endl + << " filter: \"www/*.html\"" << endl << " }" << endl << " Files {" << endl << " filter: \"Makefile\"" << endl << " }" << endl; out << " Files {" << endl - << " directory: \"html\"" << endl + << " directory: \"www\"" << endl + << " filter: \"*\"" << endl + << " }" << endl; + + out << " Files {" << endl + << " directory: \"www/img/\"" << endl << " filter: \"*\"" << endl << " }" << endl; out << " Files {" << endl - << " directory: \"img/\"" << endl + << " directory: \"www/css/\"" << endl << " filter: \"*\"" << endl << " }" << endl; out << " Files {" << endl - << " directory: \"css/\"" << endl + << " directory: \"www/js/\"" << endl << " filter: \"*\"" << endl << " }" << endl; diff -Nru qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/src/ubuntu/ubunturuncontrol.cpp qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/src/ubuntu/ubunturuncontrol.cpp --- qtcreator-plugin-ubuntu-2.8.1.2bzr96precise0/src/ubuntu/ubunturuncontrol.cpp 2014-02-18 21:13:48.000000000 +0000 +++ qtcreator-plugin-ubuntu-2.8.1.3bzr98precise0/src/ubuntu/ubunturuncontrol.cpp 2014-02-20 19:19:34.000000000 +0000 @@ -32,10 +32,10 @@ m_applicationLauncher.setWorkingDirectory(ubuntuProject->projectDir().absolutePath()); - if (ubuntuProject->mainFile().compare(QString::fromLatin1("index.html"), Qt::CaseInsensitive) == 0) { + if (ubuntuProject->mainFile().compare(QString::fromLatin1("www/index.html"), Qt::CaseInsensitive) == 0) { //TODO move into abstracted location m_executable = QString::fromLatin1(Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE); - m_commandLineArguments = QString(QLatin1String("--www=%0 --inspector")).arg(ubuntuProject->projectDirectory()); + m_commandLineArguments = QString(QLatin1String("--www=%0/www --inspector")).arg(ubuntuProject->projectDirectory()); } else { m_executable = QtSupport::QtKitInformation::qtVersion(runConfiguration->target()->kit())->qmlsceneCommand();