Merge lp:~ken-vandine/ubuntu-system-settings/aethercast into lp:ubuntu-system-settings

[Ken VanDine]

Aethercast settings UI

=== WIP ===

Aethercast settings UI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1587
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ken-vandine/ubuntu-system-settings/aethercast/+merge/282378/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2570/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5999/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/753
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4634/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6010
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6010/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26588

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2570/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/aethercast]

1588. By Ken VanDine on 2016-01-13

fixed copyrights

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2571/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6005/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/754
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4640/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6016
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6016/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26604

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2571/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/aethercast]

1589. By Ken VanDine on 2016-01-13

Added connect and disconnect

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1589
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2572/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6008/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/755
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4642/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6019
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6019/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26608

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2572/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/aethercast]

1590. By Ken VanDine on 2016-01-14

refactored sources a bit to put the aethercast code in it's own directory to make it easier to move around if we move it to the displays plugin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1590
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2573/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6028/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/756
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4655/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6039
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6039/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26658

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2573/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/aethercast]

1591. By Ken VanDine on 2016-02-01

merged trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1591
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2596/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6284/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/779
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4832/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6295
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27207

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2596/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/aethercast]

1592. By Ken VanDine on 2016-03-03

AddDevice

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1592
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2639/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6702/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/413/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6713/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2639/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/aethercast]

1593. By Ken VanDine on 2016-03-09

merged trunk

1594. By Ken VanDine on 2016-03-09

Simon Fels 2016-03-09 Pass QString rather than QDBusObjectPath

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1594
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2645/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6734/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/828
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5106/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6745
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28002

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2645/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1594
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/595/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/595/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/8/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1594. By Ken VanDine on 2016-03-09

Simon Fels 2016-03-09 Pass QString rather than QDBusObjectPath

1593. By Ken VanDine on 2016-03-09

merged trunk

=== modified file 'debian/control'
--- debian/control	2016-02-29 13:46:09 +0000
+++ debian/control	2016-03-09 13:21:41 +0000
@@ -65,6 +65,7 @@
          ${shlibs:Depends},
          accountsservice,
          accountsservice-ubuntu-schemas (>= 0.0.3+14.10.20140829~),
+         aethercast,
          bluez (>= 5.23),
          click | ubuntu-snappy-cli,
          dbus-property-service [amd64 armhf i386],

=== modified file 'plugins/wifi/CMakeLists.txt'
--- plugins/wifi/CMakeLists.txt	2015-05-27 00:39:35 +0000
+++ plugins/wifi/CMakeLists.txt	2016-03-09 13:21:41 +0000
@@ -18,22 +18,38 @@
 SectionMenuItem.qml
 StandardMenuItem.qml
 SwitchMenuItem.qml
+WifiDisplays.qml
 )
 
 add_library(UbuntuWifiPanel MODULE
-  wifidbushelper.cpp
+  aethercast/aethercast_device.cpp
+  aethercast/aethercast_manager.cpp
+  aethercast/device.cpp
+  aethercast/devicemodel.cpp
+  aethercast/displays.cpp
+  aethercast/freedesktop_properties.cpp
+  aethercast/freedesktop_objectmanager.cpp
+  certhandler.cpp
   plugin.cpp
+  previousnetworkmodel.cpp
   unitymenumodelstack.cpp
-  previousnetworkmodel.cpp
-  certhandler.cpp
-  wifidbushelper.h
-  plugin.h
-  unitymenumodelstack.h
-  previousnetworkmodel.h
+  wifidbushelper.cpp
+  aethercast/aethercast_helper.h
+  aethercast/aethercast_device.h
+  aethercast/aethercast_manager.h
+  aethercast/device.h
+  aethercast/devicemodel.h
+  aethercast/displays.h
+  aethercast/freedesktop_properties.h
+  aethercast/freedesktop_objectmanager.h
   certhandler.h
   nm_manager_proxy.h
   nm_settings_proxy.h
   nm_settings_connection_proxy.h
+  plugin.h
+  previousnetworkmodel.h
+  unitymenumodelstack.h
+  wifidbushelper.h
   ${QML_SOURCES}
 )
 qt5_use_modules(UbuntuWifiPanel Qml Quick DBus)

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2015-08-10 13:31:45 +0000
+++ plugins/wifi/PageComponent.qml	2016-03-09 13:21:41 +0000
@@ -71,6 +71,13 @@
                 top: parent.top
             }
 
+            ListItem.SingleValue {
+                objectName: "wifiDisplays"
+                text: i18n.tr("Wi-Fi Displays")
+                progression: true
+                onClicked: pageStack.push(Qt.resolvedUrl("WifiDisplays.qml"))
+            }
+
             Repeater {
                 id: mainMenu
                 model: menuStack.tail ? menuStack.tail : null

=== added file 'plugins/wifi/WifiDisplays.qml'
--- plugins/wifi/WifiDisplays.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/WifiDisplays.qml	2016-03-09 13:21:41 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import SystemSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.SystemSettings.Wifi 1.0
+
+ItemPage {
+    id: wifiDisplays
+    objectName: "wifiDisplays"
+    title: i18n.tr("Wi-Fi Displays")
+
+    Flickable {
+        id: pageFlickable
+        anchors.fill: parent
+        contentWidth: parent.width
+        contentHeight: contentItem.childrenRect.height
+
+        Displays {
+            id: displays
+            onDevicesChanged: {
+                console.warn("onDevicesChanged: " + devices);
+            }
+            onScanningChanged: {
+                console.warn("onScanningChanged: " + scanning);
+            }
+        }
+
+        Column {
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+            }
+
+            ListItem.Standard {
+                objectName: "wifiDisplays"
+                text: i18n.tr("Wi-Fi Displays")
+                control: Item {
+                    anchors.verticalCenter: parent.verticalCenter
+                    height: parent.height
+                    width: childrenRect.width
+                    ActivityIndicator {
+                        id: ind
+                        anchors.centerIn: parent
+                        running: displays.scanning
+                        visible: running
+                    }
+                    Icon {
+                        anchors.centerIn: parent
+                        height: units.gu(4)
+                        width: height
+                        visible: !ind.running
+                        name: "reload"
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: {
+                                displays.scan();
+                            }
+                        }
+                    }
+                }
+            }
+
+            Repeater {
+                id: mainMenu
+                model: displays.devices ? displays.devices : null
+                delegate: ListItem.Subtitled {
+                    id: displayDelegate
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    text: displayName
+                    subText: stateName
+                    Button {
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.right: parent.right
+                        height: units.gu(4)
+                        visible: stateName !== "connecting"
+                        text: stateName === "connected" ? i18n.tr("Disconnect") : i18n.tr("Connect")
+                        onClicked: {
+                            if (stateName === "connected")
+                                displays.disconnectDevice(addressName);
+                            else
+                                displays.connectDevice(addressName);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Only allow flicking if the content doesn't fit on the page
+        boundsBehavior: (contentHeight > wifiDisplays.height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
+    }
+}

=== added directory 'plugins/wifi/aethercast'
=== added file 'plugins/wifi/aethercast/aethercast_device.cpp'
--- plugins/wifi/aethercast/aethercast_device.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/aethercast_device.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c AethercastDevice -p aethercast_device org.aethercast.xml org.aethercast.Device
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "aethercast_device.h"
+
+/*
+ * Implementation of interface class AethercastDevice
+ */
+
+AethercastDevice::AethercastDevice(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+AethercastDevice::~AethercastDevice()
+{
+}
+

=== added file 'plugins/wifi/aethercast/aethercast_device.h'
--- plugins/wifi/aethercast/aethercast_device.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/aethercast_device.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,76 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c AethercastDevice -p aethercast_device org.aethercast.xml org.aethercast.Device
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef AETHERCAST_DEVICE_H_1450292154
+#define AETHERCAST_DEVICE_H_1450292154
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.aethercast.Device
+ */
+class AethercastDevice: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.aethercast.Device"; }
+
+public:
+    AethercastDevice(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~AethercastDevice();
+
+    Q_PROPERTY(QString Address READ address)
+    inline QString address() const
+    { return qvariant_cast< QString >(property("Address")); }
+
+    Q_PROPERTY(QStringList Capabilities READ capabilities)
+    inline QStringList capabilities() const
+    { return qvariant_cast< QStringList >(property("Capabilities")); }
+
+    Q_PROPERTY(QString Name READ name)
+    inline QString name() const
+    { return qvariant_cast< QString >(property("Name")); }
+
+    Q_PROPERTY(QString State READ state)
+    inline QString state() const
+    { return qvariant_cast< QString >(property("State")); }
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<> Connect(const QString &role)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(role);
+        return asyncCallWithArgumentList(QStringLiteral("Connect"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Disconnect()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("Disconnect"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
+namespace org {
+  namespace aethercast {
+    typedef ::AethercastDevice Device;
+  }
+}
+#endif

=== added file 'plugins/wifi/aethercast/aethercast_helper.h'
--- plugins/wifi/aethercast/aethercast_helper.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/aethercast_helper.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+
+#ifndef AETHERCAST_HELPER_H_
+#define AETHERCAST_HELPER_H_
+
+#include <QObject>
+
+typedef QMap<QString, QVariantMap> InterfaceList;
+typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList;
+
+Q_DECLARE_METATYPE(InterfaceList)
+Q_DECLARE_METATYPE(ManagedObjectList)
+
+#endif

=== added file 'plugins/wifi/aethercast/aethercast_manager.cpp'
--- plugins/wifi/aethercast/aethercast_manager.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/aethercast_manager.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c AethercastManager -p aethercast_manager org.aethercast.xml org.aethercast.Manager
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "aethercast_manager.h"
+
+/*
+ * Implementation of interface class AethercastManager
+ */
+
+AethercastManager::AethercastManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+AethercastManager::~AethercastManager()
+{
+}
+

=== added file 'plugins/wifi/aethercast/aethercast_manager.h'
--- plugins/wifi/aethercast/aethercast_manager.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/aethercast_manager.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,79 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c AethercastManager -p aethercast_manager org.aethercast.xml org.aethercast.Manager
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef AETHERCAST_MANAGER_H_1450292154
+#define AETHERCAST_MANAGER_H_1450292154
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.aethercast.Manager
+ */
+class AethercastManager: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.aethercast.Manager"; }
+
+public:
+    AethercastManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~AethercastManager();
+
+    Q_PROPERTY(QStringList Capabilities READ capabilities)
+    inline QStringList capabilities() const
+    { return qvariant_cast< QStringList >(property("Capabilities")); }
+
+    Q_PROPERTY(bool Scanning READ scanning)
+    inline bool scanning() const
+    { return qvariant_cast< bool >(property("Scanning")); }
+
+    Q_PROPERTY(QString State READ state)
+    inline QString state() const
+    { return qvariant_cast< QString >(property("State")); }
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<> RegisterMediaManager(const QDBusObjectPath &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QStringLiteral("RegisterMediaManager"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Scan()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("Scan"), argumentList);
+    }
+
+    inline QDBusPendingReply<> UnregisterMediaManager(const QDBusObjectPath &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QStringLiteral("UnregisterMediaManager"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
+namespace org {
+  namespace aethercast {
+    typedef ::AethercastManager Manager;
+  }
+}
+#endif

=== added file 'plugins/wifi/aethercast/dbus-shared.h'
--- plugins/wifi/aethercast/dbus-shared.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/dbus-shared.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ */
+
+#ifndef USS_DBUS_SHARED_H
+#define USS_DBUS_SHARED_H
+
+#define AETHERCAST_PATH "/org/aethercast"
+#define AETHERCAST_SERVICE "org.aethercast"
+#define AETHERCAST_DEVICE_IFACE "org.aethercast.Device"
+#define AETHERCAST_MANAGER_IFACE "org.aethercast.Manager"
+
+#define watchCall(call, func) \
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this); \
+    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, func)
+
+#endif // USS_DBUS_SHARED_H

=== added file 'plugins/wifi/aethercast/device.cpp'
--- plugins/wifi/aethercast/device.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/device.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ */
+
+#include "aethercast_device.h"
+#include "device.h"
+
+#include <QDBusReply>
+#include <QDebug> // qWarning()
+#include <QThread>
+#include <QTimer>
+
+Device::Device(const QString &path, QDBusConnection &bus) :
+   m_state(QString())
+{
+    qWarning() << Q_FUNC_INFO;
+    initDevice(path, bus);
+}
+
+void Device::initDevice(const QString &path, QDBusConnection &bus)
+{
+    qWarning() << Q_FUNC_INFO;
+    /* whenever any of the properties changes,
+       trigger the catch-all deviceChanged() signal */
+    QObject::connect(this, SIGNAL(nameChanged()), this, SIGNAL(deviceChanged()));
+    QObject::connect(this, SIGNAL(addressChanged()), this, SIGNAL(deviceChanged()));
+    QObject::connect(this, SIGNAL(stateChanged()), this, SIGNAL(deviceChanged()));
+
+    m_aethercastDevice.reset(new AethercastDevice(AETHERCAST_SERVICE, path, bus));
+    /* Give our calls a bit more time than the default 25 seconds to
+     * complete whatever they are doing. In some situations (e.g. with
+     * specific devices) the default doesn't seem to be enough to. */
+    m_aethercastDevice->setTimeout(60 * 1000 /* 60 seconds */);
+
+    m_aethercastDeviceProperties.reset(new FreeDesktopProperties(AETHERCAST_SERVICE, path, bus));
+
+    QObject::connect(m_aethercastDeviceProperties.data(), SIGNAL(PropertiesChanged(const QString&, const QVariantMap&, const QStringList&)),
+                     this, SLOT(slotPropertiesChanged(const QString&, const QVariantMap&, const QStringList&)));
+
+    Q_EMIT(pathChanged());
+
+    watchCall(m_aethercastDeviceProperties->GetAll(AETHERCAST_DEVICE_IFACE), [=](QDBusPendingCallWatcher *watcher) {
+        QDBusPendingReply<QVariantMap> reply = *watcher;
+
+        if (reply.isError()) {
+            qWarning() << "Failed to retrieve properties for device" << m_aethercastDevice->path();
+            watcher->deleteLater();
+            return;
+        }
+
+        auto properties = reply.argumentAt<0>();
+        setProperties(properties);
+
+        watcher->deleteLater();
+    });
+}
+
+void Device::slotPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
+                                   const QStringList &invalidatedProperties)
+{
+    qWarning() << Q_FUNC_INFO;
+    Q_UNUSED(invalidatedProperties);
+
+    if (interface != AETHERCAST_DEVICE_IFACE)
+        return;
+
+    setProperties(changedProperties);
+}
+
+void Device::setProperties(const QMap<QString,QVariant> &properties)
+{
+    qWarning() << Q_FUNC_INFO;
+    QMapIterator<QString,QVariant> it(properties);
+    while (it.hasNext()) {
+        it.next();
+        updateProperty(it.key(), it.value());
+    }
+}
+
+void Device::disconnect()
+{
+    qWarning() << Q_FUNC_INFO;
+    m_aethercastDevice->Disconnect();
+}
+
+void Device::connect()
+{
+    qWarning() << Q_FUNC_INFO;
+    m_aethercastDevice->Connect(QString());
+}
+
+void Device::setName(const QString &name)
+{
+    qWarning() << Q_FUNC_INFO << name;
+    if (m_name != name) {
+        m_name = name;
+        Q_EMIT(nameChanged());
+    }
+}
+
+void Device::setAddress(const QString &address)
+{
+    qWarning() << Q_FUNC_INFO << address;
+    if (m_address != address) {
+        m_address = address;
+        Q_EMIT(addressChanged());
+    }
+}
+
+void Device::setState(const QString &state)
+{
+    qWarning() << Q_FUNC_INFO << state;
+    if (m_state != state) {
+        m_state = state;
+        Q_EMIT(stateChanged());
+    }
+}
+
+void Device::updateProperty(const QString &key, const QVariant &value)
+{
+    qWarning() << Q_FUNC_INFO << key << ":" << value;
+    if (key == "Name") {
+        setName(value.toString());
+    } else if (key == "Address") {
+        setAddress(value.toString());
+    } else if (key == "State") {
+        setState(value.toString());
+    }
+}

=== added file 'plugins/wifi/aethercast/device.h'
--- plugins/wifi/aethercast/device.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/device.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ */
+
+#ifndef USS_AETHERCAST_DEVICE_H
+#define USS_AETHERCAST_DEVICE_H
+
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusPendingCallWatcher>
+#include <QSharedPointer>
+#include <QString>
+
+#include "freedesktop_properties.h"
+#include "aethercast_device.h"
+#include "dbus-shared.h"
+
+struct Device: QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString path
+               READ getPath
+               NOTIFY pathChanged)
+
+    Q_PROPERTY(QString name
+               READ getName
+               NOTIFY nameChanged)
+
+    Q_PROPERTY(QString address
+               READ getAddress
+               NOTIFY addressChanged)
+
+    Q_PROPERTY(QString state
+               READ getState
+               NOTIFY stateChanged)
+
+public:
+
+
+Q_SIGNALS:
+    void pathChanged();
+    void nameChanged();
+    void addressChanged();
+    void stateChanged();
+    void deviceChanged(); // catchall for any change
+
+public:
+    const QString& getName() const { return m_name; }
+    const QString& getAddress() const { return m_address; }
+    const QString& getState() const { return m_state; }
+    QString getPath() const { return m_aethercastDevice ? m_aethercastDevice->path() : QString(); }
+
+  private:
+    QString m_name;
+    QString m_state;
+    QString m_address;
+    QScopedPointer<AethercastDevice> m_aethercastDevice;
+    QScopedPointer<FreeDesktopProperties> m_aethercastDeviceProperties;
+
+  protected:
+    void setName(const QString &name);
+    void setAddress(const QString &address);
+    void setState(const QString &state);
+
+  public:
+    Device() {}
+    Device(const QString &path, QDBusConnection &bus);
+    ~Device() {}
+    void connect();
+    void disconnect();
+    void setProperties(const QMap<QString,QVariant> &properties);
+
+  private Q_SLOTS:
+    void slotPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
+                               const QStringList &invalidatedProperties);
+
+  private:
+    void initDevice(const QString &path, QDBusConnection &bus);
+    void updateProperties(QSharedPointer<QDBusInterface>);
+    void updateProperty(const QString &key, const QVariant &value);
+};
+
+Q_DECLARE_METATYPE(Device*)
+
+#endif // USS_AETHERCAST_DEVICE_H

=== added file 'plugins/wifi/aethercast/devicemodel.cpp'
--- plugins/wifi/aethercast/devicemodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/devicemodel.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ *
+*/
+
+#include "devicemodel.h"
+
+#include <QDBusReply>
+#include <QDebug>
+
+#include "dbus-shared.h"
+
+namespace
+{
+  const int SCANNING_ACTIVE_DURATION_MSEC = (30 * 1000);
+  const int SCANNING_IDLE_DURATION_MSEC = (10 * 1000);
+}
+
+DeviceModel::DeviceModel(QDBusConnection &dbus, QObject *parent):
+    QAbstractListModel(parent),
+    m_dbus(dbus),
+    m_aethercastManager(AETHERCAST_SERVICE, "/org/aethercast", m_dbus),
+    m_isDiscovering(false)
+{
+    qWarning() << Q_FUNC_INFO;
+    if (m_aethercastManager.isValid()) {
+
+        connect(&m_aethercastManager, SIGNAL(InterfacesAdded(const QDBusObjectPath&, InterfaceList)),
+                this, SLOT(slotInterfacesAdded(const QDBusObjectPath&, InterfaceList)));
+
+        connect(&m_aethercastManager, SIGNAL(InterfacesRemoved(const QDBusObjectPath&, const QStringList&)),
+                this, SLOT(slotInterfacesRemoved(const QDBusObjectPath&, const QStringList&)));
+
+        watchCall(m_aethercastManager.GetManagedObjects(), [=](QDBusPendingCallWatcher *watcher) {
+            QDBusPendingReply<ManagedObjectList> reply = *watcher;
+
+            if (reply.isError()) {
+                qWarning() << "Failed to retrieve list of managed objects from Aethercast service: "
+                           << reply.error().message();
+                watcher->deleteLater();
+                return;
+            }
+
+            auto objectList = reply.argumentAt<0>();
+
+            for (QDBusObjectPath path : objectList.keys()) {
+                InterfaceList ifaces = objectList.value(path);
+                addDevice(path.path(), ifaces.value(AETHERCAST_DEVICE_IFACE));
+                break;
+            }
+
+            watcher->deleteLater();
+        });
+    }
+
+    connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()));
+}
+
+DeviceModel::~DeviceModel()
+{
+    qWarning() << "Releasing device model ..";
+}
+
+void DeviceModel::slotInterfacesAdded(const QDBusObjectPath &objectPath, InterfaceList ifacesAndProps)
+{
+    Q_UNUSED(ifacesAndProps);
+
+    qWarning() << Q_FUNC_INFO << objectPath.path();
+
+    auto candidatedPath = objectPath.path();
+
+    // At this point we can only get new devices
+    if (!candidatedPath.startsWith(m_aethercastManager.path()))
+        return;
+
+    if (!ifacesAndProps.contains(AETHERCAST_DEVICE_IFACE))
+        return;
+
+    addDevice(candidatedPath, ifacesAndProps.value(AETHERCAST_DEVICE_IFACE));
+}
+
+void DeviceModel::slotInterfacesRemoved(const QDBusObjectPath &objectPath, const QStringList &interfaces)
+{
+    auto candidatedPath = objectPath.path();
+
+    if (!m_aethercastManager.isValid())
+        return;
+
+    if (candidatedPath == m_aethercastManager.path() &&
+        interfaces.contains(AETHERCAST_MANAGER_IFACE)) {
+        return;
+    }
+
+    if (!candidatedPath.startsWith(m_aethercastManager.path()))
+        return;
+
+    if (!interfaces.contains(AETHERCAST_DEVICE_IFACE))
+        return;
+
+    auto device = getDeviceFromPath(candidatedPath);
+    if (!device)
+        return;
+
+    const int row = findRowFromAddress(device->getAddress());
+    if ((row >= 0))
+        removeRow(row);
+}
+
+int DeviceModel::findRowFromAddress(const QString &address) const
+{
+    for (int i=0, n=m_devices.size(); i<n; i++)
+        if (m_devices[i]->getAddress() == address)
+            return i;
+
+    return -1;
+}
+
+void DeviceModel::setDiscovering(bool value)
+{
+    if (value == m_isDiscovering)
+        return;
+
+    m_isDiscovering = value;
+    Q_EMIT(discoveringChanged(m_isDiscovering));
+}
+
+void DeviceModel::stopDiscovery()
+{
+    /*
+    if (m_aethercastManager.isValid() && m_isDiscovering) {
+
+         watchCall(m_aethercastManager.StopDiscovery(), [=](QDBusPendingCallWatcher *watcher) {
+            QDBusPendingReply<void> reply = *watcher;
+            if (reply.isError()) {
+                qWarning() << "Failed to stop device discovery:"
+                           << reply.error().message();
+            }
+
+            watcher->deleteLater();
+        });
+    }
+    */
+}
+
+void DeviceModel::startDiscovery()
+{
+    /*
+    if (m_aethercastManager.isValid() && !m_isDiscovering) {
+
+        watchCall(m_aethercastManager->StartDiscovery(), [=](QDBusPendingCallWatcher *watcher) {
+            QDBusPendingReply<void> reply = *watcher;
+            if (reply.isError()) {
+                qWarning() << "Failed to start device discovery:"
+                           << reply.error().message();
+            }
+
+            watcher->deleteLater();
+        });
+    }
+    */
+}
+
+void DeviceModel::toggleDiscovery()
+{
+    if (isDiscovering())
+        stopDiscovery();
+    else
+        startDiscovery();
+}
+
+void DeviceModel::slotTimeout()
+{
+    toggleDiscovery ();
+}
+
+void DeviceModel::setProperties(const QMap<QString,QVariant> &properties)
+{
+    QMapIterator<QString,QVariant> it(properties);
+    while (it.hasNext()) {
+        it.next();
+        updateProperty(it.key(), it.value());
+    }
+}
+
+void DeviceModel::updateProperty(const QString &key, const QVariant &value)
+{
+    qWarning() << Q_FUNC_INFO << key << ":" << value;
+    /*
+    if (key == "Name") {
+        m_adapterName = value.toString();
+    } else if (key == "Address") {
+        m_adapterAddress = value.toString();
+    }
+    */
+}
+
+void DeviceModel::slotPropertyChanged(const QString      &key,
+                                      const QDBusVariant &value)
+{
+    qWarning() << Q_FUNC_INFO << key << ":" << value.variant();
+    updateProperty (key, value.variant());
+}
+
+void DeviceModel::slotDevicePairingDone(bool success)
+{
+    Device *device = static_cast<Device*>(sender());
+
+    Q_EMIT(devicePairingDone(device, success));
+}
+
+void DeviceModel::addDevice(const QString &path, const QVariantMap &properties)
+{
+    qWarning() << Q_FUNC_INFO;
+    QSharedPointer<Device> device(new Device(path, m_dbus));
+    device->setProperties(properties);
+    qWarning() << Q_FUNC_INFO;
+
+    if (device) {
+        QObject::connect(device.data(), SIGNAL(deviceChanged()),
+                         this, SLOT(slotDeviceChanged()));
+        //QObject::connect(device.data(), SIGNAL(pairingDone(bool)),
+        //                 this, SLOT(slotDevicePairingDone(bool)));
+        addDevice(device);
+    }
+}
+
+void DeviceModel::addDevice(QSharedPointer<Device> &device)
+{
+    qWarning() << Q_FUNC_INFO;
+    int row = findRowFromAddress(device->getAddress());
+
+    if (row >= 0) { // update existing device
+        m_devices[row] = device;
+        emitRowChanged(row);
+    } else { // add new device
+        row = m_devices.size();
+        beginInsertRows(QModelIndex(), row, row);
+        m_devices.append(device);
+        endInsertRows();
+    }
+}
+
+void DeviceModel::removeRow(int row)
+{
+    if (0<=row && row<m_devices.size()) {
+        beginRemoveRows(QModelIndex(), row, row);
+        m_devices.removeAt(row);
+        endRemoveRows();
+    }
+}
+
+void DeviceModel::emitRowChanged(int row)
+{
+    if (0<=row && row<m_devices.size()) {
+        QModelIndex qmi = index(row, 0);
+        Q_EMIT(dataChanged(qmi, qmi));
+    }
+}
+
+void DeviceModel::slotDeviceChanged()
+{
+    const Device * device = qobject_cast<Device*>(sender());
+
+    // find the row that goes with this device
+    int row = -1;
+    if (device != nullptr)
+        for (int i=0, n=m_devices.size(); row==-1 && i<n; i++)
+            if (m_devices[i].data() == device)
+                row = i;
+
+    if (row != -1)
+        emitRowChanged(row);
+}
+
+QSharedPointer<Device> DeviceModel::getDeviceFromAddress(const QString &address)
+{
+    QSharedPointer<Device> device;
+
+    const int row = findRowFromAddress(address);
+    if (row >= 0)
+        device = m_devices[row];
+
+    return device;
+}
+
+QSharedPointer<Device> DeviceModel::getDeviceFromPath(const QString &path)
+{
+    for (auto device : m_devices)
+        if (device->getPath() == path)
+            return device;
+
+    return QSharedPointer<Device>();
+}
+
+void DeviceModel::slotRemoveFinished(QDBusPendingCallWatcher *call)
+{
+    QDBusPendingReply<void> reply = *call;
+
+    if (reply.isError()) {
+        qWarning() << "Could not remove device:" << reply.error().message();
+    }
+    call->deleteLater();
+}
+
+int DeviceModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+
+    return m_devices.size();
+}
+
+QHash<int,QByteArray> DeviceModel::roleNames() const
+{
+    static QHash<int,QByteArray> names;
+
+    if (Q_UNLIKELY(names.empty())) {
+        names[Qt::DisplayRole] = "displayName";
+        names[StateRole] = "stateName";
+        names[AddressRole] = "addressName";
+    }
+
+    return names;
+}
+
+QVariant DeviceModel::data(const QModelIndex &index, int role) const
+{
+    QVariant ret;
+
+    if ((0<=index.row()) && (index.row()<m_devices.size())) {
+
+        auto device = m_devices[index.row()];
+        QString displayName;
+
+        switch (role) {
+        case Qt::DisplayRole:
+            displayName = device->getName();
+
+            if (displayName.isEmpty())
+                displayName = device->getAddress();
+
+            ret = displayName;
+            break;
+
+        case StateRole:
+            ret = device->getState();
+            break;
+
+        case AddressRole:
+            ret = device->getAddress();
+            break;
+
+        }
+    }
+
+    return ret;
+}
+
+bool DeviceFilter::lessThan(const QModelIndex &left,
+                            const QModelIndex &right) const
+{
+  const QString a = sourceModel()->data(left, Qt::DisplayRole).value<QString>();
+  const QString b = sourceModel()->data(right, Qt::DisplayRole).value<QString>();
+  return a < b;
+}

=== added file 'plugins/wifi/aethercast/devicemodel.h'
--- plugins/wifi/aethercast/devicemodel.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/devicemodel.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ */
+
+#ifndef AETHERCAST_DEVICE_MODEL_H
+#define AETHERCAST_DEVICE_MODEL_H
+
+#include <QByteArray>
+#include <QHash>
+#include <QTimer>
+#include <QList>
+#include <QVariant>
+
+#include <QAbstractListModel>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QSortFilterProxyModel>
+
+#include "device.h"
+
+#include "freedesktop_objectmanager.h"
+#include "freedesktop_properties.h"
+#include "aethercast_device.h"
+#include "aethercast_manager.h"
+
+class DeviceModel: public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    explicit DeviceModel(QDBusConnection &dbus, QObject *parent = 0);
+    ~DeviceModel();
+
+    enum Roles
+    {
+      // Qt::DisplayRole holds device name
+      TypeRole = Qt::UserRole,
+      AddressRole,
+      StateRole,
+      LastRole = StateRole
+    };
+
+    // implemented virtual methods from QAbstractTableModel
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QHash<int,QByteArray> roleNames() const;
+
+    QSharedPointer<Device> getDeviceFromAddress(const QString &address);
+    QSharedPointer<Device> getDeviceFromPath(const QString &path);
+
+public:
+    bool isDiscovering() const { return m_isDiscovering; }
+    void stopDiscovery();
+    void startDiscovery();
+    void toggleDiscovery();
+
+Q_SIGNALS:
+    void discoveringChanged(bool isDiscovering);
+    void devicePairingDone(Device *device, bool success);
+
+private:
+    QDBusConnection m_dbus;
+    DBusObjectManagerInterface m_aethercastManager;
+
+    void setProperties(const QMap<QString,QVariant> &properties);
+    void updateProperty(const QString &key, const QVariant &value);
+
+    bool m_isDiscovering = false;
+    QTimer m_timer;
+
+    QList<QSharedPointer<Device> > m_devices;
+    void updateDevices();
+    void addDevice(QSharedPointer<Device> &device);
+    void addDevice(const QString &objectPath, const QVariantMap &properties);
+    void removeRow(int i);
+    int findRowFromAddress(const QString &address) const;
+    void emitRowChanged(int row);
+
+    void setDiscovering(bool value);
+
+private Q_SLOTS:
+    void slotInterfacesAdded(const QDBusObjectPath &objectPath, InterfaceList ifacesAndProps);
+    void slotInterfacesRemoved(const QDBusObjectPath &objectPath, const QStringList &interfaces);
+    void slotAdapterPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
+                                      const QStringList &invalidatedProperties);
+    void slotRemoveFinished(QDBusPendingCallWatcher *call);
+    void slotPropertyChanged(const QString &key, const QDBusVariant &value);
+    void slotTimeout();
+    void slotDeviceChanged();
+    void slotDevicePairingDone(bool success);
+};
+
+class DeviceFilter: public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    DeviceFilter() {}
+    virtual ~DeviceFilter() {}
+
+protected:
+    virtual bool lessThan(const QModelIndex&, const QModelIndex&) const;
+
+};
+
+#endif // AETHERCAST_DEVICE_MODEL_H

=== added file 'plugins/wifi/aethercast/displays.cpp'
--- plugins/wifi/aethercast/displays.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/displays.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ *
+ */
+
+#include "displays.h"
+#include "aethercast_manager.h"
+#include "aethercast_device.h"
+
+#include <QQmlEngine>
+
+Displays::Displays(QObject *parent):
+    Displays(QDBusConnection::systemBus(), parent)
+{
+    qWarning() << Q_FUNC_INFO;
+}
+
+Displays::Displays(const QDBusConnection &dbus, QObject *parent):
+    QObject(parent),
+    m_dbus(dbus),
+    m_devices(m_dbus)
+{
+    qWarning() << Q_FUNC_INFO;
+
+    m_manager = new AethercastManager(AETHERCAST_SERVICE, AETHERCAST_PATH, m_dbus);
+
+    m_aethercastProperties.reset(new FreeDesktopProperties(AETHERCAST_SERVICE, AETHERCAST_PATH, m_dbus));
+
+    QObject::connect(m_aethercastProperties.data(), SIGNAL(PropertiesChanged(const QString&, const QVariantMap&, const QStringList&)),
+                     this, SLOT(slotPropertiesChanged(const QString&, const QVariantMap&, const QStringList&)));
+
+
+    watchCall(m_aethercastProperties->GetAll(AETHERCAST_MANAGER_IFACE), [=](QDBusPendingCallWatcher *watcher) {
+        QDBusPendingReply<QVariantMap> reply = *watcher;
+
+        if (reply.isError()) {
+            qWarning() << "Failed to retrieve properties for manager";
+            watcher->deleteLater();
+            return;
+        }
+
+        auto properties = reply.argumentAt<0>();
+        setProperties(properties);
+        watcher->deleteLater();
+    });
+}
+
+void Displays::slotPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
+                                           const QStringList &invalidatedProperties)
+{
+    Q_UNUSED(invalidatedProperties);
+    qWarning() << Q_FUNC_INFO;
+
+    if (interface != AETHERCAST_MANAGER_IFACE)
+        return;
+
+    setProperties(changedProperties);
+}
+
+void Displays::setProperties(const QMap<QString,QVariant> &properties)
+{
+    qWarning() << Q_FUNC_INFO;
+    QMapIterator<QString,QVariant> it(properties);
+    while (it.hasNext()) {
+        it.next();
+        updateProperty(it.key(), it.value());
+    }
+}
+
+void Displays::scan()
+{
+    qWarning() << Q_FUNC_INFO;
+    if (!m_manager)
+        return;
+    m_manager->Scan();
+}
+
+QAbstractItemModel * Displays::devices()
+{
+    qWarning() << Q_FUNC_INFO;
+    auto ret = &m_devices;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
+void Displays::disconnectDevice(const QString &address)
+{
+    qWarning() << Q_FUNC_INFO << address;
+    auto device = m_devices.getDeviceFromAddress(address);
+    if (device)
+        device->disconnect();
+}
+
+void Displays::connectDevice(const QString &address)
+{
+    qWarning() << Q_FUNC_INFO << address;
+    auto device = m_devices.getDeviceFromAddress(address);
+    if (device)
+        device->connect();
+}
+
+void Displays::updateProperty(const QString &key, const QVariant &value)
+{
+    qWarning() << Q_FUNC_INFO << key << ":" << value;
+    if (key == "Scanning") 
+        Q_EMIT(scanningChanged(value.toBool()));
+}

=== added file 'plugins/wifi/aethercast/displays.h'
--- plugins/wifi/aethercast/displays.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/displays.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ *
+ */
+
+#ifndef DISPLAYS_H
+#define DISPLAYS_H
+
+#include <QObject>
+#include <QtDBus>
+#include "devicemodel.h"
+#include "aethercast_device.h"
+#include "aethercast_manager.h"
+
+class Displays : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY (QAbstractItemModel* devices
+                READ devices
+                NOTIFY devicesChanged)
+
+    Q_PROPERTY (bool scanning
+                READ scanning
+                NOTIFY scanningChanged)
+
+Q_SIGNALS:
+    void devicesChanged();
+    void scanningChanged(bool isActive);
+
+public:
+    explicit Displays(QObject *parent = nullptr);
+    explicit Displays(const QDBusConnection &dbus, QObject *parent = nullptr);
+    ~Displays() {}
+
+    Q_INVOKABLE void connectDevice(const QString &address);
+    Q_INVOKABLE void disconnectDevice(const QString &address);
+    Q_INVOKABLE void scan();
+    void setProperties(const QMap<QString,QVariant> &properties);
+
+public:
+    QAbstractItemModel * devices();
+    bool scanning() const { return m_manager->scanning(); }
+
+private Q_SLOTS:
+    void slotPropertiesChanged(const QString &interface, const QVariantMap &changedProperties,
+                               const QStringList &invalidatedProperties);
+
+private:
+    QDBusConnection m_dbus;
+    DeviceModel m_devices;
+    AethercastManager* m_manager;
+    QScopedPointer<FreeDesktopProperties> m_aethercastProperties;
+    void updateProperties(QSharedPointer<QDBusInterface>);
+    void updateProperty(const QString &key, const QVariant &value);
+};
+
+#endif // DISPLAYS_H

=== added file 'plugins/wifi/aethercast/freedesktop_objectmanager.cpp'
--- plugins/wifi/aethercast/freedesktop_objectmanager.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/freedesktop_objectmanager.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -p freedesktop_objectmanager -i aethercast_helper.h -v -c DBusObjectManagerInterface org.freedesktop.DBus.ObjectManager.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "freedesktop_objectmanager.h"
+
+/*
+ * Implementation of interface class DBusObjectManagerInterface
+ */
+
+DBusObjectManagerInterface::DBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+DBusObjectManagerInterface::~DBusObjectManagerInterface()
+{
+}
+

=== added file 'plugins/wifi/aethercast/freedesktop_objectmanager.h'
--- plugins/wifi/aethercast/freedesktop_objectmanager.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/freedesktop_objectmanager.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,58 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -p freedesktop_objectmanager -i aethercast_helper.h -v -c DBusObjectManagerInterface org.freedesktop.DBus.ObjectManager.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef FREEDESKTOP_OBJECTMANAGER_H_1452098393
+#define FREEDESKTOP_OBJECTMANAGER_H_1452098393
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+#include "aethercast_helper.h"
+
+/*
+ * Proxy class for interface org.freedesktop.DBus.ObjectManager
+ */
+class DBusObjectManagerInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.freedesktop.DBus.ObjectManager"; }
+
+public:
+    DBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~DBusObjectManagerInterface();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<ManagedObjectList> GetManagedObjects()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("GetManagedObjects"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+    void InterfacesAdded(const QDBusObjectPath &object_path, InterfaceList interfaces_and_properties);
+    void InterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces);
+};
+
+namespace org {
+  namespace freedesktop {
+    namespace DBus {
+      typedef ::DBusObjectManagerInterface ObjectManager;
+    }
+  }
+}
+#endif

=== added file 'plugins/wifi/aethercast/freedesktop_properties.cpp'
--- plugins/wifi/aethercast/freedesktop_properties.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/freedesktop_properties.cpp	2016-03-09 13:21:41 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c FreeDesktopProperties -p freedesktop_properties -v org.freedesktop.DBus.Properties.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "freedesktop_properties.h"
+
+/*
+ * Implementation of interface class FreeDesktopProperties
+ */
+
+FreeDesktopProperties::FreeDesktopProperties(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+FreeDesktopProperties::~FreeDesktopProperties()
+{
+}
+

=== added file 'plugins/wifi/aethercast/freedesktop_properties.h'
--- plugins/wifi/aethercast/freedesktop_properties.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/freedesktop_properties.h	2016-03-09 13:21:41 +0000
@@ -0,0 +1,71 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c FreeDesktopProperties -p freedesktop_properties -v org.freedesktop.DBus.Properties.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef FREEDESKTOP_PROPERTIES_H_1452098393
+#define FREEDESKTOP_PROPERTIES_H_1452098393
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.freedesktop.DBus.Properties
+ */
+class FreeDesktopProperties: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.freedesktop.DBus.Properties"; }
+
+public:
+    FreeDesktopProperties(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~FreeDesktopProperties();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<QDBusVariant> Get(const QString &interface, const QString &name)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name);
+        return asyncCallWithArgumentList(QStringLiteral("Get"), argumentList);
+    }
+
+    inline QDBusPendingReply<QVariantMap> GetAll(const QString &interface)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(interface);
+        return asyncCallWithArgumentList(QStringLiteral("GetAll"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Set(const QString &interface, const QString &name, const QDBusVariant &value)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name) << QVariant::fromValue(value);
+        return asyncCallWithArgumentList(QStringLiteral("Set"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+    void PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, const QStringList &invalidated_properties);
+};
+
+namespace org {
+  namespace freedesktop {
+    namespace DBus {
+      typedef ::FreeDesktopProperties Properties;
+    }
+  }
+}
+#endif

=== added file 'plugins/wifi/aethercast/org.aethercast.xml'
--- plugins/wifi/aethercast/org.aethercast.xml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/aethercast/org.aethercast.xml	2016-03-09 13:21:41 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.aethercast.Manager">
+        <method name="RegisterMediaManager">
+            <arg name="path" type="o" direction="in"/>
+        </method>
+        <method name="UnregisterMediaManager">
+            <arg name="path" type="o" direction="in"/>
+        </method>
+        <method name="Scan"/>
+        <property name="State" type="s" access="read"/>
+        <property name="Capabilities" type="as" access="read"/>
+        <property name="Scanning" type="b" access="read"/>
+    </interface>
+    <interface name="org.aethercast.Device">
+        <method name="Connect">
+            <arg name="role" type="s" direction="in"/>
+        </method>
+        <method name="Disconnect"/>
+        <property name="State" type="s" access="read"/>
+        <property name="Address" type="s" access="read"/>
+        <property name="Name" type="s" access="read"/>
+        <property name="Capabilities" type="as" access="read"/>
+    </interface>
+    <interface name="org.aethercast.MediaManager">
+        <method name="Configure">
+            <arg name="address" type="s"/>
+            <arg name="port" type="i"/>
+        </method>
+        <method name="Play"/>
+        <method name="Pause"/>
+        <method name="Teardown"/>
+    </interface>
+</node>

=== modified file 'plugins/wifi/plugin.cpp'
--- plugins/wifi/plugin.cpp	2015-06-03 19:35:09 +0000
+++ plugins/wifi/plugin.cpp	2016-03-09 13:21:41 +0000
@@ -23,6 +23,9 @@
 #include "wifidbushelper.h"
 #include "previousnetworkmodel.h"
 #include "certhandler.h"
+#include "aethercast/aethercast_helper.h"
+#include "aethercast/displays.h"
+#include "aethercast/device.h"
 
 namespace {
 
@@ -43,6 +46,11 @@
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Wifi"));
+
+    // Register additional QtDBus types we need
+    qDBusRegisterMetaType<InterfaceList>();
+    qDBusRegisterMetaType<ManagedObjectList>();
+
     qmlRegisterType<UnityMenuModelStack>(uri, 1, 0, "UnityMenuModelStack");
     qmlRegisterSingletonType<WifiDbusHelper>(uri, 1, 0, "DbusHelper", dbusProvider);
     qmlRegisterType<PreviousNetworkModel>(uri, 1, 0, "PreviousNetworkModel");
@@ -50,6 +58,8 @@
     qmlRegisterType<PrivatekeyListModel>(uri, 1, 0, "PrivatekeyListModel");
     qmlRegisterType<PacFileListModel>(uri, 1, 0, "PacFileListModel");
     qmlRegisterType<FileHandler>(uri, 1, 0, "FileHandler");
+    qmlRegisterType<Device>(uri, 1, 0, "Device");
+    qmlRegisterType<Displays>(uri, 1, 0, "Displays");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)