X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fel-home-applet.c;h=e9a69de727e7a2a5f7d80d0d13709f853a823580;hb=b23827cdd1d1a4b1e828a60591d663ace62b38ef;hp=7f2e9dcbf41f0d8cd689aece93877163bc0d120e;hpb=b8a4765da62f286ec592adf09e7d7671a865c4a2;p=conv-inbox diff --git a/src/el-home-applet.c b/src/el-home-applet.c index 7f2e9dc..e9a69de 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -27,18 +27,24 @@ #include #include #include +#include +#include +#include +#include +#include +#include #define EL_HOME_APPLET_GET_PRIVATE(obj) ( \ G_TYPE_INSTANCE_GET_PRIVATE (obj, \ EL_TYPE_HOME_APPLET, ELHomeAppletPrivate)) #define BOX_WIDTH 352 -#define BOX_HEIGHT 256 +#define BOX_HEIGHT 266 #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) @@ -46,20 +52,26 @@ #define BOX_RADIOUS 10 +#define SCROLL_PERIOD 100 /* ms */ +#define SCROLL_STEP 1 /* pixel */ + 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; - gboolean active; + gboolean active_body; + gboolean active_header; guint unread_count; @@ -68,20 +80,28 @@ struct _ELHomeAppletPrivate float green; float blue; } active_color; + guint8 border_color[4]; PangoFontDescription *font_desc; guint idle_id; + cairo_surface_t *message_surface; + gboolean scroll_on_click; 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); -const gchar* g_module_check_init(GModule *module); +const gchar* g_module_check_init (GModule *module); const gchar* -g_module_check_init(GModule *module) +g_module_check_init (GModule *module) { g_module_make_resident (module); return NULL; @@ -137,24 +157,18 @@ rounded_rectangle (cairo_t *cr, x + r, y); } -static gboolean -draw_text (cairo_t *cr, +static cairo_surface_t* +draw_text (cairo_t *cr, PangoFontDescription *desc, - const gchar *text, - double x, - double y, - int width, - int height, - int offset) + const gchar *text, + gint width, + gint *height) { PangoLayout *layout; - gboolean result; PangoRectangle extent; - cairo_save (cr); - cairo_rectangle (cr, - x, y, width, height); - cairo_clip (cr); + cairo_surface_t *gdk_surface, *result_surface; + cairo_t *msg_cr; /* Create a PangoLayout, set the font and text */ layout = pango_cairo_create_layout (cr); @@ -164,31 +178,34 @@ draw_text (cairo_t *cr, pango_layout_set_font_description (layout, desc); pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); - if (!offset) - pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); pango_layout_set_width (layout, PANGO_SCALE*width); - pango_layout_set_height (layout, PANGO_SCALE*height); + pango_layout_get_pixel_extents (layout, NULL, &extent); + *height = extent.height; + + gdk_surface = cairo_get_target (cr); + result_surface = cairo_surface_create_similar + (gdk_surface, + CAIRO_CONTENT_COLOR_ALPHA, + width, + extent.height); + msg_cr = cairo_create (result_surface); + + pango_cairo_update_layout (msg_cr, layout); /* draw shadow */ - cairo_move_to (cr, x + 1, y + 1 - offset); - cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 0.8); - pango_cairo_show_layout (cr, layout); + cairo_move_to (msg_cr, 1, 1); + cairo_set_source_rgba (msg_cr, 0.2, 0.2, 0.2, 0.8); + pango_cairo_show_layout (msg_cr, layout); /* draw fg */ - cairo_move_to (cr, x, y - offset); - cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); - pango_cairo_show_layout (cr, layout); - - pango_layout_get_pixel_extents (layout, NULL, &extent); - if (offset) - result = height < (extent.height - offset); - else - result = pango_layout_is_ellipsized (layout); + cairo_move_to (msg_cr, 0, 0); + cairo_set_source_rgba (msg_cr, 1.0, 1.0, 1.0, 1.0); + pango_cairo_show_layout (msg_cr, layout); + cairo_destroy (msg_cr); g_object_unref (layout); - cairo_restore (cr); - return result; + return result_surface; } static void @@ -198,6 +215,7 @@ stop_scroll_anim (ELHomeAppletPrivate *priv) g_source_remove (priv->scroll_anim_id); priv->scroll_anim_id = 0; priv->scroll_on_click = FALSE; + gtk_widget_hide (priv->cut_message); } } @@ -214,7 +232,7 @@ style_set_cb (GtkWidget *widget, "SystemFont", NULL, G_TYPE_NONE); - if (font_style && font_style->font_desc){ + if (font_style && font_style->font_desc) { if (priv->font_desc) pango_font_description_free (priv->font_desc); priv->font_desc = pango_font_description_copy (font_style->font_desc); @@ -222,10 +240,34 @@ style_set_cb (GtkWidget *widget, if (gtk_style_lookup_color (widget->style, "ActiveTextColor", - &color)){ + &color)) { 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; + } +} + +static void +notify_on_current_desktop (GObject *object, + GParamSpec *unused G_GNUC_UNUSED, + ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + gboolean on; + + g_object_get (object, "is-on-current-desktop", &on, NULL); + if (!on) { + stop_scroll_anim (self->priv); + priv->scroll_on_click = priv->scroll_offset; + priv->scroll_offset = 0; + if (priv->scroll_on_click) + gtk_widget_show (priv->cut_message); + gtk_widget_queue_draw (GTK_WIDGET (self)); } } @@ -242,9 +284,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); @@ -255,7 +297,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event) BOX_HEIGHT - 2*C_Y, BOX_RADIOUS); - cairo_close_path(cr); + cairo_close_path (cr); cairo_stroke (cr); /* draw header */ @@ -270,10 +312,20 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT); cairo_line_to (cr, 0, HEADER_HEIGHT); - cairo_close_path(cr); + cairo_close_path (cr); + + if (priv->active_header) + cairo_set_source_rgba (cr, + priv->active_color.red, + priv->active_color.green, + priv->active_color.blue, + 0.8f); + else + cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f); + cairo_fill (cr); - cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f); - cairo_fill_preserve (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, @@ -289,14 +341,14 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_curve_to (cr, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT - BOX_RADIOUS); cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT); cairo_line_to (cr, 0, HEADER_HEIGHT); - cairo_close_path(cr); + cairo_close_path (cr); /* draw body filling depending on (in)active state */ cairo_pattern_t *grad; - grad = cairo_pattern_create_linear(0, HEADER_HEIGHT, - 0, C_HEIGHT); + grad = cairo_pattern_create_linear (0, HEADER_HEIGHT, + 0, C_HEIGHT); - if (priv->active){ + if (priv->active_body) { cairo_pattern_add_color_stop_rgba (grad, 0.5f, priv->active_color.red, @@ -327,27 +379,42 @@ expose_event (GtkWidget *self, GdkEventExpose *event) /* BOX_WIDTH - 2*C_X, */ /* BOX_HEIGHT - 2*C_Y, */ /* BOX_RADIOUS); */ - /* cairo_close_path(cr); */ + /* cairo_close_path (cr); */ /* cairo_stroke (cr); */ /* draw message */ - gboolean ellipsized; - ellipsized = draw_text (cr, - priv->font_desc, - priv->message, - 2*C_X, HEADER_HEIGHT, - MESSAGE_WIDTH, - message_height, - priv->scroll_offset); - if (!priv->scroll_anim_id && !priv->scroll_offset) - priv->scroll_on_click = ellipsized; + if (!priv->message_surface) { + gint height; + + priv->message_surface = draw_text (cr, + priv->font_desc, + priv->message, + MESSAGE_WIDTH, + &height); + + priv->hidden_message_height = height - message_height; + priv->scroll_on_click = priv->hidden_message_height > 0; + if (priv->scroll_on_click) + gtk_widget_show (priv->cut_message); + } + + cairo_rectangle (cr, + 2*C_X, + HEADER_HEIGHT, + MESSAGE_WIDTH, + message_height); + cairo_clip (cr); + + cairo_set_source_surface (cr, + priv->message_surface, + 2*C_X, + HEADER_HEIGHT - priv->scroll_offset); + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + cairo_paint (cr); cairo_pattern_destroy (grad); cairo_destroy (cr); - if (!priv->scroll_on_click && !ellipsized && priv->scroll_offset) - stop_scroll_anim (priv); - return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, event); } @@ -357,23 +424,33 @@ dispose (GObject *self) ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; stop_scroll_anim (priv); - if (priv->idle_id){ + if (priv->idle_id) { g_source_remove (priv->idle_id); priv->idle_id = 0; } - if (priv->eventlogger){ + if (priv->eventlogger) { g_object_unref (priv->eventlogger); priv->eventlogger = NULL; } - if (priv->message){ + if (priv->message) { g_free (priv->message); priv->message = NULL; } - if (priv->font_desc){ + if (priv->font_desc) { 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); } @@ -384,6 +461,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) { @@ -422,9 +533,14 @@ show_event (ELHomeApplet *self, RTComElIter *it) priv->message = NULL; } - if (it && rtcom_el_iter_first (it)){ + 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){ + if (priv->message) { const gchar *service; time_t received_t; @@ -432,8 +548,10 @@ show_event (ELHomeApplet *self, RTComElIter *it) if (rtcom_el_iter_get_int (it, "start-time", (gint*)&received_t)) received = format_time (received_t); - if(!rtcom_el_iter_dup_string (it, "remote-name", &remote)) + 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"; @@ -441,19 +559,27 @@ show_event (ELHomeApplet *self, RTComElIter *it) icon_name = "chat_unread_chat"; } } - else{ + else { 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 (icon_name){ +#if 0 + gtk_widget_hide (priv->avatar); + if (icon_name) { const gchar *current_icon_name; gtk_image_get_icon_name (GTK_IMAGE (priv->icon), ¤t_icon_name, @@ -466,11 +592,27 @@ 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); - stop_scroll_anim (self->priv); + stop_scroll_anim (priv); priv->scroll_offset = 0; + if (priv->message_surface) { + cairo_surface_destroy (priv->message_surface); + priv->message_surface = NULL; + } + + gtk_widget_hide (priv->cut_message); gtk_widget_queue_draw (GTK_WIDGET (self)); } @@ -489,7 +631,7 @@ make_query (RTComEl *el, gint event_id) query = rtcom_el_query_new (el); rtcom_el_query_set_limit (query, 1); - if (event_id >= 0){ + if (event_id >= 0) { rtcom_el_query_prepare (query, "is-read", FALSE, RTCOM_EL_OP_EQUAL, "id", event_id, RTCOM_EL_OP_EQUAL, @@ -497,7 +639,7 @@ make_query (RTComEl *el, gint event_id) "event-type", event_types, RTCOM_EL_OP_IN_STRV, NULL); } - else{ + else { rtcom_el_query_prepare (query, "is-read", FALSE, RTCOM_EL_OP_EQUAL, "service", services, RTCOM_EL_OP_IN_STRV, @@ -505,7 +647,7 @@ make_query (RTComEl *el, gint event_id) NULL); } it = rtcom_el_get_events (el, query); - g_object_unref(query); + g_object_unref (query); return it; } @@ -516,7 +658,7 @@ update_unread_label (ELHomeApplet *self) ELHomeAppletPrivate *priv = self->priv; gchar *text; - if (priv->unread_count > 0){ + if (priv->unread_count > 0) { text = g_strdup_printf ("%d", priv->unread_count); gtk_label_set_text (GTK_LABEL (priv->unread), text); g_free (text); @@ -539,17 +681,17 @@ query_unread_events (RTComEl *el) "SELECT SUM(total_events)-SUM(read_events) FROM GroupCache;", -1, &stmt, - NULL) != SQLITE_OK){ + NULL) != SQLITE_OK) { g_error ("%s: can't compile SQL", G_STRFUNC); return -1; } while (SQLITE_BUSY == (ret = sqlite3_step (stmt))); - if (ret == SQLITE_ROW){ + if (ret == SQLITE_ROW) { count = sqlite3_column_int (stmt, 0); } - else{ + else { g_error ("%s: error while executing SQL", G_STRFUNC); } @@ -574,7 +716,7 @@ mark_as_read (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (priv->event_id >= 0){ + if (priv->event_id >= 0) { rtcom_el_set_read_event (priv->eventlogger, priv->event_id, TRUE, @@ -627,11 +769,22 @@ static gboolean scroll_anim_cb (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; + gboolean to_continue; - priv->scroll_offset += 1; - gtk_widget_queue_draw (GTK_WIDGET (self)); + priv->scroll_offset += SCROLL_STEP; + gtk_widget_queue_draw_area (GTK_WIDGET (self), + 3*C_X, + HEADER_HEIGHT + C_Y, + MESSAGE_WIDTH, + C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT); - return TRUE; + to_continue = priv->scroll_offset <= priv->hidden_message_height; + if (!to_continue) { + priv->scroll_anim_id = 0; + gtk_widget_hide (priv->cut_message); + } + + return to_continue; } static gboolean @@ -641,8 +794,11 @@ button_press_event_cb (GtkWidget *widget, { ELHomeAppletPrivate *priv = self->priv; - if (priv->event_id > 0){ - priv->active = TRUE; + if (priv->event_id > 0) { + if (event->y < C_Y + HEADER_HEIGHT) + priv->active_header = TRUE; + else + priv->active_body = TRUE; gtk_widget_queue_draw (widget); } @@ -650,25 +806,54 @@ button_press_event_cb (GtkWidget *widget, } static gboolean +start_starter (OssoABookAggregator *aggregator, const gchar *contact_id) +{ + GList *contacts = osso_abook_aggregator_lookup (aggregator, contact_id); + if (contacts && contacts->data) { + GtkWidget *starter = + osso_abook_touch_contact_starter_new_with_contact + (NULL, + OSSO_ABOOK_CONTACT (contacts->data)); + GtkWidget *dlg = osso_abook_touch_contact_starter_dialog_new + (NULL, + OSSO_ABOOK_TOUCH_CONTACT_STARTER (starter)); + gtk_widget_show_all (starter); + gtk_widget_show (dlg); + + return TRUE; + } + return FALSE; +} +static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (priv->active){ - priv->active = FALSE; + if (priv->active_body) { + priv->active_body = FALSE; stop_scroll_anim (priv); if (priv->scroll_on_click) { priv->scroll_on_click = FALSE; - priv->scroll_anim_id = g_timeout_add (100, + priv->scroll_anim_id = g_timeout_add (SCROLL_PERIOD, (GSourceFunc)scroll_anim_cb, self); } - else + else { #ifndef DEBUG_LAYOUT mark_as_read (self); #endif + } + + gtk_widget_queue_draw (widget); + } + if (priv->active_header) { + priv->active_header = FALSE; + if (!start_starter (OSSO_ABOOK_AGGREGATOR (priv->aggregator), + priv->contact_id)) { + /* TODO: start temp contact dlg */ + } gtk_widget_queue_draw (widget); } @@ -682,21 +867,41 @@ leave_notify_event_cb (GtkWidget *widget, { ELHomeAppletPrivate *priv = self->priv; - if (priv->active){ - priv->active = FALSE; + if (priv->active_body) { + priv->active_body = FALSE; + priv->active_header = FALSE; stop_scroll_anim (priv); gtk_widget_queue_draw (widget); } + if (priv->active_header) { + priv->active_header = FALSE; + gtk_widget_queue_draw (widget); + } return FALSE; } 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; GtkWidget *event_box; - GtkWidget *hbox, *vbox, *align; + GtkWidget *hbox, *vbox, *align, *footer; self->priv = EL_HOME_APPLET_GET_PRIVATE (self); priv = self->priv; @@ -710,16 +915,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), @@ -741,21 +952,33 @@ el_home_applet_init (ELHomeApplet *self) gtk_misc_set_alignment (GTK_MISC (priv->received), 1.0f, 0.5f); - gtk_widget_set_size_request (priv->received, - MESSAGE_WIDTH, - -1); hildon_helper_set_logical_font (priv->received, "SmallSystemFont"); gtk_widget_set_name (priv->received, "hildon-shadow-label"); + + priv->cut_message = gtk_label_new ("..."); + gtk_misc_set_alignment (GTK_MISC (priv->cut_message), + 0.5f, + 0.0f); + hildon_helper_set_logical_font (priv->cut_message, "SmallSystemFont"); + gtk_widget_set_name (priv->cut_message, "hildon-shadow-label"); + 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); + vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), priv->empty, TRUE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (vbox), priv->received, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (vbox), footer, FALSE, FALSE, 0); align = gtk_alignment_new (0.5f, 0.0f, 1.0f, 1.0f); gtk_alignment_set_padding (GTK_ALIGNMENT (align), @@ -771,14 +994,27 @@ el_home_applet_init (ELHomeApplet *self) gtk_container_add (GTK_CONTAINER (event_box), align); gtk_container_add (GTK_CONTAINER (self), event_box); - g_signal_connect (event_box, "button-press-event", - G_CALLBACK (button_press_event_cb), self); - g_signal_connect (event_box, "button-release-event", - G_CALLBACK (button_release_event_cb), self); - g_signal_connect (event_box, "leave-notify-event", - G_CALLBACK (leave_notify_event_cb), self); + g_signal_connect (event_box, + "button-press-event", + G_CALLBACK (button_press_event_cb), + self); + g_signal_connect (event_box, + "button-release-event", + G_CALLBACK (button_release_event_cb), + self); + g_signal_connect (event_box, + "leave-notify-event", + G_CALLBACK (leave_notify_event_cb), + self); - g_signal_connect (event_box, "style-set", G_CALLBACK (style_set_cb), self); + g_signal_connect (event_box, + "style-set", + G_CALLBACK (style_set_cb), + self); + g_signal_connect (self, + "notify::is-on-current-desktop", + G_CALLBACK (notify_on_current_desktop), + self); gtk_widget_show_all (GTK_WIDGET (event_box)); @@ -794,6 +1030,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 }