Merge lp:~sschuhmann/maya/guestview into lp:~elementary-apps/maya/trunk

[Steffen Schuhmann]

Guest View:
 * Added libfolks support.
 * Ported to ListBox.
 * Changed entry string.
 * Invitation status now shows the real status.

Contact lookup added.
ListBox added.

ListBox seems not to themed in egtk, should this be done in maya itself?

[Corentin Noël (tintou)]

The code is great, adding the design team to review the problem with the listbox (if it's not themeable, a Frame can be added)

review: Approve

[Steffen Schuhmann (sschuhmann)]

Needs fixing.

This may cause bug 1349853, which i thought is also in the upstream version.

[Steffen Schuhmann (sschuhmann)]

> Needs fixing.
>
> This may cause bug 1349853, which i thought is also in the upstream version.

Tested the development branch contains this bug also.

[lp:~sschuhmann/maya/guestview]

614. By Steffen Schuhmann on 2014-07-30

Fixes

615. By Steffen Schuhmann on 2014-07-30

fixes

[Danielle Foré (danrabbit)]

I've added theming for gtk 3.14. I'll have to add it for 3.12 later :p

Can we remove the ellipsis from the placeholder text in the search entry?

Also, adding a contact should probably clear the entry.

How does the "pending" functionality work? If you add someone that isn't tied to a contact (just some random name) we probably shouldn't show the status since they won't be able to confirm.

also, if these are bugs that are present in trunk and don't have anything to do with your branch feel free to ignore them :)

review: Needs Fixing

[Steffen Schuhmann (sschuhmann)]

> Also, adding a contact should probably clear the entry.

I'll add that

> How does the "pending" functionality work? If you add someone that isn't tied to a contact (just some random name) we probably shouldn't show the status since they won't be able to confirm.

The user should enter an mail address than just a random name, or is that something, that is uncertain?

[lp:~sschuhmann/maya/guestview]

616. By Steffen Schuhmann on 2014-08-06

Deleting content of Gtk.Entry when choosing a suggestion.
Removed ellipsis in the "Invite" string.

617. By Steffen Schuhmann on 2014-08-06

Invitation status now only displays approved and declined invitation status. If there isn't a invitation send or it's pendig it doesn't display anything.

[Corentin Noël (tintou)]

With your latest changes it's better than ever, ready to merge.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-03 14:34:39 +0000
+++ CMakeLists.txt	2014-08-06 07:31:22 +0000
@@ -102,6 +102,7 @@
     champlain-0.12
     clutter-1.0
     geocode-glib-1.0
+    folks
 )
 
 set (DEPS_PKG
@@ -109,6 +110,7 @@
     champlain-0.12
     clutter-1.0
     geocode-glib-1.0
+    folks
 )
 
 set (BASIC_VALAC_OPTIONS
@@ -137,4 +139,4 @@
 add_subdirectory (src)
 add_subdirectory (daemon)
 add_subdirectory (plugins)
-add_subdirectory (schemas)
+add_subdirectory (schemas)
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-04-15 21:59:26 +0000
+++ src/CMakeLists.txt	2014-08-06 07:31:22 +0000
@@ -4,6 +4,7 @@
     SourceItem.vala
     MayaToolbar.vala
     SourceSelector.vala
+    EventEdition/ContactImage.vala
     EventEdition/EventDialog.vala
     EventEdition/GuestsPanel.vala
     EventEdition/InfoPanel.vala
@@ -44,4 +45,4 @@
 
 target_link_libraries(${EXEC_NAME} ${DEPS_LIBRARIES} -lm)
 
-install(TARGETS ${EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+install(TARGETS ${EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
\ No newline at end of file

=== added file 'src/EventEdition/ContactImage.vala'
--- src/EventEdition/ContactImage.vala	1970-01-01 00:00:00 +0000
+++ src/EventEdition/ContactImage.vala	2014-08-06 07:31:22 +0000
@@ -0,0 +1,125 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Pantheon Chat Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+/* 
+ * This widget auto-updates his image when the contact changes his avatar.
+ * It draws circle icons following the current trend.
+ */
+public class Maya.ContactImage : Gtk.Stack {
+    private Gtk.IconSize icon_size;
+    private Gtk.Image current_image = null;
+    private bool default_avatar = true;
+    public ContactImage (Gtk.IconSize icon_size, Folks.Individual? individual = null) {
+        this.icon_size = icon_size;
+        transition_type = Gtk.StackTransitionType.CROSSFADE;
+
+        var force_size_image = new Gtk.Image.from_icon_name ("avatar-default", icon_size);
+        add (force_size_image);
+        show_default_avatar ();
+
+        if (individual != null) {
+            add_contact (individual);
+        }
+
+        show_all ();
+    }
+
+    public void add_contact (Folks.Individual individual) {
+        if (individual.avatar != null && default_avatar == true) {
+            show_avatar_from_loadable_icon (individual.avatar);
+        }
+
+        individual.notify["avatar"].connect (() => {
+            if (individual.avatar != null && default_avatar == true) {
+                show_avatar_from_loadable_icon (individual.avatar);
+            } else {
+                show_default_avatar ();
+            }
+        });
+    }
+
+    private void show_avatar_from_loadable_icon (LoadableIcon icon) {
+        var image = new Gtk.Image ();
+        image.draw.connect ((cr) => {
+            try {
+                var width = get_allocated_width ();
+                var height = get_allocated_height ();
+                int size = (int) double.min (width, height);
+                var stream = icon.load (size, null);
+                var img_pixbuf = new Gdk.Pixbuf.from_stream_at_scale (stream, size, size, true);
+                cr.set_operator (Cairo.Operator.OVER);
+                var x = (width-size)/2;
+                var y = (height-size)/2;
+                Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, x, y, size, size, size/2);
+                Gdk.cairo_set_source_pixbuf (cr, img_pixbuf, x, y);
+                cr.fill_preserve ();
+                cr.set_line_width (0);
+                cr.set_source_rgba (0, 0, 0, 0.3);
+                cr.stroke ();
+            } catch (Error e) {
+                critical (e.message);
+                return false;
+            }
+
+            return true;
+        });
+        show_avatar_image (image);
+    }
+
+    private void show_default_avatar () {
+        var image = new Gtk.Image ();
+        image.draw.connect ((cr) => {
+            try {
+                var width = get_allocated_width ();
+                var height = get_allocated_height ();
+                int size = (int) double.min (width, height);
+                var img_pixbuf = Gtk.IconTheme.get_default ().load_icon ("avatar-default", size, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+                cr.set_operator (Cairo.Operator.OVER);
+                var x = (width-size)/2;
+                var y = (height-size)/2;
+                Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, x, y, size, size, size/2);
+                Gdk.cairo_set_source_pixbuf (cr, img_pixbuf, x, y);
+                cr.fill_preserve ();
+                cr.set_line_width (0);
+                cr.set_source_rgba (0, 0, 0, 0.3);
+                cr.stroke ();
+            } catch (Error e) {
+                critical (e.message);
+                return false;
+            }
+
+            return true;
+        });
+
+        show_avatar_image (image);
+        default_avatar = true;
+    }
+
+    private void show_avatar_image (Gtk.Image image) {
+        add (image);
+        image.show ();
+        set_visible_child (image);
+        if (current_image != null)
+            current_image.destroy ();
+        current_image = image;
+    }
+}
\ No newline at end of file

=== modified file 'src/EventEdition/GuestsPanel.vala'
--- src/EventEdition/GuestsPanel.vala	2014-04-07 15:50:13 +0000
+++ src/EventEdition/GuestsPanel.vala	2014-08-06 07:31:22 +0000
@@ -13,16 +13,14 @@
 //
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-// TODO: Use Folks to get contact informations such as name and picture.
 
 public class Maya.View.EventEdition.GuestsPanel : Gtk.Grid {
     private EventDialog parent_dialog;
     private Gtk.Entry guest_entry;
-    private Gtk.Grid guest_grid;
-    private int guest_grid_id = 0;
+    private Gtk.EntryCompletion guest_completion;
+    private Gtk.ListBox guest_list;
     private Gee.ArrayList<unowned iCal.Property> attendees;
+    private Gtk.ListStore guest_store;
 
     private enum COLUMNS {
         ICON = 0,
@@ -44,27 +42,49 @@
         var guest_label = Maya.View.EventDialog.make_label (_("Participants:"));
 
         guest_entry = new Gtk.SearchEntry ();
-        guest_entry.placeholder_text = _("Invite…");
+        guest_entry.placeholder_text = _("Invite");
         guest_entry.hexpand = true;
+
         guest_entry.activate.connect (() => {
             var attendee = new iCal.Property (iCal.PropertyKind.ATTENDEE);
             attendee.set_attendee (guest_entry.text);
-            add_attendee ((owned)attendee);
+            attendees.add (attendee);
+            add_guest ((owned)attendee);
         });
 
-        guest_grid = new Gtk.Grid ();
-        var guest_scrolledwindow = new Gtk.ScrolledWindow (null, null);
-        guest_scrolledwindow.add_with_viewport (guest_grid);
+        load_contacts.begin ();
+
+        guest_completion = new Gtk.EntryCompletion ();
+        guest_entry.set_completion (guest_completion);
+        
+        Gtk.EntryCompletionMatchFunc matcher = (completion, key, iter) => {
+            Value val1, val2;
+            Gtk.ListStore model = (Gtk.ListStore)completion.get_model ();
+            
+            model.get_value (iter, 0, out val1);
+            model.get_value (iter, 1, out val2);
+
+            if (val1.get_string ().casefold (-1).contains (key) || val2.get_string ().casefold (-1).contains (key)) 
+                return true;
+            
+            return false;
+        };
+        
+        guest_completion.set_match_func (matcher);
+        guest_completion.set_minimum_key_length (3);
+
+        guest_store = new Gtk.ListStore(2, typeof (string), typeof (string));
+        guest_completion.set_model (guest_store);
+        guest_completion.set_text_column (0);
+        guest_completion.set_text_column (1);
+        guest_completion.match_selected.connect ((model, iter) => suggestion_selected (model, iter));
+
+	    guest_list = new Gtk.ListBox ();    
+	    guest_list.set_selection_mode (Gtk.SelectionMode.NONE);
+	    var guest_scrolledwindow = new Gtk.ScrolledWindow (null, null);
+        guest_scrolledwindow.add_with_viewport (guest_list);
         guest_scrolledwindow.expand = true;
 
-        var fake_grid_l = new Gtk.Grid ();
-        fake_grid_l.hexpand = true;
-        guest_grid.attach (fake_grid_l, 0, 0, 1, 1);
-
-        var fake_grid_r = new Gtk.Grid ();
-        fake_grid_r.hexpand = true;
-        guest_grid.attach (fake_grid_r, 2, 0, 1, 1);
-
         attach (guest_label, 0, 0, 1, 1);
         attach (guest_entry, 0, 1, 1, 1);
         attach (guest_scrolledwindow, 0, 2, 1, 1);
@@ -76,9 +96,8 @@
 
             unowned iCal.Property property = comp.get_first_property (iCal.PropertyKind.ATTENDEE);
             for (int i = 0; i < count; i++) {
-
                 if (property.get_attendee () != null)
-                    add_attendee (property);
+                    add_guest (property);
 
                 property = comp.get_next_property (iCal.PropertyKind.ATTENDEE);
             }
@@ -88,6 +107,20 @@
     }
 
     /**
+     * Add the contacts to the EntryCompletion model.
+     */
+    private void apply_contact_store_model (Gee.Map<string, Folks.Individual> contacts) {
+        Gtk.TreeIter contact;
+        var map_iterator = contacts.map_iterator ();
+        while (map_iterator.next ()) {
+            foreach (var address in map_iterator.get_value ().email_addresses) {
+                guest_store.append (out contact);
+                guest_store.set (contact, 0, map_iterator.get_value ().full_name, 1, address.value);
+            }
+        }
+    }
+
+    /**
      * Save the values in the dialog into the component.
      */
     public void save () {
@@ -95,7 +128,7 @@
         // Save the guests
         // First, clear the guests
         int count = comp.count_properties (iCal.PropertyKind.ATTENDEE);
-
+        
         for (int i = 0; i < count; i++) {
             unowned iCal.Property remove_prop;
             if (i == 0) {
@@ -127,28 +160,65 @@
         }
     }
 
-    private void add_attendee (iCal.Property attendee) {
-        var guest_element = new GuestGrid (attendee);
-        guest_grid.attach (guest_element, 1, guest_grid_id, 1, 1);
-        guest_grid_id++;
-        attendees.add (guest_element.attendee);
-        guest_element.removed.connect (() => {
+    private void add_guest (iCal.Property attendee) {
+	    var row = new Gtk.ListBoxRow ();
+	    var guest_element = new GuestGrid (attendee);
+	    row.add (guest_element);
+	    guest_list.add (row);
+	    
+	    attendees.add (guest_element.attendee);
+	    guest_element.removed.connect (() => {
             attendees.remove (guest_element.attendee);
         });
-        guest_element.show_all ();
+	
+	    row.show_all ();
+    }
+
+    private bool suggestion_selected (Gtk.TreeModel model, Gtk.TreeIter iter) {
+        var attendee = new iCal.Property (iCal.PropertyKind.ATTENDEE);
+        Value selected_value;
+        
+        model.get_value (iter, 1, out selected_value);;
+        attendee.set_attendee (selected_value.get_string ());
+        add_guest ((owned)attendee);
+	guest_entry.delete_text (0, -1);
+        return true;
+    }
+
+    private async void load_contacts () {
+        var aggregator = Folks.IndividualAggregator.dup ();
+
+        if (aggregator.is_prepared) {
+            apply_contact_store_model (aggregator.individuals);
+        } else {
+            aggregator.notify["is-quiescent"].connect (() => {
+                load_contacts.begin ();
+            });
+
+            aggregator.prepare.begin ();
+        }
     }
 }
 
 public class Maya.View.EventEdition.GuestGrid : Gtk.Grid {
     public signal void removed ();
     public iCal.Property attendee;
+    private Folks.Individual individual;
+    private Gtk.Label name_label;
+    private Gtk.Label mail_label;
+    private ContactImage icon_image;
 
     public GuestGrid (iCal.Property attendee) {
         this.attendee = new iCal.Property.clone (attendee);
         row_spacing = 6;
         column_spacing = 12;
+        individual = null;
+        
+        set_margin_bottom (6);
+        set_margin_right (6);
+        set_margin_left (6);
 
-        string status = "<b><span color=\'darkgrey\'>%s</span></b>".printf (_("Pending"));
+        string status = "";
         unowned iCal.Parameter parameter = attendee.get_first_parameter (iCal.ParameterKind.PARTSTAT);
         if (parameter != null) {
             switch (parameter.get_partstat ()) {
@@ -159,27 +229,26 @@
                     status = "<b><span color=\'red\'>%s</span></b>".printf (_("Declined"));
                     break;
                 default:
-                    status = "<b><span color=\'darkgrey\'>%s</span></b>".printf (_("Pending"));
+                    status = "";
                     break;
             }
-        }
+        } 
 
         var status_label = new Gtk.Label ("");
         status_label.set_markup (status);
         status_label.justify = Gtk.Justification.RIGHT;
+        icon_image = new ContactImage (Gtk.IconSize.DIALOG);
 
-        var icon_image = new Gtk.Image.from_icon_name ("avatar-default", Gtk.IconSize.DIALOG);
-        
         var mail = attendee.get_attendee ().replace ("mailto:", "");
 
-        var name_label = new Gtk.Label ("");
+        name_label = new Gtk.Label ("");
         name_label.xalign = 0;
-        name_label.set_markup ("<b><big>%s</big></b>".printf (Markup.escape_text (mail.split ("@", 2)[0])));
+        set_name_label (mail.split ("@", 2)[0]);
 
-        var mail_label = new Gtk.Label ("");
+        mail_label = new Gtk.Label ("");
         mail_label.hexpand = true;
         mail_label.xalign = 0;
-        mail_label.set_markup ("<b><span color=\'darkgrey\'>%s</span></b>".printf (Markup.escape_text (mail)));
+        set_mail_label (mail);
 
         var remove_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.BUTTON);
         remove_button.relief = Gtk.ReliefStyle.NONE;
@@ -188,10 +257,53 @@
         remove_grid.add (remove_button);
         remove_grid.valign = Gtk.Align.CENTER;
 
+        get_contact_by_mail.begin (attendee.get_attendee ().replace ("mailto:", ""));
+
         attach (icon_image, 0, 0, 1, 4);
-        attach (name_label, 1, 1, 1, 2/*1*/);
-        //attach (mail_label, 1, 2, 1, 1); Once Folks is enabled, separate email and name !
+        attach (name_label, 1, 1, 1, 1);
+        attach (mail_label, 1, 2, 1, 1); 
         attach (status_label, 2, 1, 1, 2);
         attach (remove_grid, 3, 1, 1, 2);
     }
-}
\ No newline at end of file
+
+    private async void get_contact_by_mail (string mail_address) {
+        Folks.IndividualAggregator aggregator = Folks.IndividualAggregator.dup ();
+        if (aggregator.is_prepared) {
+            Gee.MapIterator <string, Folks.Individual> map_iterator;
+            map_iterator = aggregator.individuals.map_iterator ();
+
+            while (map_iterator.next ()) {
+                foreach (var address in map_iterator.get_value ().email_addresses) {
+                    if(address.value == mail_address) {
+                        individual = map_iterator.get_value ();
+                        if (individual != null) {
+                            icon_image.add_contact (individual);
+                            if (individual.full_name != null && individual.full_name != "") {
+                                set_name_label (individual.full_name);
+                                set_mail_label (attendee.get_attendee ());
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            aggregator.notify["is-quiescent"].connect (() => {
+                get_contact_by_mail.begin (mail_address);
+            });
+
+            try {
+                yield aggregator.prepare ();
+            } catch (Error e) {
+                critical (e.message);
+            }
+        }
+    }
+
+    private void set_name_label (string name) {
+        name_label.set_markup ("<b><big>%s</big></b>".printf (Markup.escape_text (name)));
+    }
+
+    private void set_mail_label (string mail) {
+        mail_label.set_markup ("<b><span color=\'darkgrey\'>%s</span></b>".printf (Markup.escape_text (mail)));
+    }
+}