Merge lp:~jonas-drange/ubuntu-system-settings/visible-file-exists-vivid into lp:ubuntu-system-settings/15.04

[Jonas G. Drange]

define a way for plugin to be visible if a file exists, use that capability
to enable the updates panel on system-image systems and not snappy one,
which allows us to not have a strong depends on system image components

define a way for plugin to be visible if a file exists, use that capability
to enable the updates panel on system-image systems and not snappy one,
which allows us to not have a strong depends on system image components

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1417
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-ci/11/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3139
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21093

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1417
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21101

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

The system-image-snappy-cli probably won't go into vivid, but no harm in including the "or" depends here to keep it out of the delta between wily and vivid.

Looks good!

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-04-30 19:35:35 +0000
+++ debian/control	2015-06-10 13:33:49 +0000
@@ -79,7 +79,7 @@
          suru-icon-theme,
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
-         system-image-dbus (>= 2.5),
+         system-image-dbus (>= 2.5) | system-image-snappy-cli,
          click,
          ubuntu-keyboard-data (>= 0.99.trunk.phablet2+13.10.20131001),
          urfkill,

=== modified file 'lib/SystemSettings/item-base.cpp'
--- lib/SystemSettings/item-base.cpp	2013-09-12 11:17:35 +0000
+++ lib/SystemSettings/item-base.cpp	2015-06-10 13:33:49 +0000
@@ -40,6 +40,7 @@
 const QLatin1String keyHasDynamicKeywords("has-dynamic-keywords");
 const QLatin1String keyHasDynamicVisibility("has-dynamic-visibility");
 const QLatin1String keyHideByDefault("hide-by-default");
+const QLatin1String keyVisibleIfFileExists("visible-if-file-exists");
 
 class ItemBasePrivate
 {

=== modified file 'lib/SystemSettings/item-base.h'
--- lib/SystemSettings/item-base.h	2014-10-27 13:28:49 +0000
+++ lib/SystemSettings/item-base.h	2015-06-10 13:33:49 +0000
@@ -40,6 +40,7 @@
 extern const QLatin1String keyHasDynamicKeywords;
 extern const QLatin1String keyHasDynamicVisibility;
 extern const QLatin1String keyHideByDefault;
+extern const QLatin1String keyVisibleIfFileExists;
 
 class ItemBasePrivate;
 class ItemBase: public QObject

=== modified file 'plugins/system-update/system-update.settings'
--- plugins/system-update/system-update.settings	2014-09-24 17:10:03 +0000
+++ plugins/system-update/system-update.settings	2015-06-10 13:33:49 +0000
@@ -9,6 +9,7 @@
         "software",
         "update",
         "apps",
+        "application",
         "automatic",
         "download",
         "upgrade",
@@ -16,5 +17,7 @@
     ],
     "has-dynamic-keywords": false,
     "has-dynamic-visibility": false,
-    "page-component": "PageComponent.qml"
+    "page-component": "PageComponent.qml",
+    "visible-if-file-exists": "/usr/share/dbus-1/system-services/com.canonical.SystemImage.service"
 }
+

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2014-10-27 13:29:30 +0000
+++ src/plugin.cpp	2015-06-10 13:33:49 +0000
@@ -220,6 +220,12 @@
 bool Plugin::isVisible() const
 {
     Q_D(const Plugin);
+    if (!d->m_data.value(keyVisibleIfFileExists).isNull()) {
+        QFile KeyFile(d->m_data.value(keyVisibleIfFileExists).toString());
+        if (!KeyFile.exists())
+                return false;
+    }
+
     // TODO: visibility check depending on form-factor
     if (d->m_data.value(keyHasDynamicVisibility).toBool()) {
         if (!d->ensureLoaded()) return false;