Merge lp:~donadigo/slingshot/show-app-badges-new into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

* Fixes bug #710498: "Support Launcher API in order to show badges".

This branch fixes bug #710498 "Support Launcher API in order to show badges".

The implementation is done entirely by using the new plank UnityClient and Surface API.

NOTE: In order to have app badges shown in the Slingshot, you must have plank version greater or equal to r1490 (compiled from trunk).

[Rico Tzschichholz (ricotz)]

Hmm, didn't you realize that this is public API of libplank?

[Adam Bieńkowski (donadigo)]

ricotz: Ahhh, sory, I didn't realize that I could use the UnityClient interface directly. Thanks for pointing out, it now uses only the libplank API. Branch updated.

[Rico Tzschichholz (ricotz)]

if application.count_visible is true you should not draw anything, so don't uselessly call draw_item_count().

[Ezekiel Michael Angel (nolenumar)]

Please stop sending me these emails
On Feb 22, 2016 6:13 PM, <email address hidden> wrote:

> The proposal to merge lp:~donadigo/slingshot/show-app-badges-new into
> lp:slingshot has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~donadigo/slingshot/show-app-badges-new/+merge/286386
> --
> You are subscribed to branch lp:slingshot.
>

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2015-12-22 17:07:27 +0000
+++ src/Backend/App.vala	2016-02-17 19:09:20 +0000
@@ -44,6 +44,12 @@
     public string generic_name { get; private set; default = ""; }
     public AppType app_type { get; private set; default = AppType.APP; }
 
+#if HAS_PLANK_0_11
+    public string? unity_sender_name = null;
+    public bool count_visible = false;
+    public int64 current_count = 0;
+#endif
+
     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; }
@@ -51,6 +57,10 @@
 
     public signal void launched (App app);
 
+#if HAS_PLANK_0_11
+    public signal void unity_update_info ();
+#endif
+
     // 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";
@@ -151,7 +161,7 @@
     }
 
     // Quicklist code from Plank
-    public void init_actions () throws KeyFileError  {
+    public void init_actions () throws KeyFileError {
         actions = new Gee.ArrayList<string> ();
         actions_map = new Gee.HashMap<string, string> ();
 
@@ -231,4 +241,30 @@
             }
         }
     }
+
+#if HAS_PLANK_0_11
+    public void perform_unity_update (string sender_name, VariantIter prop_iter) {
+        unity_sender_name = sender_name;
+
+        string prop_key;
+        Variant prop_value;
+        while (prop_iter.next ("{sv}", out prop_key, out prop_value)) {
+            if (prop_key == "count") {
+                current_count = prop_value.get_int64 ();
+            } else if (prop_key == "count-visible") {
+                count_visible = prop_value.get_boolean ();
+            }
+        }
+
+        unity_update_info ();
+    }
+
+    public void unity_reset () {
+        unity_sender_name = null;
+        count_visible = false;
+        current_count = 0;
+
+        unity_update_info ();
+    }
+#endif
 }

=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2015-11-27 17:32:57 +0000
+++ src/Slingshot.vala	2016-02-17 19:09:20 +0000
@@ -43,10 +43,16 @@
 
             view = new SlingshotView ();
 
+#if HAS_PLANK_0_11
+            unowned Plank.Unity client = Plank.Unity.get_default ();
+            client.add_client (view);
+#endif
+
             view.close_indicator.connect (on_close_indicator);
 
-            if (dbus_service == null)
+            if (dbus_service == null) {
                 dbus_service = new DBusService (view);
+            }
         }
 
         return view;

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2016-01-16 01:08:13 +0000
+++ src/SlingshotView.vala	2016-02-17 19:09:20 +0000
@@ -24,7 +24,11 @@
         SEARCH_VIEW
     }
 
+#if HAS_PLANK_0_11
+    public class SlingshotView : Gtk.Grid, Plank.UnityClient {
+#else
     public class SlingshotView : Gtk.Grid {
+#endif
         // Widgets
         public Gtk.SearchEntry search_entry;
         public Gtk.Stack stack;
@@ -224,7 +228,6 @@
         }
 
         private void connect_signals () {
-
             this.focus_in_event.connect (() => {
                 search_entry.grab_focus ();
                 return false;
@@ -283,6 +286,39 @@
             motion_notify_event.connect (hotcorner_trigger);
         }
 
+#if HAS_PLANK_0_11
+        public void update_launcher_entry (string sender_name, GLib.Variant parameters, bool is_retry = false) {
+            if (!is_retry) {
+                // Wait to let further update requests come in to catch the case where one application
+                // sends out multiple LauncherEntry-updates with different application-uris, e.g. Nautilus
+                Idle.add (() => {
+                    update_launcher_entry (sender_name, parameters, true);
+                    return false;
+                });
+                
+                return;
+            }
+
+            string app_uri;
+            VariantIter prop_iter;
+            parameters.get ("(sa{sv})", out app_uri, out prop_iter);
+
+            foreach (var app in app_system.get_apps_by_name ()) {
+                if (app_uri == "application://" + app.desktop_id) {
+                    app.perform_unity_update (sender_name, prop_iter);
+                }
+            }
+        }
+
+        public void remove_launcher_entry (string sender_name) {
+            foreach (var app in app_system.get_apps_by_name ()) {
+                if (app.unity_sender_name == sender_name) {
+                    app.unity_reset ();
+                }
+            }
+        }
+#endif
+
         private void gala_settings_changed () {
             if (Slingshot.settings.gala_settings.hotcorner_topleft == "open-launcher") {
                 can_trigger_hotcorner = true;

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-01-17 14:03:44 +0000
+++ src/Widgets/AppEntry.vala	2016-02-17 19:09:20 +0000
@@ -47,6 +47,7 @@
     }
 
     private new Gtk.Image image;
+    private Gtk.Image count_image;
     private bool dragging = false; //prevent launching
     private Backend.App application;
 
@@ -60,6 +61,9 @@
     }
 
 #if HAS_PLANK_0_11
+    private const int SURFACE_SIZE = 48;
+    private static Plank.DockTheme plank_theme = new Plank.DockTheme ("Gtk+");
+
     private static Plank.DBusClient plank_client;
 #else
     private static Plank.DBus.Client plank_client;
@@ -96,12 +100,22 @@
         image.pixel_size = 64;
         image.margin_top = 12;
 
+        count_image = new Gtk.Image ();
+        count_image.no_show_all = true;
+        count_image.visible = false;
+        count_image.margin_start = 18;
+        count_image.margin_bottom = 12;
+
+        var overlay = new Gtk.Overlay ();
+        overlay.add (image);
+        overlay.add_overlay (count_image);
+
         var grid = new Gtk.Grid ();
         grid.orientation = Gtk.Orientation.VERTICAL;
         grid.row_spacing = 6;
         grid.expand = true;
         grid.halign = Gtk.Align.CENTER;
-        grid.add (image);
+        grid.add (overlay);
         grid.add (app_label);
 
         add (grid);
@@ -133,6 +147,10 @@
             sel.set_uris ({File.new_for_path (desktop_path).get_uri ()});
         });
 
+#if HAS_PLANK_0_11
+        app.unity_update_info.connect (update_unity_icon);
+#endif
+
         app.notify["icon"].connect (() => {
             ((Gtk.Image) image).gicon = app.icon;
         });
@@ -153,6 +171,20 @@
         app_launched ();
     }
 
+#if HAS_PLANK_0_11
+    private void update_unity_icon () {
+        var visible = application.count_visible;
+        count_image.visible = visible;
+        if (!visible)
+            return;
+
+        var surface = new Plank.Surface (SURFACE_SIZE, SURFACE_SIZE);
+        plank_theme.draw_item_count (surface, SURFACE_SIZE, { 0.85, 0.23, 0.29, 0.89 }, application.current_count);
+
+        count_image.set_from_surface (surface.Internal);
+    }
+#endif     
+
     private void create_menu () {
         // Display the apps static quicklist items in a popover menu
         if (application.actions == null) {