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

[Ken VanDine]

Only show Developer Mode setting if we can set it. Dropped dbus-property-service to suggests.

Only show Developer Mode setting if we can set it. Dropped dbus-property-service to suggests.

[Jonas G. Drange (jonas-drange)]

LGTM, thanks

review: Approve

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

FAILED: Continuous integration, rev:1721
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/158/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1592/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1592
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1440/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1440/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1440/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1440/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1440/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1440/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1440
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1440/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1440/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1440/console

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

review: Needs Fixing (continuous-integration)

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

1722. By Ken VanDine on 2016-09-22

merged urfkill branch

1723. By Ken VanDine on 2016-09-27

merged prereq

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-09-13 14:28:06 +0000
+++ debian/control	2016-09-22 13:10:38 +0000
@@ -79,7 +79,6 @@
          accountsservice-ubuntu-schemas (>= 0.0.7),
          bluez (>= 5.23),
          click | ubuntu-snappy-cli,
-         dbus-property-service [amd64 arm64 armhf i386],
          gsettings-desktop-schemas,
          gsettings-ubuntu-schemas (>= 0.0.7),
          indicator-bluetooth (>> 0.0.6+13.10.20131010),
@@ -102,7 +101,6 @@
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
          ubuntu-keyboard-data (>= 0.99.trunk.phablet2+15.04.20150421),
-         urfkill,
 # for the session-migration script (python3 itself also for the push helper)
          python3,
          python3-gi,
@@ -112,6 +110,8 @@
          qml-module-ubuntu-connectivity (>= 0.7.1)
 Suggests: system-image-dbus (>= 3.1),
           aethercast,
+          dbus-property-service,
+          urfkill,
 Recommends: ubuntu-system-settings-online-accounts,
             ubuntu-touch-sounds,
 Conflicts: ubuntu-system-settings-example

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2016-09-07 11:49:00 +0000
+++ plugins/about/PageComponent.qml	2016-09-22 13:10:38 +0000
@@ -236,6 +236,7 @@
             SettingsListItems.SingleValueProgression {
                 objectName: "devmodeItem"
                 text: i18n.tr("Developer mode")
+                visible: backendInfos.developerModeCapable
                 onClicked: pageStack.push(Qt.resolvedUrl("DevMode.qml"))
             }
         }

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2016-03-30 17:43:50 +0000
+++ plugins/about/storageabout.cpp	2016-09-22 13:10:38 +0000
@@ -206,6 +206,15 @@
     return m_ubuntuBuildID;
 }
 
+bool StorageAbout::getDeveloperModeCapable() const
+{
+    QDBusReply<bool> reply = m_propertyService->call("GetProperty", "adb");
+
+    if (reply.isValid())
+        return true;
+    return false;
+}
+
 bool StorageAbout::getDeveloperMode()
 {
     QDBusReply<bool> reply = m_propertyService->call("GetProperty", "adb");

=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2016-03-30 16:37:40 +0000
+++ plugins/about/storageabout.h	2016-09-22 13:10:38 +0000
@@ -90,6 +90,9 @@
     Q_PROPERTY(bool developerMode
                READ getDeveloperMode
                WRITE setDeveloperMode)
+    Q_PROPERTY(bool developerModeCapable
+               READ getDeveloperModeCapable
+                CONSTANT)
 
 public:
     explicit StorageAbout(QObject *parent = 0);
@@ -115,6 +118,7 @@
     Q_INVOKABLE bool isInternal(const QString &drive) const;
     bool getDeveloperMode();
     void setDeveloperMode(bool newMode);
+    bool getDeveloperModeCapable() const;
 
 Q_SIGNALS:
     void sortRoleChanged();

=== modified file 'plugins/flight-mode/flight-mode.settings'
--- plugins/flight-mode/flight-mode.settings	2015-11-23 14:38:43 +0000
+++ plugins/flight-mode/flight-mode.settings	2016-09-22 13:10:38 +0000
@@ -13,5 +13,6 @@
     ],
     "has-dynamic-keywords": false,
     "has-dynamic-visibility": false,
+    "visible-if-file-exists": "/etc/dbus-1/system.d/org.freedesktop.URfkill.conf",
     "entry-component": "EntryComponent.qml"
 }