X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fel-home-applet.c;h=b0e9efe31565b9cdeac0ca985888596113b26dc8;hb=0aa2f175ab6794325880ca998bbc2db021647b5d;hp=fe48da627ca18577132952334965d17d4575289f;hpb=40b72b3a8760fd85a5c68203c247c27b54180930;p=conv-inbox diff --git a/src/el-home-applet.c b/src/el-home-applet.c index fe48da6..b0e9efe 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -33,7 +33,7 @@ EL_TYPE_HOME_APPLET, ELHomeAppletPrivate)) #define BOX_WIDTH 352 -#define BOX_HEIGHT 252 +#define BOX_HEIGHT 256 #define C_WIDTH (BOX_WIDTH - 2*HILDON_MARGIN_HALF) #define C_HEIGHT (BOX_HEIGHT - 2*HILDON_MARGIN_HALF) @@ -51,24 +51,37 @@ struct _ELHomeAppletPrivate RTComEl *eventlogger; GtkWidget *sender; - GtkWidget *message; GtkWidget *icon; GtkWidget *unread; + GtkWidget *received; + GtkWidget *empty; - gint event_id; + gchar *message; + gint event_id; - gboolean active; + gboolean active; guint unread_count; - const gchar *current_font; + struct { + float red; + float green; + float blue; + } active_color; + PangoFontDescription *font_desc; + + guint idle_id; + + gboolean scroll_on_click; + gint scroll_offset; + guint scroll_anim_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; @@ -125,24 +138,111 @@ rounded_rectangle (cairo_t *cr, } static gboolean +draw_text (cairo_t *cr, + PangoFontDescription *desc, + const gchar *text, + double x, + double y, + int width, + int height, + int offset) +{ + PangoLayout *layout; + gboolean result; + PangoRectangle extent; + + cairo_save (cr); + cairo_rectangle (cr, + x, y, width, height); + cairo_clip (cr); + + /* Create a PangoLayout, set the font and text */ + layout = pango_cairo_create_layout (cr); + pango_layout_set_text (layout, + text, + -1); + 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); + + /* 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); + + /* 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); + + g_object_unref (layout); + cairo_restore (cr); + + return result; +} + +static void +stop_scroll_anim (ELHomeAppletPrivate *priv) +{ + if (priv->scroll_anim_id > 0) { + g_source_remove (priv->scroll_anim_id); + priv->scroll_anim_id = 0; + priv->scroll_on_click = FALSE; + } +} + +static void +style_set_cb (GtkWidget *widget, + GtkStyle *previous_style, + ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + GdkColor color; + GtkStyle *font_style; + + font_style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), + "SystemFont", + NULL, + G_TYPE_NONE); + 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); + } + + if (gtk_style_lookup_color (widget->style, + "ActiveTextColor", + &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; + } +} + +static gboolean expose_event (GtkWidget *self, GdkEventExpose *event) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; - cairo_t *cr; - GdkColor color; - float red, green, blue; + int message_height; - /* find theme active color */ - gtk_style_lookup_color (self->style, "ActiveTextColor", &color); - red = color.red/(float)G_MAXUINT16; - green = color.green/(float)G_MAXUINT16; - blue = color.blue/(float)G_MAXUINT16; + message_height = C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT; cr = gdk_cairo_create (self->window); gdk_cairo_region (cr, event->region); cairo_clip (cr); + /* draw bound box */ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.1f); @@ -155,9 +255,10 @@ 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 */ cairo_set_line_width (cr, 1.0f); cairo_translate (cr, C_X, C_Y); @@ -169,13 +270,18 @@ 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); cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f); cairo_fill_preserve (cr); - cairo_set_source_rgba (cr, red, green, blue, 1.0f); + cairo_set_source_rgba (cr, + priv->active_color.red, + priv->active_color.green, + priv->active_color.blue, + 1.0f); cairo_stroke (cr); + /* draw body */ cairo_move_to (cr, 0, HEADER_HEIGHT); cairo_line_to (cr, 0, C_HEIGHT - BOX_RADIOUS); cairo_curve_to (cr, 0, C_HEIGHT, 0, C_HEIGHT, BOX_RADIOUS, C_HEIGHT); @@ -183,12 +289,34 @@ 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); - - if (priv->active) - cairo_set_source_rgba (cr, red, green, blue, 0.8f); - else - cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.8f); + 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); + + if (priv->active) { + cairo_pattern_add_color_stop_rgba (grad, + 0.5f, + priv->active_color.red, + priv->active_color.green, + priv->active_color.blue, + 0.8f); + cairo_pattern_add_color_stop_rgba (grad, + 1.0f, + priv->active_color.red/2, + priv->active_color.green/2, + priv->active_color.blue/2, + 0.8f); + } + else { + cairo_pattern_add_color_stop_rgba (grad, 0.5f, + 0.4f, 0.4f, 0.4f, 0.8f); + cairo_pattern_add_color_stop_rgba (grad, 1.0f, + 0.2f, 0.2f, 0.2f, 0.8f); + } + cairo_set_source (cr, grad); cairo_fill (cr); /* cairo_set_source_rgba (cr, red, green, blue, 1.0f); */ @@ -199,11 +327,27 @@ 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; + + 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); } @@ -212,11 +356,25 @@ dispose (GObject *self) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; - if (priv->eventlogger){ + stop_scroll_anim (priv); + if (priv->idle_id) { + g_source_remove (priv->idle_id); + priv->idle_id = 0; + } + if (priv->eventlogger) { 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; + } + G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self); } @@ -226,23 +384,55 @@ finalize (GObject *self) G_OBJECT_CLASS (el_home_applet_parent_class)->finalize (self); } +static gchar* +format_time (time_t t) +{ + static const guint RESULT_SIZE = 32; + + time_t now; + struct tm now_tm, t_tm; + const gchar *format = "%Y.%m.%d %T"; + gchar *result = g_malloc0 (RESULT_SIZE); + + now = time (NULL); + localtime_r (&now, &now_tm); + localtime_r (&t, &t_tm); + + 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"; + + strftime (result, RESULT_SIZE, format, &t_tm); + + return result; +} + static void show_event (ELHomeApplet *self, RTComElIter *it) { ELHomeAppletPrivate *priv = self->priv; - gchar *message = NULL; gchar *remote = NULL; + gchar *received = NULL; const gchar *icon_name = NULL; - if (it && rtcom_el_iter_first (it)){ - rtcom_el_iter_dup_string (it, "free-text", &message); - if (message){ + 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) { const gchar *service; + time_t received_t; rtcom_el_iter_get_int (it, "id", &priv->event_id); + 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); service = rtcom_el_iter_get_service (it); if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS")) @@ -251,13 +441,19 @@ show_event (ELHomeApplet *self, RTComElIter *it) icon_name = "chat_unread_chat"; } } - else{ + else { priv->event_id = -1; } - gtk_label_set_text (GTK_LABEL (priv->message), message); + if (priv->message) + gtk_widget_hide (priv->empty); + else + gtk_widget_show (priv->empty); + gtk_label_set_text (GTK_LABEL (priv->sender), remote); - if (icon_name){ + gtk_label_set_text (GTK_LABEL (priv->received), received); + + if (icon_name) { const gchar *current_icon_name; gtk_image_get_icon_name (GTK_IMAGE (priv->icon), ¤t_icon_name, @@ -271,8 +467,11 @@ show_event (ELHomeApplet *self, RTComElIter *it) else gtk_widget_hide (priv->icon); - g_free (message); g_free (remote); + + stop_scroll_anim (self->priv); + priv->scroll_offset = 0; + gtk_widget_queue_draw (GTK_WIDGET (self)); } static RTComElIter* @@ -290,7 +489,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, @@ -298,7 +497,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, @@ -306,7 +505,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; } @@ -317,9 +516,13 @@ update_unread_label (ELHomeApplet *self) ELHomeAppletPrivate *priv = self->priv; gchar *text; - text = g_strdup_printf ("%d", priv->unread_count); - gtk_label_set_text (GTK_LABEL (priv->unread), text); - g_free (text); + 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); + } + else + gtk_label_set_text (GTK_LABEL (priv->unread), NULL); } static gint @@ -336,17 +539,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); } @@ -371,7 +574,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, @@ -382,6 +585,31 @@ mark_as_read (ELHomeApplet *self) } } +static gboolean +read_new_event (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + + read_event (self); + priv->unread_count = query_unread_events (priv->eventlogger); + update_unread_label (self); + + priv->idle_id = 0; + + return FALSE; +} + +static void +add_new_idle (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + + if (priv->idle_id) + g_source_remove (priv->idle_id); + priv->idle_id = g_idle_add ((GSourceFunc)read_new_event, + self); +} + static void new_event_cb (RTComEl *backend, gint event_id, @@ -392,66 +620,55 @@ new_event_cb (RTComEl *backend, const gchar *service, ELHomeApplet *self) { - ELHomeAppletPrivate *priv = self->priv; - RTComElIter *it = NULL; - - it = make_query (priv->eventlogger, event_id); - if (it){ - if (rtcom_el_iter_first (it)){ - show_event (self, it); - priv->unread_count++; - update_unread_label (self); - } - g_object_unref (it); - } + add_new_idle (self); } -static void -event_updated_cb (RTComEl *backend, - gint event_id, - const gchar *local_uid, - const gchar *remote_uid, - const gchar *remote_ebook_uid, - const gchar *group_uid, - const gchar *service, - ELHomeApplet *self) +static gboolean +scroll_anim_cb (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (event_id == priv->event_id) - read_event (self); + priv->scroll_offset += 1; + gtk_widget_queue_draw (GTK_WIDGET (self)); - priv->unread_count = query_unread_events (priv->eventlogger); - update_unread_label (self); + return TRUE; } static gboolean -button_release_event_cb (GtkWidget *widget, - GdkEventButton *event, - ELHomeApplet *self) +button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (priv->active){ - priv->active = FALSE; + if (priv->event_id > 0) { + priv->active = TRUE; gtk_widget_queue_draw (widget); -#ifndef DEBUG_LAYOUT - mark_as_read (self); -#endif } return TRUE; } static gboolean -button_press_event_cb (GtkWidget *widget, - GdkEventButton *event, - ELHomeApplet *self) +button_release_event_cb (GtkWidget *widget, + GdkEventButton *event, + ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (priv->event_id > 0){ - priv->active = TRUE; + if (priv->active) { + priv->active = FALSE; + stop_scroll_anim (priv); + if (priv->scroll_on_click) { + priv->scroll_on_click = FALSE; + priv->scroll_anim_id = g_timeout_add (100, + (GSourceFunc)scroll_anim_cb, + self); + } + else +#ifndef DEBUG_LAYOUT + mark_as_read (self); +#endif gtk_widget_queue_draw (widget); } @@ -465,8 +682,9 @@ leave_notify_event_cb (GtkWidget *widget, { ELHomeAppletPrivate *priv = self->priv; - if (priv->active){ + if (priv->active) { priv->active = FALSE; + stop_scroll_anim (priv); gtk_widget_queue_draw (widget); } @@ -512,19 +730,22 @@ el_home_applet_init (ELHomeApplet *self) gtk_widget_set_name (priv->sender, "hildon-shadow-label"); hildon_helper_set_logical_font (priv->sender, "SystemFont"); - priv->message = g_object_new (GTK_TYPE_LABEL, - "label", "asdf asdf adsf asdf asdf asdf asdf asdf", - "wrap", TRUE, - "wrap-mode", PANGO_WRAP_WORD_CHAR, - NULL); + priv->message = g_strdup ("One two three four five six seven eight nine ten"); + + /* TODO: l10n */ + priv->empty = gtk_label_new ("No new messages"); + gtk_widget_set_name (priv->empty, "hildon-shadow-label"); + GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL); - gtk_misc_set_alignment (GTK_MISC (priv->message), - 0.0f, - 0.0f); - gtk_widget_set_size_request (priv->message, + priv->received = gtk_label_new ("aewf aewf aewf awef"); + gtk_misc_set_alignment (GTK_MISC (priv->received), + 1.0f, + 0.5f); + gtk_widget_set_size_request (priv->received, MESSAGE_WIDTH, - MESSAGE_HEIGHT); - gtk_widget_set_name (priv->message, "hildon-shadow-label"); + -1); + hildon_helper_set_logical_font (priv->received, "SmallSystemFont"); + gtk_widget_set_name (priv->received, "hildon-shadow-label"); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), priv->unread, FALSE, FALSE, 0); @@ -533,7 +754,8 @@ el_home_applet_init (ELHomeApplet *self) 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->message, TRUE, TRUE, 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); align = gtk_alignment_new (0.5f, 0.0f, 1.0f, 1.0f); gtk_alignment_set_padding (GTK_ALIGNMENT (align), @@ -556,6 +778,8 @@ el_home_applet_init (ELHomeApplet *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); + gtk_widget_show_all (GTK_WIDGET (event_box)); #ifndef DEBUG_LAYOUT @@ -566,12 +790,10 @@ el_home_applet_init (ELHomeApplet *self) self); g_signal_connect (priv->eventlogger, "event-updated", - G_CALLBACK (event_updated_cb), + G_CALLBACK (new_event_cb), self); - read_event (self); - priv->unread_count = query_unread_events (priv->eventlogger); - update_unread_label (self); + read_new_event (self); #endif }