Merge lp:~mefrio-g/cable/1200886 into lp:cable

[Mario Guerriero]

the badges are removed once the entry is focused. It happens because it seems that the entry is the only widget of which we can detect focus_in_event. I think you should focus the entry every time a key is pressed, every time the window is focused and every time the user changes between channels.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-09 20:35:11 +0000
+++ CMakeLists.txt	2013-07-13 20:46:22 +0000
@@ -33,7 +33,8 @@
     gio-2.0>=2.28.0
     gtk+-3.0>=3.4.0
     gee-1.0
-    libnotify)
+    libnotify
+    unity)
 
 add_definitions(${DEPS_CFLAGS})
 
@@ -54,6 +55,7 @@
     src/Services/Settings.vala
     src/Services/Identity.vala
     src/Services/Network.vala
+    src/Services/Unity.vala
     
     src/Widgets/Room.vala
     src/Widgets/Server.vala
@@ -73,6 +75,7 @@
     gtk+-3.0
     granite
     libnotify
+    unity
     #WebKit-3.0
 OPTIONS
     --target-glib=2.32

=== modified file 'src/Cable.vala'
--- src/Cable.vala	2013-07-09 20:35:11 +0000
+++ src/Cable.vala	2013-07-13 20:46:22 +0000
@@ -73,6 +73,9 @@
         
         Notify.init ("Cable");
         
+        // libunity support
+        Cable.Services.unity = new Cable.Services.Unity ("cable.desktop");
+        
         try {
             context.parse (ref args);
         }

=== added file 'src/Services/Unity.vala'
--- src/Services/Unity.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Unity.vala	2013-07-13 20:46:22 +0000
@@ -0,0 +1,64 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+  BEGIN LICENSE
+
+  Copyright (C) 2013 Mario Guerriero <[e-mail]>
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, 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/>
+
+  END LICENSE
+***/
+
+using Unity;
+
+namespace Cable.Services {
+    
+    public Unity unity;
+    
+    public class Unity : GLib.Object {
+        
+        private int jobs = 0;
+        private LauncherEntry launcher_entry;
+        
+        public Unity (string desktop_id) {
+            launcher_entry = LauncherEntry.get_for_desktop_id (desktop_id);
+        }
+        
+        public void set_progress (double percentage) {
+            // If it is not 100 % show it
+            launcher_entry.progress = (percentage/jobs);
+            launcher_entry.progress_visible = true;
+        }
+        
+        // Add new red badge to show the number of pending works
+        public void append_job () {
+            jobs++;
+            
+            launcher_entry.count = jobs;
+            launcher_entry.count_visible = (jobs > 0);
+        }
+        
+        public void remove_job () {
+            jobs--;
+            
+            launcher_entry.count = jobs;
+            launcher_entry.count_visible = (jobs > 0);
+        }
+        
+        public void clear () {
+            jobs = 0;
+            launcher_entry.count = jobs;
+            launcher_entry.count_visible = false;
+            launcher_entry.progress_visible = false;
+        }
+    }
+}

=== modified file 'src/Widgets/Room.vala'
--- src/Widgets/Room.vala	2013-07-09 20:35:11 +0000
+++ src/Widgets/Room.vala	2013-07-13 20:46:22 +0000
@@ -44,6 +44,7 @@
     Granite.Widgets.SourceList.ExpandableItem regular;
 
     Granite.Widgets.SourceList users;
+    Gtk.Entry entry;
     ChatDisplay chat;
     Gtk.ScrolledWindow left_scrolled;
 
@@ -51,7 +52,9 @@
     Gtk.Box user_box;
     
     Gee.HashMap<string, string> color_map;
-
+    
+    private int unity_badge_count = 0;
+    
     public Gtk.InfoBar topic;
     public Gtk.Label topic_name;
     private Gtk.Button identity_button;
@@ -68,7 +71,7 @@
     public Room (string channel, Server server) {
         this.channel = channel;
         this.server = server;
-        
+
         color_map = new Gee.HashMap<string, string> (null, null);
         
         this.orientation = Gtk.Orientation.VERTICAL;
@@ -137,14 +140,14 @@
         var content = topic.get_content_area () as Gtk.Container;
         content.add (topic_name);
         
-        var entry = new Gtk.Entry ();
+        entry = new Gtk.Entry ();
         entry.hexpand = true;
         
         left_scrolled = new Gtk.ScrolledWindow (null, null);
         left_scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        
+
         chat = new ChatDisplay ();
-
+        
         var pseudo_label = new Gtk.Label (server.identity.nick_name);
         pseudo_label.set_alignment (1, (float)0.5);
         pseudo_label.width_request = 80;
@@ -165,11 +168,46 @@
         box.pack_start (entry_eventbox, false);
 
         this.pack_start (paned);
-
+        
+        entry.focus_in_event.connect (() => {
+            for (int n = 0; n < unity_badge_count; n++)
+                Cable.Services.unity.remove_job ();
+            unity_badge_count = 0;
+            return false;
+        });
         entry.activate.connect (() => {
             send_message (entry.text);
             entry.text = "";
         });
+        string text = "";
+        entry.key_press_event.connect ((ev) => {
+            if (ev.keyval == Gdk.Key.Tab) {
+                if (entry.text == null || entry.text == "")
+                    return false;
+                
+                var txt = entry.text.split (" ");
+                var word = txt[txt.length-1];
+                
+                if (word == null || word == "")
+                    return false;
+                
+                var collection = new Gee.LinkedList<Granite.Widgets.SourceList.Item> ();
+                collection.add_all (operators.children);
+                collection.add_all (voiced.children);
+                collection.add_all (regular.children);
+                var user_array = collection.to_array ();
+                
+                for (int n = 0; n < user_array.length; n++)
+                    if (user_array[n].name != null)
+                        if (word == user_array[n].name[0:word.length]) {
+                            entry.delete_from_cursor (Gtk.DeleteType.WORDS, 1);
+                            entry.insert_at_cursor (user_array[n].name + ": ");
+                            return true;
+                        }
+                return true;    
+            }    
+            return false;
+        });
         
         /* Load nickname's color from settings */
         string[] colors = Settings.settings.get_strv ("colors");
@@ -216,6 +254,7 @@
         regular.name = _("Regular") + " (" + regular.n_children.to_string () + ")";
         operators.name = _("Operators") + " (" + operators.n_children.to_string () + ")";
         voiced.name = _("Voiced") + " (" + voiced.n_children.to_string () + ")";
+    
     }
 
     public void remove_user (string name, bool silent = false) {
@@ -282,6 +321,11 @@
                     try {
                         notify.show ();
                     } catch (Error e) { warning (e.message); }
+                    // libunity badge
+                    if (!entry.has_focus) {
+                        Cable.Services.unity.append_job ();
+                        unity_badge_count++;
+                    }
                 } else {
                     if (color_map.has_key (from)) {
                         chat.add_message ("<span color='"+color_map.get (from)+@"'>$from</span>", new_message);

=== modified file 'src/Widgets/User.vala'
--- src/Widgets/User.vala	2013-07-04 01:34:38 +0000
+++ src/Widgets/User.vala	2013-07-13 20:46:22 +0000
@@ -31,6 +31,7 @@
     
     public User (string name) {
         base (name);
+        
         menu = new Gtk.Menu ();
         var item_color = new Gtk.MenuItem.with_label (_("Change color…"));