Merge branch 'lenemter/cleanup-delegate-actor' of https://github.com/elementary/gala into lenemter/cleanup-delegate-actor

Author: lenemter

data/gala.gschema.xml

@@ -62,7 +62,7 @@
       </description>
     </key>
     <key type="s" name="panel-main-menu-action">
-      <default>''</default>
+      <default>'io.elementary.wingpanel --toggle-indicator=app-launcher'</default>
       <summary>Panel main menu action</summary>
       <description>Sets the command to run when the panel-main-menu keybinding is pressed.</description>
     </key>
@@ -72,10 +72,15 @@
       <description></description>
     </key>
     <key type="s" name="overlay-action">
-      <default>''</default>
+      <default>'io.elementary.wingpanel --toggle-indicator=app-launcher'</default>
       <summary></summary>
       <description></description>
     </key>
+    <key type="s" name="interactive-screenshot-action">
+      <default>'flatpak run io.elementary.screenshot'</default>
+      <summary>Interactive screenshot action</summary>
+      <description>Sets the command to run when the interactive-screenshot keybinding is pressed.</description>
+    </key>
     <key type="b" name="move-maximized-workspace">
       <default>false</default>
       <summary>Automatically move maximized windows to a new workspace</summary>
@@ -144,6 +149,10 @@
       <default><![CDATA[['Print']]]></default>
       <summary>Take a screenshot</summary>
     </key>
+    <key name="interactive-screenshot" type="as">
+      <default><![CDATA[['<Super>Print']]]></default>
+      <summary>Launch the interactive screenshot tool</summary>
+    </key>
     <key name="window-screenshot" type="as">
       <default><![CDATA[['<Alt>Print']]]></default>
       <summary>Take a screenshot of a window</summary>

src/WindowManager.vala

@@ -255,6 +255,7 @@ namespace Gala {
             display.add_keybinding ("switch-input-source-backward", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_switch_input_source);
 
             display.add_keybinding ("screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
+            display.add_keybinding ("interactive-screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
             display.add_keybinding ("window-screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
             display.add_keybinding ("area-screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
             display.add_keybinding ("screenshot-clip", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
@@ -410,10 +411,12 @@ namespace Gala {
         private void launch_action (string action_key) {
             try {
                 var action = behavior_settings.get_string (action_key);
-                if (action != null && action != "") {
+                if (action != null) {
                     Process.spawn_command_line_async (action);
                 }
-            } catch (Error e) { warning (e.message); }
+            } catch (Error e) {
+                warning (e.message);
+            }
         }
 
         private void on_monitors_changed () {
@@ -516,6 +519,9 @@ namespace Gala {
                 case "screenshot":
                     screenshot_screen.begin ();
                     break;
+                case "interactive-screenshot":
+                    launch_action ("interactive-screenshot-action");
+                    break;
                 case "area-screenshot":
                     screenshot_area.begin ();
                     break;
@@ -1045,13 +1051,7 @@ namespace Gala {
                         current.@delete (Gtk.get_current_event_time ());
                     break;
                 case ActionType.OPEN_LAUNCHER:
-                    try {
-                        Process.spawn_command_line_async (
-                            behavior_settings.get_string ("panel-main-menu-action")
-                        );
-                    } catch (Error e) {
-                        warning (e.message);
-                    }
+                    launch_action ("panel-main-menu-action");
                     break;
                 case ActionType.WINDOW_OVERVIEW:
                     if (window_overview == null) {