X-Git-Url: http://git.maemo.org/git/?p=conv-inbox;a=blobdiff_plain;f=src%2Fel-home-applet.c;h=3d58568b8c8e9f31c5dba249cf15177d4278c505;hp=1fda56e5e0f26360fd240a7e3fefc7627643f6bf;hb=6f2ee068a30c8019aa8ebc5d3e5c29b4cba2a780;hpb=84cdd26f1a39c499d05d83032653c2e0a686a295 diff --git a/src/el-home-applet.c b/src/el-home-applet.c index 1fda56e..3d58568 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -27,18 +27,27 @@ #include #include #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 266 +#define BOX_HEIGHT 276 -#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 CONTENT_OFFSET_X HILDON_MARGIN_HALF +#define CONTENT_OFFSET_Y_TOP 4*HILDON_MARGIN_HALF +#define CONTENT_OFFSET_Y_BOTTOM HILDON_MARGIN_HALF +#define C_WIDTH (BOX_WIDTH - 2*CONTENT_OFFSET_X) +#define C_HEIGHT (BOX_HEIGHT - (CONTENT_OFFSET_Y_TOP + CONTENT_OFFSET_Y_BOTTOM)) #define HEADER_HEIGHT 48 #define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT) @@ -48,21 +57,25 @@ #define SCROLL_PERIOD 100 /* ms */ #define SCROLL_STEP 1 /* pixel */ +#define TEXT_Y_OFFSET (HEADER_HEIGHT + HILDON_MARGIN_HALF) 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; @@ -71,6 +84,7 @@ struct _ELHomeAppletPrivate float green; float blue; } active_color; + guint8 border_color[4]; PangoFontDescription *font_desc; guint idle_id; @@ -81,6 +95,13 @@ struct _ELHomeAppletPrivate gint scroll_offset; gint hidden_message_height; guint scroll_anim_id; + + OssoABookRoster *aggregator; + OssoABookWaitableClosure *aggregator_ready_closure; + gchar *contact_id; + gchar *remote_id; + gchar *local_id; + OssoABookContact *contact; }; HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM); @@ -201,6 +222,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); } } @@ -229,6 +251,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; } } @@ -245,6 +272,8 @@ notify_on_current_desktop (GObject *object, 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)); } } @@ -262,17 +291,17 @@ 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); rounded_rectangle (cr, - C_X, - C_Y, - BOX_WIDTH - 2*C_X, - BOX_HEIGHT - 2*C_Y, + CONTENT_OFFSET_X, + CONTENT_OFFSET_Y_TOP, + BOX_WIDTH - 2*CONTENT_OFFSET_X, + BOX_HEIGHT - (CONTENT_OFFSET_Y_TOP + CONTENT_OFFSET_Y_BOTTOM), BOX_RADIOUS); cairo_close_path (cr); @@ -281,7 +310,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event) /* draw header */ cairo_set_line_width (cr, 1.0f); - cairo_translate (cr, C_X, C_Y); + cairo_translate (cr, CONTENT_OFFSET_X, CONTENT_OFFSET_Y_TOP); cairo_move_to (cr, 0, HEADER_HEIGHT); cairo_line_to (cr, 0, BOX_RADIOUS); cairo_curve_to (cr, 0, 0, 0, 0, BOX_RADIOUS, 0); @@ -292,8 +321,18 @@ 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); + 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_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, @@ -316,7 +355,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event) 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, @@ -340,11 +379,11 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_fill (cr); /* cairo_set_source_rgba (cr, red, green, blue, 1.0f); */ - /* cairo_translate (cr, -C_X, -C_Y); */ + /* cairo_translate (cr, -CONTENT_OFFSET_X, -C_Y); */ /* rounded_rectangle (cr, */ - /* C_X, */ + /* CONTENT_OFFSET_X, */ /* C_Y, */ - /* BOX_WIDTH - 2*C_X, */ + /* BOX_WIDTH - 2*CONTENT_OFFSET_X, */ /* BOX_HEIGHT - 2*C_Y, */ /* BOX_RADIOUS); */ /* cairo_close_path (cr); */ @@ -362,19 +401,21 @@ expose_event (GtkWidget *self, GdkEventExpose *event) 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, + 2*CONTENT_OFFSET_X, + TEXT_Y_OFFSET, MESSAGE_WIDTH, message_height); cairo_clip (cr); cairo_set_source_surface (cr, priv->message_surface, - 2*C_X, - HEADER_HEIGHT - priv->scroll_offset); + 2*CONTENT_OFFSET_X, + TEXT_Y_OFFSET - priv->scroll_offset); cairo_set_operator (cr, CAIRO_OPERATOR_OVER); cairo_paint (cr); @@ -384,6 +425,46 @@ expose_event (GtkWidget *self, GdkEventExpose *event) return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, event); } + +static void +clean_state (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + + if (priv->message) { + g_free (priv->message); + priv->message = NULL; + } + + if (priv->contact_id) { + g_free (priv->contact_id); + priv->contact_id = NULL; + } + if (priv->local_id) { + g_free (priv->local_id); + priv->local_id = NULL; + } + if (priv->remote_id) { + g_free (priv->remote_id); + priv->remote_id = NULL; + } + + if (priv->contact) { + g_object_unref (priv->contact); + priv->contact = 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; + } + osso_abook_roster_stop (priv->aggregator); + g_object_unref (priv->aggregator); + priv->aggregator = NULL; + } +} + static void dispose (GObject *self) { @@ -398,16 +479,13 @@ dispose (GObject *self) g_object_unref (priv->eventlogger); priv->eventlogger = NULL; } - - if (priv->message) { - g_free (priv->message); - priv->message = NULL; - } if (priv->font_desc) { pango_font_description_free (priv->font_desc); priv->font_desc = NULL; } + clean_state (EL_HOME_APPLET (self)); + G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self); } @@ -417,6 +495,124 @@ finalize (GObject *self) G_OBJECT_CLASS (el_home_applet_parent_class)->finalize (self); } +static void +aggregator_ready_cb (OssoABookWaitable *waitable, + const GError *error, + gpointer userdata) +{ + g_warning (G_STRFUNC); + ELHomeApplet *self = EL_HOME_APPLET(userdata); + ELHomeAppletPrivate *priv = self->priv; + GList *contacts = NULL; + + priv->aggregator_ready_closure = NULL; + + if (error) { + g_warning ("Failed to create aggregator: %s", error->message); + return; + } + + if (priv->contact_id) { + contacts = osso_abook_aggregator_lookup + (OSSO_ABOOK_AGGREGATOR (priv->aggregator), + priv->contact_id); + } + else if (priv->local_id && priv->remote_id) { + if (g_strcmp0 (priv->local_id, "ring/tel/ring" == 0)) { + contacts = osso_abook_aggregator_find_contacts_for_phone_number + (OSSO_ABOOK_AGGREGATOR (priv->aggregator), + priv->remote_id, + TRUE); + } + else { + McAccount *account; + account = osso_abook_account_manager_lookup_by_name + (NULL, + priv->local_id); + if (account) { + contacts = osso_abook_aggregator_find_contacts_for_im_contact + (OSSO_ABOOK_AGGREGATOR (priv->aggregator), + priv->remote_id, + account); + } + } + } + + if (contacts && contacts->data) { + GdkPixbuf *avatar_image; + + priv->contact = g_object_ref (OSSO_ABOOK_CONTACT (contacts->data)); + gtk_label_set_text (GTK_LABEL (priv->sender), + osso_abook_contact_get_display_name (priv->contact)); + avatar_image = osso_abook_avatar_get_image_rounded + (OSSO_ABOOK_AVATAR (priv->contact), + HILDON_ICON_PIXEL_SIZE_THUMB, + HILDON_ICON_PIXEL_SIZE_THUMB, + TRUE, + -1, + priv->border_color); + + g_warning ("contact's name %s\nid=%s\npid=%s", + osso_abook_contact_get_display_name (priv->contact), + osso_abook_contact_get_uid (priv->contact), + osso_abook_contact_get_persistent_uid (priv->contact)); + + + if (avatar_image) { + gtk_image_set_from_pixbuf (GTK_IMAGE (priv->avatar), + avatar_image); + gtk_widget_show (priv->avatar); + g_object_unref (avatar_image); + } + gtk_widget_queue_draw (GTK_WIDGET (self)); + } +} + +static void +resolve_contact (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + EBookQuery *query = NULL; + GError *error = NULL; + + g_warning ("%s %s %s %s", G_STRFUNC, priv->contact_id, priv->local_id, priv->remote_id); + + if (priv->local_id && priv->remote_id) { + const gchar *vcard = osso_abook_account_manager_get_vcard_field + (NULL, priv->local_id); + if (vcard) + query = e_book_query_vcard_field_test (vcard, + E_BOOK_QUERY_IS, + priv->remote_id); + else + query = e_book_query_any_field_contains (priv->remote_id); + } + + if (query) { + priv->aggregator = osso_abook_aggregator_new_with_query (NULL, + query, + NULL, + 1, + &error); + e_book_query_unref (query); + } + if (error) { + g_warning ("Failed to create aggregator: %s", error->message); + g_error_free (error); + return; + } + + if (priv->aggregator) { + priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready + (OSSO_ABOOK_WAITABLE (priv->aggregator), + aggregator_ready_cb, + self, NULL); + + osso_abook_roster_start (priv->aggregator); + g_warning ("AGG STARTED"); + } +} + static gchar* format_time (time_t t) { @@ -424,7 +620,7 @@ format_time (time_t t) time_t now; struct tm now_tm, t_tm; - const gchar *format = "%Y.%m.%d %T"; + const gchar *format = "%x %X"; gchar *result = g_malloc0 (RESULT_SIZE); now = time (NULL); @@ -434,7 +630,7 @@ format_time (time_t t) if ((now_tm.tm_year == t_tm.tm_year) && (now_tm.tm_mon == t_tm.tm_mon) && (now_tm.tm_mday == t_tm.tm_mday)) - format = "%T"; + format = "%X"; strftime (result, RESULT_SIZE, format, &t_tm); @@ -445,16 +641,11 @@ static void show_event (ELHomeApplet *self, RTComElIter *it) { ELHomeAppletPrivate *priv = self->priv; - + g_warning (G_STRFUNC); gchar *remote = NULL; gchar *received = NULL; const gchar *icon_name = NULL; - if (priv->message) { - g_free (priv->message); - priv->message = NULL; - } - if (it && rtcom_el_iter_first (it)) { rtcom_el_iter_dup_string (it, "free-text", &priv->message); if (priv->message) { @@ -465,8 +656,13 @@ show_event (ELHomeApplet *self, RTComElIter *it) if (rtcom_el_iter_get_int (it, "start-time", (gint*)&received_t)) received = format_time (received_t); + rtcom_el_iter_dup_string (it, "remote-uid", &priv->remote_id); if (!rtcom_el_iter_dup_string (it, "remote-name", &remote)) - rtcom_el_iter_dup_string (it, "remote-id", &remote); + remote = g_strdup (priv->remote_id); + + rtcom_el_iter_dup_string (it, "remote-ebook-uid", &priv->contact_id); + rtcom_el_iter_dup_string (it, "local-uid", &priv->local_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"; @@ -478,14 +674,24 @@ show_event (ELHomeApplet *self, RTComElIter *it) priv->event_id = -1; } - if (priv->message) + g_warning ("event_id=%d\nremote-uid=%s\nremote_name=%s", + priv->event_id, + priv->remote_id, + remote); + + gtk_widget_hide (priv->avatar); + + if (priv->message) { gtk_widget_hide (priv->empty); - else + } + else { gtk_widget_show (priv->empty); + } - 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), @@ -499,7 +705,12 @@ show_event (ELHomeApplet *self, RTComElIter *it) } else gtk_widget_hide (priv->icon); +#endif + if (remote) + gtk_label_set_text (GTK_LABEL (priv->sender), remote); + else + gtk_label_set_text (GTK_LABEL (priv->sender), priv->remote_id); g_free (remote); stop_scroll_anim (priv); @@ -508,6 +719,8 @@ show_event (ELHomeApplet *self, RTComElIter *it) cairo_surface_destroy (priv->message_surface); priv->message_surface = NULL; } + + gtk_widget_hide (priv->cut_message); gtk_widget_queue_draw (GTK_WIDGET (self)); } @@ -598,11 +811,15 @@ query_unread_events (RTComEl *el) static void read_event (ELHomeApplet *self) { + g_warning (G_STRFUNC); ELHomeAppletPrivate *priv = self->priv; RTComElIter *it = NULL; + clean_state (self); + it = make_query (priv->eventlogger, -1); show_event (self, it); + resolve_contact (self); if (it) g_object_unref (it); } @@ -610,15 +827,12 @@ static void mark_as_read (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - + g_warning (G_STRFUNC); if (priv->event_id >= 0) { rtcom_el_set_read_event (priv->eventlogger, priv->event_id, TRUE, NULL); - read_event (self); - priv->unread_count--; - update_unread_label (self); } } @@ -626,7 +840,7 @@ static gboolean read_new_event (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - + g_warning (G_STRFUNC); read_event (self); priv->unread_count = query_unread_events (priv->eventlogger); update_unread_label (self); @@ -657,6 +871,7 @@ new_event_cb (RTComEl *backend, const gchar *service, ELHomeApplet *self) { + /* TODO: avoid updating if not related */ add_new_idle (self); } @@ -668,14 +883,16 @@ scroll_anim_cb (ELHomeApplet *self) priv->scroll_offset += SCROLL_STEP; gtk_widget_queue_draw_area (GTK_WIDGET (self), - 3*C_X, - HEADER_HEIGHT + C_Y, + 3*CONTENT_OFFSET_X, + HEADER_HEIGHT + CONTENT_OFFSET_Y_TOP, MESSAGE_WIDTH, C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT); to_continue = priv->scroll_offset <= priv->hidden_message_height; - if (!to_continue) + if (!to_continue) { priv->scroll_anim_id = 0; + gtk_widget_hide (priv->cut_message); + } return to_continue; } @@ -685,25 +902,85 @@ button_press_event_cb (GtkWidget *widget, GdkEventButton *event, ELHomeApplet *self) { + g_warning (G_STRFUNC); ELHomeAppletPrivate *priv = self->priv; if (priv->event_id > 0) { - priv->active = TRUE; + if (event->y < CONTENT_OFFSET_Y_TOP + HEADER_HEIGHT) { + if (priv->aggregator && + osso_abook_waitable_is_ready + (OSSO_ABOOK_WAITABLE (priv->aggregator), NULL)) + priv->active_header = TRUE; + } + else + priv->active_body = TRUE; gtk_widget_queue_draw (widget); } return TRUE; } +static GtkWidget* +create_contact_starter_dialog (OssoABookAggregator *aggregator, const gchar *contact_id) +{ + GtkWidget *dialog = NULL; + 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)); + dialog = osso_abook_touch_contact_starter_dialog_new + (NULL, + OSSO_ABOOK_TOUCH_CONTACT_STARTER (starter)); + gtk_widget_show_all (starter); + } + + g_list_free (contacts); + + return dialog; +} + +static GtkWidget* +create_temporary_contact_dialog (const gchar *remote_id, + const gchar *account_id) +{ + GtkWidget *dialog = NULL; + const gchar *vcard = NULL; + + if (account_id) { + vcard = osso_abook_account_manager_get_vcard_field (NULL, account_id); + } + + if (vcard) { + EVCardAttribute *attribute = e_vcard_attribute_new (NULL, vcard); + + e_vcard_attribute_add_value (attribute, remote_id); + dialog = osso_abook_temporary_contact_dialog_new + (NULL, + NULL, /*EBook *book,*/ + attribute, + NULL /*McAccount *account*/); + g_signal_connect (dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + NULL); + e_vcard_attribute_free (attribute); + } + + return dialog; +} + static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; + g_warning (G_STRFUNC); - 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; @@ -719,6 +996,25 @@ button_release_event_cb (GtkWidget *widget, gtk_widget_queue_draw (widget); } + if (priv->active_header) { + GtkWidget *dialog = NULL; + priv->active_header = FALSE; + + if (priv->aggregator && priv->contact_id) + dialog = create_contact_starter_dialog + (OSSO_ABOOK_AGGREGATOR (priv->aggregator), + priv->contact_id); + if (!dialog && + priv->remote_id && + priv->local_id) + dialog = create_temporary_contact_dialog (priv->remote_id, + priv->local_id); + + if (dialog) + gtk_widget_show (dialog); + + gtk_widget_queue_draw (widget); + } return TRUE; } @@ -730,11 +1026,16 @@ 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; } @@ -744,7 +1045,7 @@ 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; @@ -758,25 +1059,34 @@ 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), 0.5f, - 0.5f); + 0.55f); gtk_label_set_ellipsize (GTK_LABEL (priv->sender), PANGO_ELLIPSIZE_END); gtk_widget_set_name (priv->sender, "hildon-shadow-label"); hildon_helper_set_logical_font (priv->sender, "SystemFont"); + gtk_widget_set_size_request (priv->sender, + -1, + HILDON_ICON_PIXEL_SIZE_THUMB); priv->message = g_strdup ("One two three four five six seven eight nine ten"); @@ -789,21 +1099,32 @@ 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->icon, FALSE, FALSE, 0); */ gtk_box_pack_start (GTK_BOX (hbox), priv->sender, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->avatar, FALSE, FALSE, 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), @@ -855,6 +1176,8 @@ el_home_applet_init (ELHomeApplet *self) self); read_new_event (self); + + osso_abook_init_with_name (PACKAGE, NULL); #endif }