Merge lp:~aacid/unity8/dash-app-fixes into lp:unity8

[Albert Astals Cid]

Fixes for dash as app

Load i18n catalog
Process command line options
Add the posibility to have a mouse touch adaptor

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/dash-app-fixes]

1115. By Albert Astals Cid on 2014-08-06

Build

[Michał Sawicz (saviq)]

Let's drop the --testability option, we only want to support QT_LOAD_TESTABILITY anyway.

review: Needs Fixing

[lp:~aacid/unity8/dash-app-fixes]

1116. By Albert Astals Cid on 2014-08-06

Fixme as requested by Saviq

1117. By Albert Astals Cid on 2014-08-06

drop -testability support

[Albert Astals Cid (aacid)]

> Let's drop the --testability option, we only want to support
> QT_LOAD_TESTABILITY anyway.

Done.

[lp:~aacid/unity8/dash-app-fixes]

1118. By Albert Astals Cid on 2014-08-06

Bring the dash background from the shell to the dash

1119. By Albert Astals Cid on 2014-08-06

Merge lp:~mterry/unity8/dash-app-demo-fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/unity8-ci/3786/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3088
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/880
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/880/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4332
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4332/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11069

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Passed locally.

review: Approve

=== modified file 'qml/Components/EdgeDemo.qml'
--- qml/Components/EdgeDemo.qml	2014-07-23 10:16:29 +0000
+++ qml/Components/EdgeDemo.qml	2014-08-06 14:41:59 +0000
@@ -24,13 +24,13 @@
     property Item greeter
     property Item launcher
     property Item indicators
-    property Item underlay
+    property Item stages
 
     property bool launcherEnabled: true
-    property bool dashEnabled: true
+    property bool stagesEnabled: true
     property bool panelEnabled: true
     property bool panelContentEnabled: true
-    property bool running: !launcherEnabled || !dashEnabled || !panelEnabled || !panelContentEnabled
+    property bool running: !launcherEnabled || !stagesEnabled || !panelEnabled || !panelContentEnabled
 
     property bool paused: false
 
@@ -58,7 +58,7 @@
 
     function stopDemo() {
         launcherEnabled = true
-        dashEnabled = true
+        stagesEnabled = true
         panelEnabled = true
         panelContentEnabled = true
         if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
@@ -74,11 +74,11 @@
         }
 
         launcherEnabled = false;
-        dashEnabled = false;
+        stagesEnabled = false;
         panelEnabled = false;
         panelContentEnabled = false;
 
-        // Begin with either greeter or dash, depending on which is visible
+        // Begin with either greeter or top, depending on which is visible
         if (greeter && greeter.shown) {
             startRightEdgeDemo()
         } else {
@@ -138,12 +138,12 @@
 
     function startTopEdgeDemo() {
         demo.panelEnabled = true;
-        if (demo.dash && demo.underlay) {
-            d.topEdgeDemo = d.overlay.createObject(demo.underlay, {
+        if (demo.stages) {
+            d.topEdgeDemo = d.overlay.createObject(demo.stages, {
                 "edge": "top",
                 "title": i18n.tr("Top edge"),
                 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
-                "anchors.fill": demo.underlay,
+                "anchors.fill": demo.stages,
             });
         }
         if (d.topEdgeDemo) {
@@ -192,12 +192,12 @@
     function startLeftEdgeDemo() {
         demo.panelEnabled = false;
         demo.launcherEnabled = true;
-        if (demo.underlay) {
-            d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {
+        if (demo.stages) {
+            d.leftEdgeDemo = d.overlay.createObject(demo.stages, {
                 "edge": "left",
                 "title": i18n.tr("Left edge"),
                 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
-                "anchors.fill": demo.underlay,
+                "anchors.fill": demo.stages,
             });
         }
         if (d.leftEdgeDemo) {
@@ -220,12 +220,12 @@
 
     function startFinalEdgeDemo() {
         demo.launcherEnabled = false;
-        if (demo.underlay) {
-            d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
+        if (demo.stages) {
+            d.finalEdgeDemo = d.overlay.createObject(demo.stages, {
                 "edge": "none",
                 "title": i18n.tr("Well done"),
                 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
-                "anchors.fill": demo.underlay,
+                "anchors.fill": demo.stages,
                 "showSkip": false,
             });
         }

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-07-29 11:35:10 +0000
+++ qml/Dash/Dash.qml	2014-08-06 14:41:59 +0000
@@ -74,6 +74,14 @@
         filterRegExp: RegExp("^true$")
     }
 
+    Image {
+        anchors.fill: parent
+        source: parent.width > parent.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
+        fillMode: Image.PreserveAspectCrop
+        horizontalAlignment: Image.AlignRight
+        verticalAlignment: Image.AlignTop
+    }
+
     DashContent {
         id: dashContent
         objectName: "dashContent"

=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2014-07-29 14:28:16 +0000
+++ qml/Dash/DashApplication.qml	2014-08-06 14:41:59 +0000
@@ -23,6 +23,12 @@
 
     useDeprecatedToolbar: false
 
+    Binding {
+        target: i18n
+        property: "domain"
+        value: "unity8"
+    }
+
     Dash {
         anchors.fill: parent
     }

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2014-07-22 14:46:01 +0000
+++ qml/Greeter/Greeter.qml	2014-08-06 14:41:59 +0000
@@ -70,7 +70,7 @@
     DraggingArea {
         id: dragHandle
         anchors.fill: parent
-        enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled
+        enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled && greeter.shown
         orientation: Qt.Horizontal
         propagateComposedEvents: true
 

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-05 12:06:16 +0000
+++ qml/Shell.qml	2014-08-06 14:41:59 +0000
@@ -113,25 +113,6 @@
     }
 
     Item {
-        id: underlay
-        objectName: "underlay"
-        anchors.fill: parent
-
-        // Whether the underlay is fully covered by opaque UI elements.
-        property bool fullyCovered: (panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
-                                        || stages.fullyShown || greeterWrapper.fullyShown
-        visible: !fullyCovered
-
-        Image {
-            anchors.fill: underlay
-            source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
-            fillMode: Image.PreserveAspectCrop
-            horizontalAlignment: Image.AlignRight
-            verticalAlignment: Image.AlignTop
-        }
-    }
-
-    Item {
         id: stages
         objectName: "stages"
         width: parent.width
@@ -186,12 +167,12 @@
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "interactive"
-                value: !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0
+                value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0
             }
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "spreadEnabled"
-                value: greeter.fakeActiveForApp === "" // to support emergency dialer hack
+                value: edgeDemo.stagesEnabled && greeter.fakeActiveForApp === "" // to support emergency dialer hack
             }
             Binding {
                 target: applicationsDisplayLoader.item
@@ -580,7 +561,7 @@
         greeter: greeter
         launcher: launcher
         indicators: panel.indicators
-        underlay: underlay
+        stages: stages
     }
 
     Connections {

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2014-07-23 06:54:10 +0000
+++ src/Dash/CMakeLists.txt	2014-08-06 14:41:59 +0000
@@ -1,5 +1,6 @@
 set(DASH_SRCS
     main.cpp
+    ../MouseTouchAdaptor.cpp
 )
 
 add_executable(unity8-dash ${DASH_SRCS})

=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2014-07-29 11:35:10 +0000
+++ src/Dash/main.cpp	2014-08-06 14:41:59 +0000
@@ -24,8 +24,10 @@
 #include <QDebug>
 #include <QCommandLineParser>
 #include <QLibrary>
+#include <libintl.h>
 
 #include <paths.h>
+#include "../MouseTouchAdaptor.h"
 
 int main(int argc, const char *argv[])
 {
@@ -35,11 +37,21 @@
     parser.setApplicationDescription("Description: Unity 8 Shell Dash");
     parser.addHelpOption();
 
-    QCommandLineOption testabilityOption("testability",
-        "Load the testability driver (Alternatively export QT_LOAD_TESTABILITY");
-    parser.addOption(testabilityOption);
-
-    if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {
+    QCommandLineOption mousetouchOption("mousetouch",
+        "Allow the mouse to provide touch input");
+    parser.addOption(mousetouchOption);
+
+    // FIXME Remove once we drop the need of the hint
+    QCommandLineOption desktopFileHintOption("desktop_file_hint",
+        "The desktop_file_hint option for QtMir", "hint_file");
+    parser.addOption(desktopFileHintOption);
+
+    // Treat args with single dashes the same as arguments with two dashes
+    // Ex: -fullscreen == --fullscreen
+    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+    parser.process(*application);
+
+    if (getenv("QT_LOAD_TESTABILITY")) {
         QLibrary testLib(QLatin1String("qttestability"));
         if (testLib.load()) {
             typedef void (*TasInitialize)(void);
@@ -54,10 +66,20 @@
         }
     }
 
+    bindtextdomain("unity8", translationDirectory().toUtf8().data());
+
     QQuickView* view = new QQuickView();
     view->setResizeMode(QQuickView::SizeRootObjectToView);
     view->setTitle("Unity Dash");
 
+    // 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 (parser.isSet(mousetouchOption)) {
+        mouseTouchAdaptor = new MouseTouchAdaptor;
+        application->installNativeEventFilter(mouseTouchAdaptor);
+    }
+
     QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());
     appendImportPaths(view->engine(), ::fallbackImportPaths());