Merge lp:~josharenson/unity8/doc_args into lp:unity8

[Josh Arenson]

Adds usage information for unity8 executable. Fixes lp:1269282

[Albert Astals Cid (aacid)]

Should increase the qt5 version number dependency in debian/control to 5.2 since QCommandLineParser is new for 5.2
Also probably in the find_package of CMakeListst.txt

review: Needs Fixing

[Albert Astals Cid (aacid)]

And you're missing https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8 as part of your description of the change

[Albert Astals Cid (aacid)]

And finally, we don't support Qt translation system (we are using gettext) so for now i think we can just pretend we don't need to translate the commandline options and just drop the QCoreApplication::translate() and just pass the English text as second param of QCommandLineOption.

Saviq, what's your opinion?

[Michał Sawicz (saviq)]

Yeah, let's leave the help in English. It's not like they're general-use.

[lp:~josharenson/unity8/doc_args]

858. By Josh Arenson on 2014-04-22

Removed QCoreApplication::translate() as options will always be english

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:858
http://jenkins.qa.ubuntu.com/job/unity8-ci/2862/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/391/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1726/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1387/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4628/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2862/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

In case you're confused by all the failings → whitespace issues

review: Needs Fixing

[Michał Sawicz (saviq)]

src/main.cpp: bad whitespace in lines 67, 84

[Albert Astals Cid (aacid)]

you probably want to merge lp:~aacid/unity8/killqt51 into here (you'll have to resubmit the MR setting a prerequisite branch)

[Josh Arenson (josharenson)]

> you probably want to merge lp:~aacid/unity8/killqt51 into here (you'll have
> to resubmit the MR setting a prerequisite branch)

So if I clean up my white space, depend on _your_ MP, and resubmit _this_ MP in the proper format, we should be good to go?

[lp:~josharenson/unity8/doc_args]

859. By Josh Arenson on 2014-04-24

Removed whitespace errors

860. By Josh Arenson on 2014-04-25

Merged https://code.launchpad.net/+branch/~aacid/unity8/killqt51

861. By Josh Arenson on 2014-04-29

Added windowgeometry to argument list

862. By Josh Arenson on 2014-04-29

Handle windowgeometry argument with new argument parsing scheme.

This should retain backwards compatibility.

863. By Josh Arenson on 2014-05-05

Refactored ApplicationArguments constructor(s)

Unmerged revisions

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-04-02 11:19:54 +0000
+++ src/main.cpp	2014-04-24 23:23:32 +0000
@@ -18,6 +18,7 @@
  */
 
 // Qt
+#include <QCommandLineParser>
 #include <QtQuick/QQuickView>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlEngine>
@@ -43,6 +44,28 @@
 
     QGuiApplication::setApplicationName("Unity 8");
     QGuiApplication *application;
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("Description: Unity 8 Shell");
+    parser.addHelpOption();
+
+    QCommandLineOption fullscreenOption("fullscreen",
+        "Run in fullscreen");
+    parser.addOption(fullscreenOption);
+
+    QCommandLineOption framelessOption("frameless",
+        "Run without window borders");
+    parser.addOption(framelessOption);
+
+    QCommandLineOption mousetouchOption("mousetouch",
+        "Allow the mouse to provide touch input");
+    parser.addOption(mousetouchOption);
+
+    QCommandLineOption testabilityOption("testability",
+        "DISCOURAGED: Please set QT_LOAD_TESTABILITY instead. \n \
+Load the testability driver");
+    parser.addOption(testabilityOption);
+
     if (isUbuntuMirServer) {
         QLibrary unityMir("unity-mir", 1);
         unityMir.load();
@@ -59,6 +82,11 @@
         application = new QGuiApplication(argc, (char**)argv);
     }
 
+    // Treat args with single dashes the same as arguments with two dashes
+    // Ex: -fullscreen == --fullscreen
+    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+    parser.process(*application);
+
     QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
     if (indicatorProfile.isEmpty()) {
         indicatorProfile = "phone";
@@ -71,7 +99,7 @@
 
     // The testability driver is only loaded by QApplication but not by QGuiApplication.
     // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
-    if (args.contains(QLatin1String("-testability")) || getenv("QT_LOAD_TESTABILITY")) {
+    if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {
         QLibrary testLib(QLatin1String("qttestability"));
         if (testLib.load()) {
             typedef void (*TasInitialize)(void);
@@ -94,14 +122,14 @@
     view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
     view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
     view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);
-    if (args.contains(QLatin1String("-frameless"))) {
+    if (parser.isSet(framelessOption)) {
         view->setFlags(Qt::FramelessWindowHint);
     }
 
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;
-    if (args.contains(QLatin1String("-mousetouch"))) {
+    if (parser.isSet(mousetouchOption)) {
         mouseTouchAdaptor = new MouseTouchAdaptor;
         application->installNativeEventFilter(mouseTouchAdaptor);
     }
@@ -125,7 +153,7 @@
     view->setSource(source);
     view->setColor("transparent");
 
-    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || args.contains(QLatin1String("-fullscreen"))) {
+    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || parser.isSet(fullscreenOption)) {
         view->showFullScreen();
     } else {
         view->show();