Merge lp:~fabianthoma/wingpanel/wingpanel-improvements into lp:~elementary-pantheon/wingpanel/old-trunk

[Fabian Thoma]

Moved the Application Launcher Logic to the AppsButton, as well as improved the Launching code

[lp:~fabianthoma/wingpanel/wingpanel-improvements]

89. By Fabian Thoma on 2012-07-12

Spelling fix, man I gotta learn how to spell program right ;)

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Widgets/AppsButton.vala'
--- src/Widgets/AppsButton.vala	2012-02-12 16:51:10 +0000
+++ src/Widgets/AppsButton.vala	2012-07-12 13:35:22 +0000
@@ -42,6 +42,58 @@
             get_style_context ().add_class ("composited-indicator");
             app_label.get_style_context ().add_class ("wingpanel-app-button");
 
+            this.button_press_event.connect (launch_launcher);
+
+            Wingpanel.app.settings.changed.connect(on_settings_update);
+
+            this.show.connect(on_settings_update);
+        }
+
+        private void on_settings_update () {
+            if (this.visible && !(Wingpanel.app.settings.show_launcher)) {
+                this.hide();
+            }
+            if (!(this.visible) && Wingpanel.app.settings.show_launcher) {
+                this.show();
+            }
+        }
+
+        private bool launch_launcher (Gtk.Widget widget, Gdk.EventButton event) {
+
+            debug ("Starting launcher!");
+
+            var flags = GLib.SpawnFlags.SEARCH_PATH |
+                    GLib.SpawnFlags.DO_NOT_REAP_CHILD |
+                    GLib.SpawnFlags.STDOUT_TO_DEV_NULL;
+
+            GLib.Pid process_id;
+            
+            // Parse Arguments
+            string[] argvp = null;
+            try {
+                GLib.Shell.parse_argv (Wingpanel.app.settings.default_launcher, out argvp);
+            }
+            catch (GLib.ShellError error) {
+                warning ("Not passing any args to %s : %s", Wingpanel.app.settings.default_launcher, error.message);
+                argvp = {Wingpanel.app.settings.default_launcher, null}; // fix value in case it's corrupted
+            }
+            // Check if the program is actually there
+            string? launcher = Environment.find_program_in_path (argvp[0]);
+            if (launcher != null) {
+                // Spawn process asynchronously
+                try {
+                    GLib.Process.spawn_async (null, argvp, null, flags, null, out process_id);
+                }
+                catch (GLib.Error err) {
+                    warning (err.message);
+                    return false;
+                }
+            } else {
+                Granite.Services.System.open_uri ("file:///usr/share/applications");
+            }
+
+            return true;
+        
         }
 
     }
 
=== modified file 'src/Widgets/Panel.vala'
--- src/Widgets/Panel.vala	2012-07-10 23:28:04 +0000
+++ src/Widgets/Panel.vala	2012-07-12 13:35:22 +0000
@@ -230,13 +230,9 @@
 
         private void add_defaults () {
 
-            // Only show Apps button if enabled in the settings
-            if(this.app.settings.show_launcher) {
-                var apps = new Widgets.AppsButton ();
-                apps.button_press_event.connect (launch_launcher);
-
-                left_wrapper.pack_start (apps, false, true, 0);
-            }
+            // Add Apps button
+            var apps = new Widgets.AppsButton ();
+            left_wrapper.pack_start (apps, false, true, 0);
             container.pack_start (left_wrapper);
 
             clock = new Gtk.MenuBar ();
@@ -263,20 +259,6 @@
 
         }
 
-        private bool launch_launcher (Gtk.Widget widget, Gdk.EventButton event) {
-
-            debug ("Starting launcher!");
-        
-            string? launcher = Environment.find_program_in_path (app.settings.default_launcher);
-            if (launcher != null)
-                System.execute_command (launcher);
-            else
-                System.open_uri ("file:///usr/share/applications");
-
-            return true;
-        
-        }
-
         protected override bool draw (Context cr) {
 
             Allocation size;