Merge lp:~mzanetti/unity8/aethercast-disconnect-all into lp:unity8

[Michael Zanetti]

add a disconnect all button to the virtual touchpad

[Lukáš Tinkl (lukas-kde)]

+ text: "External display"
+ text: "Disconnect"

Needs some i18n()

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> + text: "External display"
> + text: "Disconnect"
>
> Needs some i18n()

this branch will be discarded after the demo

[Lukáš Tinkl (lukas-kde)]

KK, I see

review: Abstain

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2204
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/432/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/586/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/609
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/627
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/627
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/623/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/623/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/623/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/623/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/623/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/623/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/432/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/aethercast-disconnect-all]

2205. By Michael Zanetti on 2016-02-19

don't provide the path... the silo doesn't like it for some reason

2206. By Michael Zanetti on 2016-02-19

whitespace

2207. By Michael Zanetti on 2016-03-09

merge prereq

2208. By Michael Zanetti on 2016-05-04

merge prereq

Unmerged revisions

2208. By Michael Zanetti on 2016-05-04

merge prereq

2207. By Michael Zanetti on 2016-03-09

merge prereq

2206. By Michael Zanetti on 2016-02-19

whitespace

2205. By Michael Zanetti on 2016-02-19

don't provide the path... the silo doesn't like it for some reason

2204. By Michael Zanetti on 2016-02-19

add disconnectAll button to top panel in virtual touchpad

2203. By Michael Zanetti on 2016-02-19

base on ~mzanetti/unity8/aethercast-cursor

2202. By Launchpad Translations on behalf of unity-team on 2016-02-18

Launchpad automatic translations update.

2201. By Launchpad Translations on behalf of unity-team on 2016-02-17

Launchpad automatic translations update.

2200. By Launchpad Translations on behalf of unity-team on 2016-02-16

Launchpad automatic translations update.

=== modified file 'plugins/Aethercast/aethercastmanager.cpp'
--- plugins/Aethercast/aethercastmanager.cpp	2016-05-04 14:38:19 +0000
+++ plugins/Aethercast/aethercastmanager.cpp	2016-05-04 14:38:19 +0000
@@ -28,7 +28,8 @@
     m_manager(new ManagerInterface(QStringLiteral("org.aethercast"), QStringLiteral("/org/aethercast"), QDBusConnection::systemBus(), this)),
     m_inputProvider(new InputProvider(this))
 {
-    QDBusConnection::systemBus().registerObject(MANAGER_PATH, QStringLiteral("org.aethercast.InputProvider"), m_inputProvider);
+//    QDBusConnection::systemBus().registerObject(MANAGER_PATH, QStringLiteral("org.aethercast.InputProvider"), m_inputProvider);
+    QDBusConnection::systemBus().registerObject(MANAGER_PATH, m_inputProvider);
     m_manager->RegisterInputProvider(QDBusObjectPath(MANAGER_PATH), QVariantMap());
 
     connect(m_inputProvider, &InputProvider::cursorChanged, this, &AethercastManager::cursorChanged);
@@ -74,3 +75,8 @@
 {
     m_inputProvider->setCursorSource(cursor);
 }
+
+void AethercastManager::disconnectAll()
+{
+    m_manager->DisconnectAll();
+}

=== modified file 'plugins/Aethercast/aethercastmanager.h'
--- plugins/Aethercast/aethercastmanager.h	2016-05-04 14:38:19 +0000
+++ plugins/Aethercast/aethercastmanager.h	2016-05-04 14:38:19 +0000
@@ -43,6 +43,9 @@
     QString cursor() const;
     void setCursor(const QString &cursor);
 
+public Q_SLOTS:
+    void disconnectAll();
+
 //public Q_SLOTS:
 //    void sendMousePosition(int x, int y);
 

=== modified file 'plugins/Aethercast/managerinterface.h'
--- plugins/Aethercast/managerinterface.h	2016-05-04 14:38:19 +0000
+++ plugins/Aethercast/managerinterface.h	2016-05-04 14:38:19 +0000
@@ -48,6 +48,12 @@
     { return qvariant_cast< QString >(property("State")); }
 
 public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<> DisconnectAll()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("DisconnectAll"), argumentList);
+    }
+
     inline QDBusPendingReply<> RegisterInputProvider(const QDBusObjectPath &path, const QVariantMap &options)
     {
         QList<QVariant> argumentList;

=== modified file 'plugins/Aethercast/org.aethercast.xml'
--- plugins/Aethercast/org.aethercast.xml	2016-05-04 14:38:19 +0000
+++ plugins/Aethercast/org.aethercast.xml	2016-05-04 14:38:19 +0000
@@ -9,6 +9,7 @@
             <arg name="path" type="o" direction="in"/>
         </method>
         <method name="Scan"/>
+        <method name="DisconnectAll"/>
         <method name="RegisterInputProvider">
             <arg name="path" type="o" direction="in"/>
             <arg name="options" type="a{sv}" direction="in"/>

=== modified file 'qml/DisabledScreenNotice.qml'
--- qml/DisabledScreenNotice.qml	2016-02-03 14:45:58 +0000
+++ qml/DisabledScreenNotice.qml	2016-05-04 14:38:19 +0000
@@ -17,9 +17,11 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
+import Ubuntu.Gestures 0.1
 import Unity.Session 0.1
 import QtQuick.Window 2.2
 import "Components"
+import Aethercast 0.1
 
 Item {
     id: root
@@ -123,4 +125,75 @@
             anchors.fill: parent
         }
     }
+
+    MouseArea {
+        anchors.fill: parent
+        visible: topPanel.y > -topPanel.height
+        onClicked: {
+            topPanel.collapse()
+        }
+    }
+
+    Rectangle {
+        id: topPanel
+        anchors { left: parent.left; right: parent.right }
+        height: units.gu(10)
+        color: "#292929"
+        y: -height
+
+        RowLayout {
+            anchors.fill: parent
+            anchors.margins: units.gu(2)
+
+            Label {
+                text: "External display"
+                Layout.fillWidth: true
+                color: "white"
+            }
+            Button {
+                text: "Disconnect"
+                color: UbuntuColors.green
+                onClicked: {
+                    AethercastManager.disconnectAll()
+                    topPanel.collapse();
+                }
+            }
+        }
+
+        function collapse() {
+            snapAnimation.targetY = -topPanel.height;
+            snapAnimation.start();
+        }
+
+        function expand() {
+            snapAnimation.targetY = 0
+            snapAnimation.start();
+        }
+
+        UbuntuNumberAnimation {
+            id: snapAnimation
+            property int targetY
+            target: topPanel
+            property: "y"
+            to: targetY
+        }
+    }
+
+    DirectionalDragArea {
+        id: topDragArea
+        direction: Direction.Downwards
+        width: parent.width
+        height: units.gu(1)
+        onDistanceChanged: topPanel.y = Math.min(-topPanel.height + distance, 0)
+        onDraggingChanged: {
+            print("dragging changed")
+            if (!dragging) {
+                if (topPanel.y > -topPanel.height / 2) {
+                    topPanel.expand()
+                } else {
+                    topPanel.collapse()
+                }
+            }
+        }
+    }
 }

=== modified file 'tests/qmltests/tst_DisabledScreenNotice.qml'
--- tests/qmltests/tst_DisabledScreenNotice.qml	2016-02-12 11:16:31 +0000
+++ tests/qmltests/tst_DisabledScreenNotice.qml	2016-05-04 14:38:19 +0000
@@ -27,6 +27,12 @@
     width: units.gu(80)
     height: units.gu(70)
 
+    Binding {
+        target: MouseTouchAdaptor
+        property: "enabled"
+        value: true
+    }
+
     DisabledScreenNotice {
         id: touchScreenPad
         anchors.fill: parent