Merge lp:~voluntatefaber/switchboard/open-plug-fron-CLI into lp:~elementary-pantheon/switchboard/switchboard

[Andrea Basso]

[Mario Guerriero (mefrio-g)]

Hi Andrea,

I tried to run
"switchboard online-accounts"
"switchboard sound"
"switchboard wallpaper"

but your function didn't work

[Andrea Basso (voluntatefaber)]

It is supposed to work with -o command: you should use:
switchboard -o "Online Accounts"
Il giorno 27/mar/2012 16.20, "Mario Guerriero" <email address hidden> ha
scritto:
>
> Hi Andrea,
>
> I tried to run
> "switchboard online-accounts"
> "switchboard sound"
> "switchboard wallpaper"
>
> but your function didn't work
> --
>
https://code.launchpad.net/~voluntatefaber/switchboard/open-plug-fron-CLI/+merge/99430
> You are the owner of lp:~voluntatefaber/switchboard/open-plug-fron-CLI.

[Mario Guerriero (mefrio-g)]

Oh it is a good soluction. More intuitive of the gnome-control-center's one! So, since Cody Garver asked me to check this branch, I approve it

[xapantu (xapantu)]

How is handled the translation? I think that the keyfiles are automatically translated. If it is the case, this fix won't work. On my computer, I would have to do switchboard -o "Comptes en ligne". Maybe it is more intuitive, but it won't work ;)

review: Needs Information

[xapantu (xapantu)]

Ah, it is apparently alreay merged. Could you fix it? (I'm speaking to everyone, I won't have the time myself, so, Mario, Cody, Andrea, anyone...) There are two solutions: investigate wether we can get a non translted strings, use the id (e.g; online-acounts), or remove it if there is really no solution, I fear it will create some nasty bugs if we start using them without handling translation ^^".

[Avi Romanoff (aroman)]

This has been fixed as of rev 225. Switchboard now uses the .plug file's group header for unique id'ing and launching.

So this branch/discussion is now resolved/superceded.

Thanks for the hard work and input everyone!

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-01-30 16:20:38 +0000
+++ Switchboard/switchboard-app.vala	2012-03-27 10:56:19 +0000
@@ -17,6 +17,8 @@
 
 namespace Switchboard {
 
+    static string plug_to_open;
+
     [DBus (name = "org.elementary.switchboard")]
     public class SwitchboardApp : Granite.Application {
         
@@ -59,9 +61,10 @@
         // Plug data
         bool socket_shown;
         Gee.HashMap<string, string> current_plug = new Gee.HashMap<string, string>();
+        Gee.HashMap<string, string>[] plugs;
 
         string[] plug_places = {"/usr/share/plugs/", "/usr/lib/plugs/", "/usr/local/share/plugs/", "/usr/local/lib/plugs/"};
-        string search_box_buffer = "";
+        string search_box_buffer = "";    
 
         public SwitchboardApp () {
             
@@ -108,6 +111,17 @@
                 enumerate_plugs (place);
 
             main_window.show ();
+            
+            bool found = false;
+            if (plug_to_open != null) {
+                foreach (var plug in plugs)
+                    if (plug["title"] == plug_to_open) {
+                        load_plug (plug["title"], plug["exec"]);
+                        found = true;
+                    }
+                if (!found)
+                    critical ("Couldn't find %s between the loaded plugs.", plug_to_open);
+            }
         }
 
         void shutdown() {
@@ -120,7 +134,7 @@
             Gtk.main_quit();
         }
 
-        void load_plug (string title, string executable) {
+        public void load_plug (string title, string executable) {
             debug("Selected plug: title %s | executable %s", title, executable);
             debug("Current plug: %s", current_plug["title"]);
             // Launch plug's executable
@@ -234,6 +248,7 @@
                     plug["category"] = "other";
                 }
                 category_view.add_plug (plug);
+                plugs += plug;
             }
         }
 
@@ -395,9 +410,23 @@
             toolbar.show_all();
         }
     }
+    
+    static const OptionEntry[] entries = {
+            { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, "Open a plug", "PLUG_NAME" },
+            { null }
+    };
 
     // Handles a successful connection to D-Bus and launches the app
-    void on_bus_aquired (DBusConnection conn) {
+    void on_bus_aquired (DBusConnection conn, string[] args) {
+    
+        var context = new OptionContext("");
+        context.add_main_entries(entries, "switchboard ");
+        context.add_group(Gtk.get_option_group(true));
+        try {
+            context.parse(ref args);
+        } catch(Error e) {
+            print(e.message + "\n");
+        }
 
         // In the future, the plug_root_dir should be overridable by CLI flags.
         SwitchboardApp switchboard_app = new SwitchboardApp ();
@@ -406,6 +435,8 @@
             conn.register_object("/org/elementary/switchboard", switchboard_app);
         } catch (IOError e) {
         }
+        
+        switchboard_app.run (args);
     }
 
     static int main (string[] args) {
@@ -420,7 +451,7 @@
         Gtk.init (ref args);
         Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
                 BusNameOwnerFlags.NONE,
-                on_bus_aquired,
+                (conn) => {on_bus_aquired (conn, args);},
                 () => {},
                 () => {logger.notification(_("Switchboard already running. Exiting..")); Process.exit(1);});