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. Fixes: https://bugs.launchpad.net/bugs/1126108.

Approved by PS Jenkins bot, Lars Uebernickel.

1 files changed, 10 insertions, 4 deletions

diff --git a/src/profile.vala b/src/profile.vala
index 6aedec3..4320ac8 100644
--- a/src/profile.vala
+++ b/src/profile.vala
@@ -37,7 +37,8 @@ class Profile: Object
                                              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 @@ class Profile: Object
 
   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 @@ class Profile: Object
   {
     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 @@ class Profile: Object
       }
 
     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));