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

[Adam Bieńkowski]

* Fixes bug #710498.

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

Although the implementation itself isn't based on Unity Launcher API (vapi), it uses DBus to know when and what app has changed it's info from "com.canonical.Unity.LauncherEntry" interface. This data is now included and used in Backend.App. For drawing this uses a Plank vapi in order to draw the same surface as the plank do.

[lp:~donadigo/slingshot/show-app-badges]

598. By Adam Bieńkowski on 2015-11-10

Use set_from_surface; margin_left to 12; use doubles for color

[Rico Tzschichholz (ricotz)]

you might want to overthink implementing it that way
e.g. https://bugs.launchpad.net/plank/+bug/1514201 a DDoS-like scenario

you need to update only once when you open slingshot or switch an app page, so you don't need to listen all the time

maybe even plank could provide those values via dbusclient

[Cody Garver (codygarver)]

Conflicts with trunk

review: Needs Fixing

[Adam Bieńkowski (donadigo)]

New updated & rebased branch:
https://code.launchpad.net/~donadigo/slingshot/show-app-badges-new/+merge/285949

review: Disapprove

Unmerged revisions

598. By Adam Bieńkowski on 2015-11-10

Use set_from_surface; margin_left to 12; use doubles for color

597. By Adam Bieńkowski on 2015-11-10

Private not public

596. By Adam Bieńkowski on 2015-11-10

Show app badges

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2014-10-18 01:57:49 +0000
+++ src/Backend/App.vala	2015-11-10 20:05:31 +0000
@@ -45,6 +45,9 @@
     public string generic_name { get; private set; default = ""; }
     public AppType app_type { get; private set; default = AppType.APP; }
 
+    public bool count_visible = false;
+    public int64 current_count = 0;
+
     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; }
@@ -375,4 +378,19 @@
             }
         }
     }
+
+    public void update_unity_info (string sender_name, VariantIter prop_iter) {
+        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 ();
+            }
+        }
+
+        icon_changed ();
+    }
 }
\ No newline at end of file

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2015-02-01 15:13:15 +0000
+++ src/SlingshotView.vala	2015-11-10 20:05:31 +0000
@@ -48,6 +48,7 @@
         public Backend.AppSystem app_system;
         private Gee.ArrayList<GMenu.TreeDirectory> categories;
         public Gee.HashMap<string, Gee.ArrayList<Backend.App>> apps;
+        private DBusConnection connection;
 
         private Modality modality;
         private bool can_trigger_hotcorner = true;
@@ -98,6 +99,12 @@
             categories = app_system.get_categories ();
             apps = app_system.get_apps ();
 
+            try {
+                connection = Bus.get_sync (BusType.SESSION);
+            } catch (IOError e) {
+                warning ("%s\n", e.message);
+            }
+
             primary_monitor = screen.get_primary_monitor ();
             Gdk.Rectangle geometry;
             screen.get_monitor_geometry (primary_monitor, out geometry);
@@ -300,7 +307,6 @@
         }
 
         private void connect_signals () {
-
             this.focus_in_event.connect (() => {
                 search_entry.grab_focus ();
                 return false;
@@ -373,6 +379,31 @@
 
             // hotcorner management
             motion_notify_event.connect (hotcorner_trigger);
+
+            connection.signal_subscribe (null, "com.canonical.Unity.LauncherEntry",
+                        null, null, null, DBusSignalFlags.NONE, handle_entry_signal);
+        }
+
+        private void handle_entry_signal (DBusConnection connection, string sender_name, string object_path,
+                                string interface_name, string signal_name, Variant parameters) {
+
+            if (parameters == null
+                || !parameters.is_of_type (new VariantType ("(sa{sv})"))
+                || signal_name == null
+                || sender_name == null
+                || signal_name != "Update") {
+                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.update_unity_info (sender_name, prop_iter);
+                }                
+            }
         }
 
         private void gala_settings_changed () {

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2015-11-03 15:36:28 +0000
+++ src/Widgets/AppEntry.vala	2015-11-10 20:05:31 +0000
@@ -22,6 +22,7 @@
     public Gtk.Label app_label;
     private Gdk.Pixbuf icon;
     private new Gtk.Image image;
+    private Gtk.Image count_image;
 
     public string exec_name;
     public string app_name;
@@ -36,7 +37,11 @@
     private Backend.App application;
 
 #if HAS_PLANK
+    private static Plank.DockTheme plank_theme;
+
     static construct {
+        plank_theme = new Plank.DockTheme ("Gtk+");
+
 #if HAS_PLANK_0_11
         plank_client = Plank.DBusClient.get_instance ();
 #else
@@ -85,12 +90,21 @@
         image.icon_size = icon_size;
         image.margin_top = 12;
 
+        count_image = new Gtk.Image ();
+        count_image.no_show_all = true;
+        count_image.visible = false;
+        count_image.margin_left = 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);
@@ -125,11 +139,8 @@
             sel.set_uris ({File.new_for_path (desktop_path).get_uri ()});
         });
 
-        app.icon_changed.connect (() => {
-            icon = app.icon;
-            image.set_from_pixbuf (icon);
-        });
-
+        app.icon_changed.connect (update_icon);
+        update_icon ();
     }
 
     public override void get_preferred_width (out int minimum_width, out int natural_width) {
@@ -147,6 +158,19 @@
         app_launched ();
     }
 
+    private void update_icon () {
+        icon = application.icon;
+        image.set_from_pixbuf (icon);
+
+#if HAS_PLANK
+        var surface = new Plank.Surface (icon_size, icon_size);
+        plank_theme.draw_item_count (surface, 48, { 0.85, 0.23, 0.29, 0.89 }, application.current_count);
+
+        count_image.set_from_surface (surface.Internal);
+        count_image.visible = application.count_visible;
+#endif        
+    }
+
     private void create_menu () {
         // Display the apps static quicklist items in a popover menu
         if (application.actions == null) {