Merge lp:~tombeckmann/switchboard/gcc-better-interop into lp:~elementary-pantheon/switchboard/switchboard

[Tom Beckmann]

This adds a get_toplevel() method and a embed_widget() widget signal to PlugsManager. Those two are required by GCC plugs and enabled via this MR https://code.launchpad.net/~tombeckmann/pantheon-plugs/gcc-get-toplevel-fix/+merge/225752

Designers, when a panel requests to put a widget in the header I just replace the searchbar, which is disabled anyway, and show it again once the plug is left. It would look like this then for the two plugs that require it:

http://imgur.com/kF5U6bQ,mfWJdp4#1

[Tom Beckmann (tombeckmann)]

I reworked the mentioned MR so that no more API changes are required, so this branch is unnecessary.

Unmerged revisions

459. By Tom Beckmann on 2014-07-06

allow embedding widgets in the header, add get_toplevel method to PlugsManager

=== modified file 'lib/PlugsManager.vala'
--- lib/PlugsManager.vala	2014-04-09 22:10:05 +0000
+++ lib/PlugsManager.vala	2014-07-06 15:55:31 +0000
@@ -23,12 +23,22 @@
 public class Switchboard.PlugsManager : GLib.Object {
     
     private static Switchboard.PlugsManager? plugs_manager = null;
+
+    public static void init (Gtk.Widget toplevel)
+    {
+        if (plugs_manager != null)
+            return;
+
+        plugs_manager = new PlugsManager (toplevel);
+    }
     
-    public static PlugsManager get_default () {
-        if (plugs_manager == null)
-            plugs_manager = new PlugsManager ();
+    public static PlugsManager get_default ()
+        requires (plugs_manager != null) {
+
         return plugs_manager;
     }
+
+    public Gtk.Widget toplevel { get; construct; }
     
     [CCode (has_target = false)]
     private delegate Switchboard.Plug RegisterPluginFunction (Module module);
@@ -36,8 +46,11 @@
     private Gee.LinkedList<Switchboard.Plug> plugs;
     
     public signal void plug_added (Switchboard.Plug plug);
+    public signal void embed_widget_requested (Gtk.Widget widget);
     
-    private PlugsManager () {
+    private PlugsManager (Gtk.Widget toplevel) {
+        Object (toplevel: toplevel);
+
         plugs = new Gee.LinkedList<Switchboard.Plug> ();
         var base_folder = File.new_for_path (Build.PLUGS_DIR);
         find_plugins (base_folder);
@@ -104,4 +117,4 @@
     public Gee.Collection<Switchboard.Plug> get_plugs () {
         return plugs.read_only_view;
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-05-27 05:48:46 +0000
+++ src/Switchboard.vala	2014-07-06 15:55:31 +0000
@@ -34,6 +34,7 @@
         private Gtk.Window main_window;
         private Gtk.Stack stack;
         private Gtk.HeaderBar headerbar;
+        private Gtk.Grid header_box;
 
         private Granite.Widgets.EmbeddedAlert alert_view;
         private Gtk.ScrolledWindow category_scrolled;
@@ -50,7 +51,7 @@
         private int default_width = 0;
         private int default_height = 0;
 
-		private static string? plug_to_open = null;
+        private static string? plug_to_open = null;
         private static bool should_animate_next_transition = true;
 
         static const OptionEntry[] entries = {
@@ -124,7 +125,6 @@
             }
 
             loaded_plugs = new Gee.LinkedList <string> ();
-            Switchboard.PlugsManager.get_default ();
             settings = new GLib.Settings ("org.pantheon.switchboard.saved-state");
             build ();
             category_view.load_default_plugs.begin ();
@@ -196,6 +196,8 @@
             main_window = new Gtk.Window();
             add_window (main_window);
 
+            Switchboard.PlugsManager.init (main_window);
+
             // Set up defaults
             main_window.title = program_name;
             main_window.icon_name = app_icon;
@@ -259,7 +261,10 @@
                 category_view.recalculate_columns ();
             });
 
-            if (Switchboard.PlugsManager.get_default ().has_plugs () == false) {
+            var plug_manager = Switchboard.PlugsManager.get_default ();
+            plug_manager.embed_widget_requested.connect (embed_widget);
+
+            if (plug_manager.has_plugs () == false) {
                 show_alert (_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
                 search_box.sensitive = false;
             } else {
@@ -269,6 +274,15 @@
             }
         }
 
+        private void embed_widget (Gtk.Widget widget)
+        {
+            if (stack.get_visible_child () == category_scrolled)
+                return;
+
+            header_box.remove (search_box);
+            header_box.add (widget);
+        }
+
         private void shut_down () {
             if (current_plug != null)
                 current_plug.hidden ();
@@ -345,11 +359,18 @@
             stack.set_visible_child (category_scrolled);
             current_plug.hidden ();
 
+            // if we were told to embed a widget to the header, we now need to reset it
+            if (search_box.get_parent () != header_box) {
+                header_box.remove (header_box.get_children ().data);
+                header_box.add (search_box);
+            }
+
             // Reset state
             reset_title ();
             search_box.set_text ("");
             search_box.sensitive = Switchboard.PlugsManager.get_default ().has_plugs ();
 
+
             return true;
         }
 
@@ -370,6 +391,9 @@
                 category_view.filter_plugs(search_box.get_text ());
             });
 
+            header_box = new Gtk.Grid ();
+            header_box.add (search_box);
+
             // Focus typing to the search bar
             main_window.key_press_event.connect ((event) => {
                 // Don't focus if it is a modifier or if search_box is already focused.
@@ -386,7 +410,7 @@
 
             // Add everything to the toolbar
             headerbar.pack_start (navigation_button);
-            headerbar.pack_end (search_box);
+            headerbar.pack_end (header_box);
         }
 
 #if HAVE_UNITY