Merge lp:~voldyman/switchboard/handle-cmd-line into lp:~elementary-pantheon/switchboard/switchboard

[Akshay Shekher]

SwitchboardApp now handle command line even if launched

Fix bug 1172682.

Bug fixed by making Switchboad Application handle command line flags.

to test:

./switchboard -o system-pantheon-power
switchboard will open with Power plug

in a new tab in terminal
./switchboard -o personal-pantheon-default

the window that is already open will show the Defaults Plug.

[Corentin Noël (tintou)]

All is nice, you actually fixed an other bug (#1321064)
Only one thing, diff line 145 you did remove Gtk.main (); please revert this and your branch is ready to be merged.

[Corentin Noël (tintou)]

review: Needs Fixing

[Akshay Shekher (voldyman)]

AFAIK Gtk.main (); doesn't need to be manually called when using an Application class with Windows.

is it necessary?

[Corentin Noël (tintou)]

The program will indeed run without it but I haven't seen anywhere that it
wasn't needed.
In all cases, the GLib.main_quit (); complains about GLib.Main () not being
called.
Le 27 mai 2014 05:17, "Akshay Shekher" <email address hidden> a écrit :

> AFAIK Gtk.main (); doesn't need to be manually called when using an
> Application class with Windows.
>
> is it necessary?
> --
>
> https://code.launchpad.net/~voldyman/switchboard/handle-cmd-line/+merge/220920
> You are reviewing the proposed merge of
> lp:~voldyman/switchboard/handle-cmd-line into lp:switchboard.
>

[lp:~voldyman/switchboard/handle-cmd-line]

448. By Akshay Shekher on 2014-05-27

removed main_quit

[Akshay Shekher (voldyman)]

Removed the main_quit

[Corentin Noël (tintou)]

Please not. Do add the main.
Le 27 mai 2014 07:29, "Akshay Shekher" <email address hidden> a écrit :

> Removed the main_quit
> --
>
> https://code.launchpad.net/~voldyman/switchboard/handle-cmd-line/+merge/220920
> You are reviewing the proposed merge of
> lp:~voldyman/switchboard/handle-cmd-line into lp:switchboard.
>

[Akshay Shekher (voldyman)]

The branch doesn't work with Gtk.main ();

[Corentin Noël (tintou)]

Why wouldn't it, I've tested it westerday and could open different plugs
without any problem.
Le 27 mai 2014 07:42, "Akshay Shekher" <email address hidden> a écrit :

> The branch doesn't work with Gtk.main ();
>
> --
>
> https://code.launchpad.net/~voldyman/switchboard/handle-cmd-line/+merge/220920
> You are reviewing the proposed merge of
> lp:~voldyman/switchboard/handle-cmd-line into lp:switchboard.
>

[lp:~voldyman/switchboard/handle-cmd-line]

449. By Akshay Shekher on 2014-05-27

added Gtk.main

[Akshay Shekher (voldyman)]

sorry, my bad. tested the wrong branch.

[lp:~voldyman/switchboard/handle-cmd-line]

450. By Akshay Shekher on 2014-05-27

fixed tab

[Corentin Noël (tintou)]

Okay let's merge it, nice work!

review: Approve

=== modified file 'src/CategoryView.vala'
--- src/CategoryView.vala	2014-04-18 18:08:44 +0000
+++ src/CategoryView.vala	2014-05-27 05:49:00 +0000
@@ -43,7 +43,11 @@
         public Gtk.IconView network_iconview;
         public Gtk.IconView system_iconview;
 
-        public CategoryView () {
+        private string? plug_to_open = null;
+
+        public CategoryView (string? plug_to_open = null) {
+            this.plug_to_open = plug_to_open;
+
             setup_category (Switchboard.Plug.Category.PERSONAL, 0);
             setup_category (Switchboard.Plug.Category.HARDWARE, 1);
             setup_category (Switchboard.Plug.Category.NETWORK, 2);

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-04-18 18:08:44 +0000
+++ src/Switchboard.vala	2014-05-27 05:49:00 +0000
@@ -17,31 +17,15 @@
 
 namespace Switchboard {
 
-    static const OptionEntry[] entries = {
-            { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
-            { null }
-    };
 
     public enum WindowState {
         NORMAL = 0,
         MAXIMIZED = 1
     }
 
-    private static string? plug_to_open = null;
-    private static bool should_animate_next_transition = true;
-    
     public static int main (string[] args) {
         Gtk.init (ref 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) {
-            warning (e.message);
-        }
-
         var app = new SwitchboardApp ();
         return app.run (args);
     }
@@ -66,12 +50,21 @@
         private int default_width = 0;
         private int default_height = 0;
 
+		private static string? plug_to_open = null;
+        private static bool should_animate_next_transition = true;
+
+        static const OptionEntry[] entries = {
+            { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
+            { null }
+        };
+
         construct {
             application_id = "org.elementary.switchboard";
             program_name = _("System Settings");
             app_years = "2011-2014";
             exec_name = "switchboard";
             app_launcher = exec_name+".desktop";
+            flags |= ApplicationFlags.HANDLES_COMMAND_LINE;
 
             build_version = "2.0";
             app_icon = "preferences-desktop";
@@ -84,21 +77,26 @@
             about_license_type = Gtk.License.GPL_3_0;
         }
 
-        public override void activate () {
-            // If app is already running, present the current window.
-            if (get_windows () != null) {
-                get_windows ().data.present ();
-                if (plug_to_open != null) {
-                    var plugsmanager = Switchboard.PlugsManager.get_default ();
-                    foreach (var plug in plugsmanager.get_plugs ()) {
-                        if (plug_to_open.has_suffix (plug.code_name)) {
-                            load_plug (plug);
-                            plug_to_open = null;
-                            break;
-                        }
-                    }
-                }
-                return;
+        public override int command_line (ApplicationCommandLine command_line) {
+            hold ();
+            int res = _command_line (command_line);
+            release ();
+            return res;
+        }
+
+        private int _command_line (ApplicationCommandLine command_line) {
+            var context = new OptionContext ("");
+            context.add_main_entries (entries, "switchboard ");
+            context.add_group (Gtk.get_option_group (true));
+
+            string[] args = command_line.get_arguments ();
+
+            try {
+                unowned string[] tmp = args;
+                context.parse (ref tmp);
+            } catch (Error e) {
+                warning (e.message);
+                return 0;
             }
 
             if (DEBUG)
@@ -106,8 +104,22 @@
             else
                 Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.INFO;
 
-            // If plug_to_open was set from the command line
             if (plug_to_open != null) {
+                var plugsmanager = Switchboard.PlugsManager.get_default ();
+                foreach (var plug in plugsmanager.get_plugs ()) {
+                    if (plug_to_open.has_suffix (plug.code_name)) {
+                        load_plug (plug);
+                        plug_to_open = null;
+                        break;
+                    }
+                }
+                // If app is already running, present the current window.
+                if (get_windows () != null) {
+                    get_windows ().data.present ();
+                    return 1;
+                }
+
+                // If plug_to_open was set from the command line
                 should_animate_next_transition = false;
             }
 
@@ -117,6 +129,8 @@
             build ();
             category_view.load_default_plugs.begin ();
             Gtk.main ();
+
+            return 0;
         }
 
         public void hide_alert () {
@@ -180,6 +194,7 @@
 
         private void build () {
             main_window = new Gtk.Window();
+            add_window (main_window);
 
             // Set up defaults
             main_window.title = program_name;
@@ -216,7 +231,7 @@
                 return true;
             });
 
-            category_view = new Switchboard.CategoryView ();
+            category_view = new Switchboard.CategoryView (plug_to_open);
             category_view.plug_selected.connect ((plug) => load_plug (plug));
             category_view.margin_top = 12;