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

[Ken VanDine]

Exposed adapterAddress in the bluetooth plugin to be used to get the address in the about plugin

Exposed adapterAddress in the bluetooth plugin to be used to get the address in the about plugin. Removed the old NetworkAbout plugin provided by the about panel, it was using the bluez4 interface. We'll just get the property from the bluetooth panel.

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

1585. By Ken VanDine on 2016-01-22

Expose adapterName as a property and emit change notifications

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1584
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/lp1537029/+merge/283664/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2581/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/764
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6164
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26956

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

review: Needs Fixing (continuous-integration)

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

1586. By Ken VanDine on 2016-01-22

removed unused NetworkAbout, we're now getting the bluetooth properties from the bluetooth plugin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1585
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2582/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/765
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6172
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26970

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1586
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2583/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/766
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6179
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26982

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

I love it! Killing code and bugs at the same time.

Correct address on both device and desktop (i.e. addr match between ui and $ bluetoothctl).

review: Approve

=== modified file 'plugins/about/CMakeLists.txt'
--- plugins/about/CMakeLists.txt	2015-08-19 13:54:40 +0000
+++ plugins/about/CMakeLists.txt	2016-01-22 19:58:05 +0000
@@ -23,11 +23,9 @@
     plugin.cpp
     storageabout.cpp
     click.cpp
-    networkabout.cpp
     plugin.h
     storageabout.h
     click.h
-    networkabout.h
     ${QML_SOURCES} # So they show up in Qt designer.
 )
 

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-10-29 15:48:06 +0000
+++ plugins/about/PageComponent.qml	2016-01-22 19:58:05 +0000
@@ -25,6 +25,7 @@
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.SystemSettings.StorageAbout 1.0
 import Ubuntu.SystemSettings.Update 1.0
+import Ubuntu.SystemSettings.Bluetooth 1.0
 import MeeGo.QOfono 0.2
 
 ItemPage {
@@ -39,6 +40,10 @@
         id: backendInfos
     }
 
+    UbuntuBluetoothPanel {
+        id: bluetooth
+    }
+
     DeviceInfo {
         id: deviceInfos
     }
@@ -48,10 +53,6 @@
         onModemsChanged: root.modemsSorted = modems.slice(0).sort()
     }
 
-    NetworkAbout {
-        id: network
-    }
-
     NetworkInfo {
         id: wlinfo
     }
@@ -136,8 +137,8 @@
             ListItem.SingleValue {
                 id: bthwaddr
                 text: i18n.tr("Bluetooth address")
-                value: network.bluetoothMacAddress
-                visible: network.bluetoothMacAddress
+                value: bluetooth.adapterAddress
+                visible: bluetooth.adapterAddress
                 showDivider: false
             }
 

=== removed file 'plugins/about/networkabout.cpp'
--- plugins/about/networkabout.cpp	2014-12-11 14:04:51 +0000
+++ plugins/about/networkabout.cpp	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2014 Canonical Ltd.
- *
- * Contact: Jonas G. Drange <[e-mail]>
- *
- * 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- */
-
-#include <QDebug>
-#include <QDBusReply>
-
-#include "networkabout.h"
-
-NetworkAbout::NetworkAbout(QObject *parent)
-    : QObject(parent),
-    m_systemBusConnection(QDBusConnection::systemBus())
-{
-
-    setupBluetoothMacAddress();
-}
-
-void NetworkAbout::setupBluetoothMacAddress()
-{
-    QDBusInterface bluezManagerInterface (
-        "org.bluez",
-        "/",
-        "org.bluez.Manager",
-        m_systemBusConnection,
-        this);
-
-    if (!bluezManagerInterface.isValid()) {
-        return;
-    }
-
-    QDBusReply<QDBusObjectPath> defaultDevice = bluezManagerInterface.call("DefaultAdapter");
-
-    if (!defaultDevice.isValid()) {
-        return;
-    }
-
-    QDBusInterface adapterInterface (
-        "org.bluez",
-        defaultDevice.value().path(),
-        "org.bluez.Adapter",
-        m_systemBusConnection,
-        this);
-
-    QDBusReply<QVariantMap> props = adapterInterface.call("GetProperties");
-
-    if (!props.isValid()) {
-        return;
-    }
-
-    m_bluetoothMacAddress = props.value()["Address"].toString();
-}
-
-QString NetworkAbout::bluetoothMacAddress()
-{
-    return m_bluetoothMacAddress;
-}

=== removed file 'plugins/about/networkabout.h'
--- plugins/about/networkabout.h	2014-12-11 14:04:51 +0000
+++ plugins/about/networkabout.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2014 Canonical Ltd.
- *
- * Contact: Jonas G. Drange <[e-mail]>
- *
- * 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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 NETWORKABOUT_H
-#define NETWORKABOUT_H
-
-#include <QObject>
-#include <QStringList>
-#include <QtDBus/QDBusInterface>
-
-
-class NetworkAbout : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY( QString bluetoothMacAddress
-                READ bluetoothMacAddress
-                NOTIFY bluetoothMacAddressChanged )
-
-public:
-    explicit NetworkAbout (QObject *parent = 0);
-    QString bluetoothMacAddress();
-
-Q_SIGNALS:
-    void bluetoothMacAddressChanged(QString addresses);
-
-private:
-    QString m_bluetoothMacAddress;
-    void setupBluetoothMacAddress();
-    QDBusConnection m_systemBusConnection;
-};
-
-#endif // NETWORKABOUT_H

=== modified file 'plugins/about/plugin.cpp'
--- plugins/about/plugin.cpp	2014-09-04 00:58:34 +0000
+++ plugins/about/plugin.cpp	2016-01-22 19:58:05 +0000
@@ -23,7 +23,6 @@
 #include <QtQml/QQmlContext>
 #include "click.h"
 #include "storageabout.h"
-#include "networkabout.h"
 
 
 void BackendPlugin::registerTypes(const char *uri)
@@ -32,7 +31,6 @@
 
     qRegisterMetaType<ClickModel::Roles>();
     qmlRegisterType<ClickModel>(uri, 1, 0, "ClickRoles");
-    qmlRegisterType<NetworkAbout>(uri, 1, 0, "NetworkAbout");
     qmlRegisterType<StorageAbout>(uri, 1, 0, "UbuntuStorageAboutPanel");
 }
 

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2015-11-20 08:47:27 +0000
+++ plugins/bluetooth/PageComponent.qml	2016-01-22 19:58:05 +0000
@@ -260,7 +260,7 @@
                             topMargin: units.gu(1)
                         }
                         height: units.gu(3)
-                        text: backend.discoverable ? backend.adapterName() : ""
+                        text: backend.discoverable ? backend.adapterName : ""
                         color: "darkgrey"
                         visible: backend.discoverable
                         enabled: false

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2015-11-30 20:53:22 +0000
+++ plugins/bluetooth/bluetooth.cpp	2016-01-22 19:58:05 +0000
@@ -65,6 +65,12 @@
 
     QObject::connect(&m_devices, SIGNAL(devicePairingDone(Device*,bool)),
                      this, SIGNAL(devicePairingDone(Device*,bool)));
+
+    QObject::connect(&m_devices, SIGNAL(adapterNameChanged()),
+                     this, SIGNAL(adapterNameChanged()));
+
+    QObject::connect(&m_devices, SIGNAL(adapterAddressChanged()),
+                     this, SIGNAL(adapterAddressChanged()));
 }
 
 void Bluetooth::setSelectedDevice(const QString &address)

=== modified file 'plugins/bluetooth/bluetooth.h'
--- plugins/bluetooth/bluetooth.h	2015-10-26 13:19:47 +0000
+++ plugins/bluetooth/bluetooth.h	2016-01-22 19:58:05 +0000
@@ -64,12 +64,22 @@
                 READ isDiscoverable
                 NOTIFY discoverableChanged)
 
+    Q_PROPERTY (QString adapterName
+                READ adapterName
+                NOTIFY adapterNameChanged)
+
+    Q_PROPERTY (QString adapterAddress
+                READ adapterAddress
+                NOTIFY adapterAddressChanged)
+
 Q_SIGNALS:
     void selectedDeviceChanged();
     void poweredChanged(bool powered);
     void discoveringChanged(bool isActive);
     void discoverableChanged(bool isActive);
     void devicePairingDone(Device *device, bool success);
+    void adapterNameChanged();
+    void adapterAddressChanged();
 
 public:
     explicit Bluetooth(QObject *parent = nullptr);
@@ -77,6 +87,7 @@
     ~Bluetooth() {}
 
     Q_INVOKABLE QString adapterName() const { return m_devices.adapterName(); }
+    Q_INVOKABLE QString adapterAddress() const { return m_devices.adapterAddress(); }
     Q_INVOKABLE void setSelectedDevice(const QString &address);
     Q_INVOKABLE void connectDevice(const QString &address);
     Q_INVOKABLE void disconnectDevice();

=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2015-11-11 11:48:28 +0000
+++ plugins/bluetooth/devicemodel.cpp	2016-01-22 19:58:05 +0000
@@ -366,8 +366,10 @@
 {
     if (key == "Name") {
         m_adapterName = value.toString();
+        Q_EMIT(adapterNameChanged());
     } else if (key == "Address") {
         m_adapterAddress = value.toString();
+        Q_EMIT(adapterAddressChanged());
     } else if (key == "Pairable") {
         m_isPairable = value.toBool();
     } else if (key == "Discoverable") {

=== modified file 'plugins/bluetooth/devicemodel.h'
--- plugins/bluetooth/devicemodel.h	2015-10-26 13:19:47 +0000
+++ plugins/bluetooth/devicemodel.h	2016-01-22 19:58:05 +0000
@@ -68,6 +68,7 @@
     QSharedPointer<Device> getDeviceFromAddress(const QString &address);
     QSharedPointer<Device> getDeviceFromPath(const QString &path);
     QString adapterName() const { return m_adapterName; }
+    QString adapterAddress() const { return m_adapterAddress; }
 
 public:
     bool isPowered() const { return m_isPowered; }
@@ -84,6 +85,8 @@
     void discoveringChanged(bool isDiscovering);
     void discoverableChanged(bool isDiscoverable);
     void devicePairingDone(Device *device, bool success);
+    void adapterNameChanged();
+    void adapterAddressChanged();
 
 private:
     QDBusConnection m_dbus;