Merge lp:~tintou/switchboard/can-show into lp:~elementary-pantheon/switchboard/switchboard

[Corentin Noël]

Hide and Show settings panes when hardware devices are present/not present

To test: lp:switchboard-plug-bluetooth [Plug/Unplug a Bluetooth dongle]

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:switchboard failed due to conflicts:

text conflict in src/CategoryView.vala

=== modified file 'lib/Plug.vala'
--- lib/Plug.vala	2016-11-02 00:24:55 +0000
+++ lib/Plug.vala	2016-11-15 00:05:14 +0000
@@ -75,7 +75,8 @@
     public bool can_show { get; set; default=true; }
     
     /**
-     * Inform the application that the plug can now be listed in the available plugs
+     * Inform the application that the plug can now be listed in the available plugs.
+     * The application will also listen to the notify::can-show signal.
      */
     public signal void visibility_changed ();
     

=== modified file 'src/CategoryView.vala'
--- src/CategoryView.vala	2016-05-12 17:41:11 +0000
+++ src/CategoryView.vala	2016-11-15 00:05:14 +0000
@@ -55,6 +55,7 @@
             var plugsmanager = Switchboard.PlugsManager.get_default ();
             plugsmanager.plug_added.connect ((plug) => {
                 plug.visibility_changed.connect (() => plug_visibility_changed (plug));
+                plug.notify["can-show"].connect (() => plug_visibility_changed (plug));
                 add_plug (plug);
             });
 
@@ -71,8 +72,10 @@
         }
 
         private void plug_visibility_changed (Switchboard.Plug plug) {
-            if (plug.can_show == true) {
+            if (plug.can_show) {
                 add_plug (plug);
+            } else {
+                remove_plug (plug);
             }
         }
 
@@ -114,6 +117,50 @@
             }
         }
 
+        public void remove_plug (Switchboard.Plug plug) {
+            if (plug.can_show == true) {
+                return;
+            }
+
+            switch (plug.category) {
+                case Switchboard.Plug.Category.PERSONAL:
+                    personal_category.get_flow_children ().foreach ((child) => {
+                        if (child is Switchboard.CategoryIcon && ((Switchboard.CategoryIcon) child).plug == plug) {
+                            child.destroy ();
+                        }
+                    });
+                    break;
+                case Switchboard.Plug.Category.HARDWARE:
+                    hardware_category.get_flow_children ().foreach ((child) => {
+                        if (child is Switchboard.CategoryIcon && ((Switchboard.CategoryIcon) child).plug == plug) {
+                            child.destroy ();
+                        }
+                    });
+                    break;
+                case Switchboard.Plug.Category.NETWORK:
+                    network_category.get_flow_children ().foreach ((child) => {
+                        if (child is Switchboard.CategoryIcon && ((Switchboard.CategoryIcon) child).plug == plug) {
+                            child.destroy ();
+                        }
+                    });
+                    break;
+                case Switchboard.Plug.Category.SYSTEM:
+                    system_category.get_flow_children ().foreach ((child) => {
+                        if (child is Switchboard.CategoryIcon && ((Switchboard.CategoryIcon) child).plug == plug) {
+                            child.destroy ();
+                        }
+                    });
+                    break;
+                default:
+                    return;
+            }
+
+#if HAVE_UNITY
+            unowned SwitchboardApp app = (SwitchboardApp) GLib.Application.get_default ();
+            app.update_libunity_quicklist ();
+#endif
+        }
+
         public void grab_focus_first_icon_view () {
             if (personal_category.has_child ()) {
                 personal_category.focus_first_child ();

=== modified file 'src/Widgets/CategoryFlowBox.vala'
--- src/Widgets/CategoryFlowBox.vala	2016-11-03 21:57:17 +0000
+++ src/Widgets/CategoryFlowBox.vala	2016-11-15 00:05:14 +0000
@@ -70,6 +70,10 @@
             flowbox.add (widget);
         }
 
+        public GLib.List<weak Gtk.Widget> get_flow_children () {
+            return flowbox.get_children ();
+        }
+
         public void activate_first_child () {
             foreach (unowned Gtk.Widget child in flowbox.get_children ()) {
                 if (child.get_child_visible ()) {

=== modified file 'src/Widgets/CategoryIcon.vala'
--- src/Widgets/CategoryIcon.vala	2016-05-12 18:08:35 +0000
+++ src/Widgets/CategoryIcon.vala	2016-11-15 00:05:14 +0000
@@ -22,7 +22,7 @@
 
     public class CategoryIcon : Gtk.FlowBoxChild {
 
-        public Switchboard.Plug plug;
+        public unowned Switchboard.Plug plug;
 
         public CategoryIcon (Switchboard.Plug plug_item) {
             plug = plug_item;