Merge lp:~meese/slingshot/fix-1294917 into lp:~elementary-pantheon/slingshot/trunk

[meese]

adds a popover context menu used for showing quicklist items on right click (lp:1294917)

Adds a popover menu widget that avoids the focus issues of using a normal context menu. Used to show launcher quicklist items on right clicking an app.

[Cody Garver (codygarver)]

Has merge conflicts

[lp:~meese/slingshot/fix-1294917]

454. By meese on 2014-10-11

merge

[meese (meese)]

fixed

[Danielle Foré (danrabbit)]

Works completely as intended for me. Style issues were mine and have been fixed in trunk.

review: Approve (ux)

[Cody Garver (codygarver)]

All good aside from the background under the popover

review: Approve

[lp:~meese/slingshot/fix-1294917]

455. By meese on 2014-10-16

remove shadow from popover menu css

[Djax (parnold-x)]

@meese
to fix the 1px shrink of the popover on hover over the longest entry you could solve it like this:

add @ PopOverMenu.vala:75
 button.enter_notify_event.connect ((evt) => {
            // fix width because there is a issue with resizing on hover
            button.width_request = button.get_allocated_width ();
            return false;
        });

[Danielle Foré (danrabbit)]

Djax, that shouldn't happen anymore. There was a theme bug that was causing it.

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved

[lp:~meese/slingshot/fix-1294917]

456. By meese on 2014-10-17

merge from trunk

[meese (meese)]

done

[Rico Tzschichholz (ricotz)]

@messe: while copy&paste from plank, it would have been nice to mention this!
(Sharing code by linking against libplank is also an option if this is reasonable.)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-14 17:02:40 +0000
+++ CMakeLists.txt	2014-10-17 01:18:18 +0000
@@ -83,6 +83,7 @@
     src/Widgets/SearchItem.vala
     src/Widgets/Sidebar.vala
     src/Widgets/CategoryView.vala
+    src/Widgets/PopoverMenu.vala
 PACKAGES
     ${CORE_DEPS}
     ${UI_DEPS}
 
=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2014-10-15 22:16:39 +0000
+++ src/Backend/App.vala	2014-10-17 01:18:18 +0000
@@ -47,7 +47,10 @@
 
     public Synapse.Match? match { get; private set; default = null; }
     public Synapse.Match? target { get; private set; default = null; }
-
+    public Gee.ArrayList<string> actions { get; private set; default = null; }
+    public Gee.HashMap<string, string> actions_map { get; private set; default = null; }
+    public Gdk.Pixbuf? quicklist_icon { get; private set; default = null; }
+    
     public signal void icon_changed ();
     public signal void launched (App app);
 
@@ -57,6 +60,18 @@
 
     private LoadableIcon loadable_icon = null;
 
+    // for FDO Desktop Actions
+    // see http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#extra-actions
+    private const string DESKTOP_ACTION_KEY = "Actions";
+    private const string DESKTOP_ACTION_GROUP_NAME = "Desktop Action %s";
+    // for the Unity static quicklists
+    // see https://wiki.edubuntu.org/Unity/LauncherAPI#Static_Quicklist_entries
+    private const string UNITY_QUICKLISTS_KEY = "X-Ayatana-Desktop-Shortcuts";
+    private const string UNITY_QUICKLISTS_SHORTCUT_GROUP_NAME = "%s Shortcut Group";
+    private const string UNITY_QUICKLISTS_TARGET_KEY = "TargetEnvironment";
+    private const string UNITY_QUICKLISTS_TARGET_VALUE = "Unity";
+    private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
+
     public App (GMenu.TreeEntry entry) {
         app_type = AppType.APP;
 
@@ -280,4 +295,85 @@
         return true;
     }
 
+    public void init_actions () throws KeyFileError  {
+        actions = new Gee.ArrayList<string> ();
+        actions_map = new Gee.HashMap<string, string> ();
+        quicklist_icon = load_icon (16);
+
+        // get FDO Desktop Actions
+        // see http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#extra-actions
+        // get the Unity static quicklists
+        // see https://wiki.edubuntu.org/Unity/LauncherAPI#Static Quicklist entries
+        KeyFile file;
+        try {
+            file = new KeyFile ();
+            file.load_from_file (desktop_path, 0);
+        } catch (Error e) {
+            critical ("%s: %s", desktop_path, e.message);
+        }
+
+        string? textdomain = null;
+        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS)
+            if (file.has_key (KeyFileDesktop.GROUP, domain_key)) {
+                textdomain = file.get_string (KeyFileDesktop.GROUP, domain_key);
+                break;
+            }
+        if (actions != null && actions_map != null) {
+            actions.clear ();
+            actions_map.clear ();
+            string[] keys = {DESKTOP_ACTION_KEY, UNITY_QUICKLISTS_KEY};
+
+            foreach (var key in keys) {
+                if (!file.has_key (KeyFileDesktop.GROUP, key))
+                    continue;
+
+                foreach (var action in file.get_string_list (KeyFileDesktop.GROUP, key)) {
+                    var group = DESKTOP_ACTION_GROUP_NAME.printf (action);
+                    if (!file.has_group (group)) {
+                        group = UNITY_QUICKLISTS_SHORTCUT_GROUP_NAME.printf (action);
+                        if (!file.has_group (group))
+                            continue;
+                    }
+
+                    // check for TargetEnvironment
+                    if (file.has_key (group, UNITY_QUICKLISTS_TARGET_KEY)) {
+                        var target = file.get_string (group, UNITY_QUICKLISTS_TARGET_KEY);
+                        if (target != UNITY_QUICKLISTS_TARGET_VALUE)
+                            continue;
+                    }
+
+                    // check for OnlyShowIn
+                    if (file.has_key (group, KeyFileDesktop.KEY_ONLY_SHOW_IN)) {
+                        var found = false;
+
+                        foreach (var s in file.get_string_list (group, KeyFileDesktop.KEY_ONLY_SHOW_IN))
+                            if (s == UNITY_QUICKLISTS_TARGET_VALUE) {
+                                found = true;
+                                break;
+                            }
+
+                        if (!found)
+                            continue;
+                    }
+
+                    var action_name = file.get_locale_string (group, KeyFileDesktop.KEY_NAME);
+
+                    var action_icon = "";
+                    if (file.has_key (group, KeyFileDesktop.KEY_ICON))
+                        action_icon = file.get_locale_string (group, KeyFileDesktop.KEY_ICON);
+
+                    var action_exec = "";
+                    if (file.has_key (group, KeyFileDesktop.KEY_EXEC))
+                        action_exec = file.get_string (group, KeyFileDesktop.KEY_EXEC);
+
+                    // apply given gettext-domain if available
+                    if (textdomain != null)
+                        action_name = GLib.dgettext (textdomain, action_name).dup ();
+
+                    actions.add (action_name);
+                    actions_map.set (action_name, "%s;;%s".printf (action_exec, action_icon));
+                }
+            }
+        }
+    }
 }
 \ No newline at end of file
 
=== modified file 'src/SlingshotView.vala' (properties changed: +x to -x)
--- src/SlingshotView.vala	2014-10-15 21:57:37 +0000
+++ src/SlingshotView.vala	2014-10-17 01:18:18 +0000
@@ -31,6 +31,8 @@
         public Gtk.Stack stack;
         public Granite.Widgets.ModeButton view_selector;
         private Gtk.Revealer view_selector_revealer;
+        // Single popover to use for all of app as context menu
+        private Widgets.NofocusPopover context_popover;
 
         // Views
         private Widgets.Grid grid_view;
@@ -97,8 +99,9 @@
 
             height_request = calculate_grid_height () + Pixels.BOTTOM_SPACE;
             setup_ui ();
+            context_popover = new Widgets.NofocusPopover (this, event_box);
+
             connect_signals ();
-
             debug ("Apps loaded");
         }
 
@@ -311,6 +314,7 @@
 
                 categories = app_system.get_categories ();
                 apps = app_system.get_apps ();
+
                 populate_grid_view ();
                 category_view.setup_sidebar ();
             });
@@ -336,6 +340,19 @@
             motion_notify_event.connect (hotcorner_trigger);
         }
 
+        public void show_popover_menu (Gtk.Widget menu, Gtk.Widget relative) {
+            context_popover = new Widgets.NofocusPopover (this, event_box);
+            context_popover.set_relative_to (relative);
+            context_popover.add (menu);
+            context_popover.show_all ();
+
+            var entry = relative as Widgets.AppEntry;
+            if (entry != null)
+                entry.app_launched.connect (() => {context_popover.hide ();});
+                
+            relative.grab_focus ();
+        }
+
         private void gala_settings_changed () {
             if (Slingshot.settings.gala_settings.hotcorner_topleft == "open-launcher") {
                 can_trigger_hotcorner = true;
@@ -650,7 +667,7 @@
         }
 
         public override bool scroll_event (Gdk.EventScroll event) {
-
+            context_popover.hide ();
             switch (event.direction.to_string ()) {
                 case "GDK_SCROLL_UP":
                 case "GDK_SCROLL_LEFT":
@@ -674,7 +691,7 @@
         }
 
         public void show_slingshot () {
-
+            context_popover.hide ();
             search_entry.text = "";
 
             reposition ();
@@ -768,7 +785,7 @@
 
             foreach (Backend.App app in app_system.get_apps_by_name ()) {
 
-                var app_entry = new Widgets.AppEntry (app);
+                var app_entry = new Widgets.AppEntry (app, this);
                 app_entry.app_launched.connect (() => hide ());
                 grid_view.append (app_entry);
                 app_entry.show_all ();
 
=== modified file 'src/Widgets/AppEntry.vala' (properties changed: +x to -x)
--- src/Widgets/AppEntry.vala	2014-10-15 21:57:37 +0000
+++ src/Widgets/AppEntry.vala	2014-10-17 01:18:18 +0000
@@ -32,8 +32,10 @@
     private bool dragging = false; //prevent launching
 
     private Backend.App application;
+    private unowned SlingshotView view;
 
-    public AppEntry (Backend.App app) {
+    public AppEntry (Backend.App app, SlingshotView view) {
+        this.view = view;
         Gtk.TargetEntry dnd = {"text/uri-list", 0, 0};
         Gtk.drag_source_set (this, Gdk.ModifierType.BUTTON1_MASK, {dnd},
             Gdk.DragAction.COPY);
@@ -75,7 +77,13 @@
 
         this.clicked.connect (launch_app);
 
-        this.button_press_event.connect ((e) => {return e.button == 3;});
+        this.button_release_event.connect ((e) => {
+            if (e.button == Gdk.BUTTON_SECONDARY) {
+                show_menu ();
+                return true;
+            }
+            return false;
+        });
 
         this.drag_begin.connect ( (ctx) => {
             this.dragging = true;
@@ -111,4 +119,34 @@
         application.launch ();
         app_launched ();
     }
+
+    private void show_menu () {
+        // Display the apps static quicklist items in a popover menu
+        if (application.actions == null) {
+            try {
+                application.init_actions ();
+            } catch (KeyFileError e) {
+                critical ("%s: %s", desktop_path, e.message);
+            }
+        }
+
+        var menu = new PopoverMenu ();
+        foreach (var action in application.actions) {
+            var values = application.actions_map.get (action).split (";;");
+            var menuitem = new Widgets.PopoverMenuItem (action, application.quicklist_icon);
+            menu.add_menu_item (menuitem);
+            menuitem.activated.connect (() => {
+                try {
+                    AppInfo.create_from_commandline (values[0], null, AppInfoCreateFlags.NONE).launch (null, null);
+                    app_launched ();
+                } catch (Error e) {
+                    critical ("%s: %s", desktop_path, e.message);
+                }
+            });
+        }
+
+        if (menu.get_size () > 0)
+            view.show_popover_menu (menu, this);
+    }
+
 }
 \ No newline at end of file
 
=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2014-10-15 21:44:44 +0000
+++ src/Widgets/CategoryView.vala	2014-10-17 01:18:18 +0000
@@ -96,8 +96,7 @@
     }
 
     private void add_app (Backend.App app) {
-
-        var app_entry = new AppEntry (app);
+        var app_entry = new AppEntry (app, view);
         app_entry.app_launched.connect (() => view.hide ());
         app_view.append (app_entry);
         app_view.show_all ();
 
=== added file 'src/Widgets/PopoverMenu.vala'
--- src/Widgets/PopoverMenu.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/PopoverMenu.vala	2014-10-17 01:18:18 +0000
@@ -0,0 +1,169 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//
+//  Copyright (C) 2011-2012 Giulio Collura
+//  Copyright (C) 2014 Maddie May <[e-mail]>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+// A menu to be used inside of popovers for when a normal context
+// menu can't be used
+namespace Slingshot.Widgets {
+
+public class PopoverMenu : Gtk.Grid {
+    private int line_count = 0;
+    private Gee.ArrayList<PopoverMenuItem> items = new Gee.ArrayList<PopoverMenuItem> ();
+
+    public PopoverMenu () {
+        row_homogeneous = true;
+        column_homogeneous = true;
+    }
+
+    public void add_menu_item (PopoverMenuItem item) {
+        line_count++;
+        this.items.add (item);
+        this.attach (item.child, 0, line_count, 1 , 1);
+    }
+
+    public int get_size () {
+        return items.size;
+    }
+}
+
+public class PopoverMenuItem : Object {
+    public Gtk.Widget child = null;
+    public signal void activated ();
+
+    public PopoverMenuItem (string label, Gdk.Pixbuf? icon) {
+        var button = new Gtk.Button ();
+        button.get_style_context ().add_class (Gtk.STYLE_CLASS_MENUITEM);
+
+        var grid = new Gtk.Grid ();
+        if (icon != null) {
+            var image = new Gtk.Image.from_pixbuf (icon);
+            image.margin_left = 2;
+            image.margin_right = 2;
+            image.halign = Gtk.Align.START;
+            grid.attach (image, 0, 0, 1, 1);
+        } else {
+            var space_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+            space_box.set_size_request (16, 16);
+            grid.attach (space_box, 0, 0, 1, 1);
+        }
+
+        var label_widget = new Gtk.Label.with_mnemonic (label);
+        label_widget.margin_right = 16;
+        label_widget.justify = Gtk.Justification.LEFT;
+        label_widget.set_alignment (0, 0);
+        grid.attach (label_widget, 1, 0, 1, 1);
+
+        button.add (grid);
+        button.relief = Gtk.ReliefStyle.NONE;
+        button.clicked.connect (on_activate);
+        child = button;
+    }
+
+    private void on_activate () {
+        activated ();
+    }
+}
+
+// A popover that doesn't grab focus
+public class NofocusPopover : Gtk.Popover {
+    private Gtk.Container parent_container;
+    private unowned SlingshotView view;
+
+    private const string POPOVER_STYLESHEET = """
+        .popover,
+        .popover.osd,
+        GtkPopover {
+            border-radius: 0px;
+            margin: 0px;
+            text-shadow: none;
+        }
+    """;
+
+    public NofocusPopover (SlingshotView view, Gtk.Container parent) {
+        this.view = view;
+        this.parent_container = parent;
+        connect_popover_signals (parent);
+        modal = false;
+        parent.button_release_event.connect (hide_popover_menu);
+        parent.button_press_event.connect (hide_popover_menu);
+        get_style_context ().add_class (Gtk.STYLE_CLASS_MENU);
+        Granite.Widgets.Utils.set_theming_for_screen (get_screen (), POPOVER_STYLESHEET,
+                                      Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+    public void connect_popover_signals (Gtk.Container parent) {
+        foreach (Gtk.Widget child in parent.get_children ()) {
+            if (child is Gtk.Container) {
+                Gtk.Container container = child as Gtk.Container;
+                connect_popover_signals (container);
+            }
+
+            if (child is Widgets.Switcher) {
+                var switcher = child as Widgets.Switcher;
+                switcher.on_stack_changed.connect (switched);
+            }
+
+            child.button_release_event.connect (hide_popover_menu);
+            child.button_press_event.connect (hide_popover_menu);
+        }
+    }
+
+    private void disconnect_popover_signals (Gtk.Container parent) {
+        foreach (Gtk.Widget child in parent.get_children ()) {
+            if (child is Gtk.Container) {
+                Gtk.Container container = child as Gtk.Container;
+                disconnect_popover_signals (container);
+            }
+
+            if (child is Widgets.Switcher) {
+                var switcher = child as Widgets.Switcher;
+                switcher.on_stack_changed.disconnect (switched);
+            }
+            
+            child.button_release_event.disconnect (hide_popover_menu);
+            child.button_press_event.disconnect (hide_popover_menu);
+        }
+    }
+
+    public void switched () {
+        this.hide ();
+    }
+
+    public bool hide_popover_menu (Gdk.EventButton event) {
+        if (this.visible) {
+            view.set_focus (null);
+            view.search_entry.grab_focus ();
+
+            this.hide ();
+            // Block here to replicate context menu behavior
+            return true;
+        }
+        // Visible can be false but the popover still thinks it's up
+        // and will show when it's view is switched back to
+        // in that case don't block forwarding but make sure it is
+        // really hidden
+        this.hide ();
+        return false;
+    }
+
+    ~NofocusPopover () {
+        disconnect_popover_signals (parent_container);
+    }
+}
+
+} // End namespace
 \ No newline at end of file
 
=== modified file 'src/Widgets/Switcher.vala'
--- src/Widgets/Switcher.vala	2014-05-26 06:26:17 +0000
+++ src/Widgets/Switcher.vala	2014-10-17 01:18:18 +0000
@@ -27,7 +27,8 @@
 
     private Gtk.Stack stack;
     private Gee.HashMap<Gtk.Widget, Gtk.ToggleButton> buttons;
-
+    public signal void on_stack_changed ();
+    
     public Switcher () {
         orientation = Gtk.Orientation.HORIZONTAL;
         spacing = 2;
@@ -86,6 +87,7 @@
 
     private void on_button_clicked (Gtk.Widget widget) {
         stack.set_visible_child (widget);
+        on_stack_changed ();
     }
 
     private void populate_switcher () {