Merge lp:~charlesk/indicator-bluetooth/lp-1126108 into lp:indicator-bluetooth/14.04

[Charles Kerr]

Gets us a little closer to the spec in two ways:

1. Indicator Visibility

On the desktop, the indicator's header icon is visible whenever a default adapter is available (whether the adapter is powered or not) and the user's preference settings call for a visible Bluetooth indicator.

On the phone, the indicator's header icon is visible whenever a default adapter is available *and* the adapter is powered.

2. Header Icon

If Bluetooth is off, the header icon now uses the "bluetooth-disabled" icon.
If Bluetooth is on, it now uses the "bluetooth-active" icon.
If Bluetooth is on and has a connected device, it now uses the "bluetooth-paired" icon.

[Lars Karlitski (larsu)]

Sounds about right ;)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-bluetooth-ci/27/rebuild

review: Approve (continuous-integration)

=== modified file 'src/bluetooth.vala'
--- src/bluetooth.vala	2013-10-11 13:38:51 +0000
+++ src/bluetooth.vala	2013-12-06 16:45:24 +0000
@@ -32,6 +32,9 @@
      eg by a laptop's network killswitch */
   public abstract bool enabled { get; protected set; }
 
+  /* True if we have a connected device. */
+  public abstract bool connected { get; protected set; }
+
   /* Try to enable/disable bluetooth. This can fail if it's overridden
      by the system, eg by a laptop's network killswitch */
   public abstract void try_set_enabled (bool b);

=== modified file 'src/bluez.vala'
--- src/bluez.vala	2013-10-14 23:33:59 +0000
+++ src/bluez.vala	2013-12-06 16:45:24 +0000
@@ -157,6 +157,8 @@
        critical (@"$(e.message)");
      }
 
+    supported = object_path != null;
+
     on_default_adapter_properties_changed ();
   }
 
@@ -414,6 +416,7 @@
                                          supports_file_transfer));
 
     devices_changed ();
+    update_connected ();
   }
 
   /* update the 'enabled' property by looking at the killswitch state
@@ -424,7 +427,22 @@
     debug (@"in upate_enabled, powered is $powered, blocked is $blocked");
     enabled = powered && !blocked;
   }
-    
+
+  private bool have_connected_device ()
+  {
+    var devices = get_devices();
+
+    foreach (var device in devices)
+      if (device.is_connected)
+        return true;
+
+    return false;
+  }
+
+  private void update_connected ()
+  {
+    connected = have_connected_device ();
+  }
 
   ////
   ////  Public API
@@ -444,6 +462,8 @@
           device_connect (proxy);
         else
           device_disconnect (proxy);
+
+        update_connected ();
       }
   }
 
@@ -463,6 +483,7 @@
   public bool supported { get; protected set; default = false; }
   public bool discoverable { get; protected set; default = false; }
   public bool enabled { get; protected set; default = false; }
+  public bool connected { get; protected set; default = false; }
 
   public void try_set_enabled (bool b)
   {

=== modified file 'src/desktop.vala'
--- src/desktop.vala	2013-10-25 00:19:20 +0000
+++ src/desktop.vala	2013-12-06 16:45:24 +0000
@@ -66,7 +66,7 @@
 
     // know when to show the indicator & when to hide it
     settings.changed["visible"].connect (()=> update_visibility());
-    bluetooth.notify["enabled"].connect (() => update_visibility());
+    bluetooth.notify["supported"].connect (() => update_visibility());
     update_visibility ();
 
     // when devices change, rebuild our device section
@@ -82,7 +82,7 @@
 
   void update_visibility ()
   {
-    visible = bluetooth.enabled && settings.get_boolean("visible");
+    visible = bluetooth.supported && settings.get_boolean("visible");
   }
 
   ///

=== modified file 'src/profile.vala'
--- src/profile.vala	2013-10-25 00:19:20 +0000
+++ src/profile.vala	2013-12-06 16:45:24 +0000
@@ -37,7 +37,8 @@
                                              null,
                                              action_state_for_root());
     notify["visible"].connect (() => update_root_action_state());
-
+    bluetooth.notify["enabled"].connect (() => update_root_action_state());
+    bluetooth.notify["connected"].connect (() => update_root_action_state());
     menu = new Menu ();
 
     var item = create_root_menuitem ();
@@ -85,7 +86,7 @@
 
   protected MenuItem create_enabled_menuitem ()
   {
-    var item = new MenuItem ("Bluetooth", "indicator.bluetooth-enabled");
+    var item = new MenuItem (_("Bluetooth"), "indicator.bluetooth-enabled");
 
     item.set_attribute ("x-canonical-type", "s",
                         "com.canonical.indicator.switch");
@@ -146,7 +147,13 @@
   {
     string a11y;
     string icon_name;
-    if (bluetooth.enabled)
+
+    if (bluetooth.connected)
+      {
+        a11y = "Bluetooth (connections)";
+        icon_name = "bluetooth-paired";
+      }
+    else if (bluetooth.enabled)
       {
         a11y = "Bluetooth (on)";
         icon_name = "bluetooth-active";
@@ -158,7 +165,6 @@
       }
 
     var icon = new ThemedIcon.with_default_fallbacks (icon_name);
-
     var builder = new VariantBuilder (new VariantType ("a{sv}"));
     builder.add ("{sv}", "visible", new Variant.boolean (visible));
     builder.add ("{sv}", "accessible-desc", new Variant.string (a11y));