Show avatar instead of message type icon, initial impl.

diff --git a/configure.ac b/configure.ac
index 6e0687d..f84d6c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,9 @@ AC_SUBST(hildondesktoplibdir)
 PKG_CHECK_MODULES([LIBHILDONDESKTOP],
                    [libhildondesktop-1 >= 2.1.7])
 
+PKG_CHECK_MODULES([LIBOSSO_ABOOK],
+                   [libosso-abook-1.0])
+
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug], [enable debugging])],
              [enable_debug=${enableval}], [enalbe_debug=no])

diff --git a/src/Makefile.am b/src/Makefile.am
index 05aa533..7e71222 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,11 @@ hildondesktoplib_LTLIBRARIES = conversations-inbox-widget.la
 
 conversations_inbox_widget_la_CPPFLAGS = \
     $(LIBHILDONDESKTOP_CFLAGS) \
-    $(LIBEVENT_LOGGER_CFLAGS)
+    $(LIBEVENT_LOGGER_CFLAGS) \
+    $(LIBOSSO_ABOOK_CFLAGS)
 
 conversations_inbox_widget_la_LDFLAGS = -module -avoid-version
-conversations_inbox_widget_la_LIBADD = $(LIBHILDONDESKTOP_LIBS) $(LIBEVENT_LOGGER_LIBS)
+conversations_inbox_widget_la_LIBADD = $(LIBHILDONDESKTOP_LIBS) $(LIBEVENT_LOGGER_LIBS) $(LIBOSSO_ABOOK_LIBS)
 
 conversations_inbox_widget_la_SOURCES = el-home-applet.c el-home-applet.h
 

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index d871a5d..3636be8 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -27,6 +27,11 @@
 #include <rtcom-eventlogger/eventlogger.h>
 #include <sqlite3.h>
 #include <string.h>
+#include <libosso-abook/osso-abook-init.h>
+#include <libosso-abook/osso-abook-aggregator.h>
+#include <libosso-abook/osso-abook-contact.h>
+#include <libosso-abook/osso-abook-waitable.h>
+#include <libosso-abook/osso-abook-contact.h>
 
 #define EL_HOME_APPLET_GET_PRIVATE(obj) ( \
         G_TYPE_INSTANCE_GET_PRIVATE (obj, \
@@ -38,7 +43,7 @@
 #define C_WIDTH (BOX_WIDTH - 2*HILDON_MARGIN_HALF)
 #define C_HEIGHT (BOX_HEIGHT - 2*HILDON_MARGIN_HALF)
 #define C_X HILDON_MARGIN_HALF
-#define C_Y HILDON_MARGIN_HALF
+#define C_Y 4*HILDON_MARGIN_HALF
 
 #define HEADER_HEIGHT 48
 #define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT)
@@ -54,11 +59,12 @@ struct _ELHomeAppletPrivate
         RTComEl *eventlogger;
 
         GtkWidget *sender;
-        GtkWidget *icon;
+        /* GtkWidget *icon; */
         GtkWidget *unread;
         GtkWidget *received;
         GtkWidget *empty;
         GtkWidget *cut_message;
+        GtkWidget *avatar;
 
         gchar *message;
         gint event_id;
@@ -72,6 +78,7 @@ struct _ELHomeAppletPrivate
                 float green;
                 float blue;
         } active_color;
+        guint8 border_color[4];
         PangoFontDescription *font_desc;
 
         guint idle_id;
@@ -82,6 +89,10 @@ struct _ELHomeAppletPrivate
         gint scroll_offset;
         gint hidden_message_height;
         guint scroll_anim_id;
+
+        OssoABookRoster *aggregator;
+        OssoABookWaitableClosure *aggregator_ready_closure;
+        gchar *contact_id;
 };
 
 HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
@@ -231,6 +242,11 @@ style_set_cb (GtkWidget *widget,
                 priv->active_color.red = color.red/(float)G_MAXUINT16;
                 priv->active_color.green = color.green/(float)G_MAXUINT16;
                 priv->active_color.blue = color.blue/(float)G_MAXUINT16;
+
+                priv->border_color[0] = color.red;
+                priv->border_color[1] = color.green;
+                priv->border_color[2] = color.blue;
+                priv->border_color[3] = 255;
         }
 }
 
@@ -266,9 +282,9 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         gdk_cairo_region (cr, event->region);
         cairo_clip (cr);
 
-        /* draw bound box */
         cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
+        /* draw bound box */
         cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.1f);
         cairo_set_line_width (cr, 3.0f);
 
@@ -297,7 +313,10 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         cairo_close_path (cr);
 
         cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f);
-        cairo_fill_preserve (cr);
+        cairo_fill (cr);
+
+        cairo_move_to (cr, 0, HEADER_HEIGHT);
+        cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
         cairo_set_source_rgba (cr,
                                priv->active_color.red,
                                priv->active_color.green,
@@ -413,6 +432,16 @@ dispose (GObject *self)
                 pango_font_description_free (priv->font_desc);
                 priv->font_desc = NULL;
         }
+        if (priv->aggregator) {
+                if (priv->aggregator_ready_closure){
+                        osso_abook_waitable_cancel (OSSO_ABOOK_WAITABLE (priv->aggregator),
+                                                    priv->aggregator_ready_closure);
+                        priv->aggregator_ready_closure = NULL;
+                }
+
+                g_object_unref (priv->aggregator);
+                priv->aggregator = NULL;
+        }
 
         G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
 }
@@ -423,6 +452,40 @@ finalize (GObject *self)
         G_OBJECT_CLASS (el_home_applet_parent_class)->finalize (self);
 }
 
+static void
+resolve_contact (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        g_warning ("%s %s", G_STRFUNC, priv->contact_id);
+
+        if (priv->contact_id) {
+                GList *contacts = osso_abook_aggregator_lookup (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
+                                                                priv->contact_id);
+                if (contacts && contacts->data) {
+                        OssoABookContact *contact = OSSO_ABOOK_CONTACT (contacts->data);
+                        gtk_label_set_text (GTK_LABEL (priv->sender),
+                                            osso_abook_contact_get_display_name (contact));
+                        GdkPixbuf *avatar_image = osso_abook_avatar_get_image_rounded
+                                (OSSO_ABOOK_AVATAR (contact),
+                                 HILDON_ICON_PIXEL_SIZE_THUMB,
+                                 HILDON_ICON_PIXEL_SIZE_THUMB,
+                                 TRUE,
+                                 -1,
+                                 priv->border_color);
+                        g_warning ("%s av_img %p", G_STRFUNC, avatar_image);
+                        if (avatar_image) {
+                                g_warning ("SHOE AVATAR");
+                                /* gtk_widget_hide (priv->icon); */
+                                /* gtk_widget_show (priv->avatar); */
+                                gtk_image_set_from_pixbuf (GTK_IMAGE (priv->avatar),
+                                                           avatar_image);
+                                g_object_unref (avatar_image);
+                        }
+                }
+        }
+}
+
 static gchar*
 format_time (time_t t)
 {
@@ -461,6 +524,11 @@ show_event (ELHomeApplet *self, RTComElIter *it)
                 priv->message = NULL;
         }
 
+        if (priv->contact_id) {
+                g_free (priv->contact_id);
+                priv->contact_id = NULL;
+        }
+
         if (it && rtcom_el_iter_first (it)) {
                 rtcom_el_iter_dup_string (it, "free-text", &priv->message);
                 if (priv->message) {
@@ -473,6 +541,8 @@ show_event (ELHomeApplet *self, RTComElIter *it)
 
                         if (!rtcom_el_iter_dup_string (it, "remote-name", &remote))
                                 rtcom_el_iter_dup_string (it, "remote-id", &remote);
+                        rtcom_el_iter_dup_string (it, "remote-ebook-uid", &priv->contact_id);
+                        g_warning ("abook uid %s", priv->contact_id);
                         service = rtcom_el_iter_get_service (it);
                         if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS"))
                                 icon_name = "chat_unread_sms";
@@ -484,14 +554,22 @@ show_event (ELHomeApplet *self, RTComElIter *it)
                 priv->event_id = -1;
         }
 
-        if (priv->message)
+        if (priv->message) {
                 gtk_widget_hide (priv->empty);
-        else
+                gtk_widget_show (priv->avatar);
+                gtk_image_set_from_icon_name (GTK_IMAGE (priv->avatar),
+                                              "general_default_avatar",
+                                              HILDON_ICON_SIZE_THUMB);
+        }
+        else {
                 gtk_widget_show (priv->empty);
+                gtk_widget_hide (priv->avatar);
+        }
 
-        gtk_label_set_text (GTK_LABEL (priv->sender), remote);
         gtk_label_set_text (GTK_LABEL (priv->received), received);
 
+#if 0
+        gtk_widget_hide (priv->avatar);
         if (icon_name) {
                 const gchar *current_icon_name;
                 gtk_image_get_icon_name (GTK_IMAGE (priv->icon),
@@ -505,6 +583,16 @@ show_event (ELHomeApplet *self, RTComElIter *it)
         }
         else
                 gtk_widget_hide (priv->icon);
+#endif
+
+        if (priv->contact_id &&
+            priv->aggregator &&
+            !priv->aggregator_ready_closure) {
+                resolve_contact (self);
+        }
+        else {
+                gtk_label_set_text (GTK_LABEL (priv->sender), remote);
+        }
 
         g_free (remote);
 
@@ -750,6 +838,21 @@ leave_notify_event_cb (GtkWidget        *widget,
 }
 
 static void
+aggregator_ready_cb (OssoABookWaitable *waitable,
+                     const GError      *error,
+                     gpointer           userdata)
+{
+        g_warning (G_STRFUNC);
+        ELHomeApplet *self = EL_HOME_APPLET(userdata);
+
+        self->priv->aggregator_ready_closure = NULL;
+
+        if (!error) {
+                resolve_contact (self);
+        }
+}
+
+static void
 el_home_applet_init (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv;
@@ -768,16 +871,22 @@ el_home_applet_init (ELHomeApplet *self)
                                          "ActiveTextColor");
         gtk_misc_set_alignment (GTK_MISC (priv->unread),
                                 1.0f,
-                                0.5f);
-        gtk_widget_set_size_request (priv->unread,
-                                     -1,
-                                     HEADER_HEIGHT);
-
+                                1.0f);
+        hildon_helper_set_logical_font (priv->unread, "SmallSystemFont");
+        /* gtk_widget_set_size_request (priv->unread, */
+        /*                              -1, */
+        /*                              HEADER_HEIGHT); */
+#if 0
         priv->icon = gtk_image_new_from_icon_name ("chat_unread_sms",
                                                    HILDON_ICON_SIZE_FINGER);
         gtk_misc_set_alignment (GTK_MISC (priv->icon),
                                 0.5f,
                                 0.5f);
+#endif
+        priv->avatar = gtk_image_new ();
+        gtk_misc_set_alignment (GTK_MISC (priv->avatar),
+                                0.5f,
+                                0.5f);
 
         priv->sender = gtk_label_new ("asdf asdf asdf asdf asdf");
         gtk_misc_set_alignment (GTK_MISC (priv->sender),
@@ -812,11 +921,13 @@ el_home_applet_init (ELHomeApplet *self)
         GTK_WIDGET_SET_FLAGS (priv->cut_message, GTK_NO_SHOW_ALL);
 
         hbox = gtk_hbox_new (FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), priv->unread, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), priv->icon, FALSE, FALSE, 0);
+        /* gtk_box_pack_start (GTK_BOX (hbox), priv->unread, FALSE, FALSE, 0); */
+        /* gtk_box_pack_start (GTK_BOX (hbox), priv->icon, FALSE, FALSE, 0); */
+        gtk_box_pack_start (GTK_BOX (hbox), priv->avatar, FALSE, FALSE, 0);
         gtk_box_pack_start (GTK_BOX (hbox), priv->sender, TRUE, TRUE, 0);
 
         footer = gtk_hbox_new (FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (footer), priv->unread, FALSE, FALSE, 0);
         gtk_box_pack_start (GTK_BOX (footer), priv->cut_message, TRUE, TRUE, 0);
         gtk_box_pack_end (GTK_BOX (footer), priv->received, FALSE, FALSE, 0);
 
@@ -875,6 +986,14 @@ el_home_applet_init (ELHomeApplet *self)
                           self);
 
         read_new_event (self);
+
+        osso_abook_init_with_name (PACKAGE, NULL);
+
+        priv->aggregator = osso_abook_aggregator_get_default (NULL);
+        priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready
+                (OSSO_ABOOK_WAITABLE (priv->aggregator),
+                 aggregator_ready_cb,
+                 self, NULL);
 #endif
 }