X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachment-view.c;h=3628204cdeb2c4f548e4974bc7e7f73d5a3d64f0;hp=29a8e7bd9e30f0f1334b51e4283147c54086d02d;hb=b3189f988bc953765fd3cdb325c4dd883ac9f608;hpb=f65cf12510835b6adb63cf583872995940d6daa4 diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c index 29a8e7b..3628204 100644 --- a/src/widgets/modest-attachment-view.c +++ b/src/widgets/modest-attachment-view.c @@ -27,25 +27,29 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H #include +#endif /*HAVE_CONFIG_H*/ -//#include +#include #include #include #include +#include +#include +#include +#include +#include +#include -static GObjectClass *parent_class = NULL; +#define GET_SIZE_BUFFER_SIZE 128 -/* signals */ -enum { - ACTIVATE_SIGNAL, - LAST_SIGNAL -}; +static GObjectClass *parent_class = NULL; -typedef struct _ModestAttachmentViewPriv ModestAttachmentViewPriv; +typedef struct _ModestAttachmentViewPrivate ModestAttachmentViewPrivate; -struct _ModestAttachmentViewPriv +struct _ModestAttachmentViewPrivate { TnyMimePart *mime_part; @@ -55,21 +59,17 @@ struct _ModestAttachmentViewPriv guint get_size_idle_id; TnyStream *get_size_stream; - guint size; + guint64 size; PangoLayout *layout_full_filename; + gboolean is_purged; - gboolean button_pressed; - gdouble pressed_x, pressed_y; }; #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file" -#define GET_SIZE_BUFFER_SIZE 128 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPriv)) - -static guint signals[LAST_SIGNAL] = {0}; + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPrivate)) /* TnyMimePartView functions */ static TnyMimePart *modest_attachment_view_get_part (TnyMimePartView *self); @@ -80,8 +80,6 @@ static void modest_attachment_view_clear (TnyMimePartView *self); static void modest_attachment_view_clear_default (TnyMimePartView *self); /* Gtk events */ -static gint button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); -static gint button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); static void size_allocate (GtkWidget *widget, GtkAllocation *allocation); /* GObject and GInterface management */ @@ -92,10 +90,65 @@ static void tny_mime_part_view_init (gpointer g, gpointer iface_data); -static gboolean get_size_idle_func (gpointer data); static void update_filename_request (ModestAttachmentView *self); +static gboolean +idle_get_mime_part_size_cb (gpointer userdata) +{ + ModestAttachmentView *view = (ModestAttachmentView *) userdata; + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (view); + gchar *size_str; + gchar *label_text; + gdk_threads_enter (); + + if (GTK_WIDGET_VISIBLE (view)) { + size_str = modest_text_utils_get_display_size (priv->size); + label_text = g_strdup_printf (" (%s)", size_str); + g_free (size_str); + gtk_label_set_text (GTK_LABEL (priv->size_view), label_text); + g_free (label_text); + } + + gdk_threads_leave (); + + g_object_unref (view); + + return FALSE; +} + +static gpointer +get_mime_part_size_thread (gpointer thr_user_data) +{ + ModestAttachmentView *view = (ModestAttachmentView *) thr_user_data; + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (view); + gchar read_buffer[GET_SIZE_BUFFER_SIZE]; + TnyStream *stream; + gssize readed_size; + gssize total = 0; + + stream = tny_camel_mem_stream_new (); + tny_mime_part_decode_to_stream (priv->mime_part, stream); + tny_stream_reset (stream); + if (tny_stream_is_eos (stream)) { + tny_stream_close (stream); + stream = tny_mime_part_get_stream (priv->mime_part); + } + + while (!tny_stream_is_eos (stream)) { + readed_size = tny_stream_read (stream, read_buffer, GET_SIZE_BUFFER_SIZE); + total += readed_size; + } + + priv->size = total; + + g_idle_add (idle_get_mime_part_size_cb, g_object_ref (view)); + + g_object_unref (stream); + g_object_unref (view); + + return NULL; +} static TnyMimePart * modest_attachment_view_get_part (TnyMimePartView *self) @@ -106,7 +159,7 @@ modest_attachment_view_get_part (TnyMimePartView *self) static TnyMimePart * modest_attachment_view_get_part_default (TnyMimePartView *self) { - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); if (priv->mime_part) return TNY_MIME_PART (g_object_ref (priv->mime_part)); @@ -117,13 +170,12 @@ modest_attachment_view_get_part_default (TnyMimePartView *self) static void update_filename_request (ModestAttachmentView *self) { - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); - gint width, height; + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); + /* gint width, height; */ pango_layout_set_text (PANGO_LAYOUT (priv->layout_full_filename), gtk_label_get_text (GTK_LABEL (priv->filename_view)), -1); - pango_layout_get_pixel_size (priv->layout_full_filename, &width, &height); } @@ -135,44 +187,13 @@ modest_attachment_view_set_part (TnyMimePartView *self, TnyMimePart *mime_part) } -static gboolean -get_size_idle_func (gpointer data) -{ - ModestAttachmentView *self = (ModestAttachmentView *) data; - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); - gssize readed_size; - gchar read_buffer[GET_SIZE_BUFFER_SIZE]; - gchar *size_string; - - if (priv->get_size_stream == NULL) { - priv->get_size_stream = tny_mime_part_get_stream (priv->mime_part); - } - - readed_size = tny_stream_read (priv->get_size_stream, read_buffer, GET_SIZE_BUFFER_SIZE); - priv->size += readed_size; - - if (tny_stream_is_eos (priv->get_size_stream)) { - size_string = g_strdup_printf (" (%d kb)", priv->size / 1024); - gtk_label_set_text (GTK_LABEL (priv->size_view), size_string); - g_free (size_string); - - g_object_unref (priv->get_size_stream); - - gtk_widget_queue_resize (priv->size_view); - priv->get_size_stream = NULL; - priv->get_size_idle_id = 0; - } - - return (priv->get_size_stream != NULL); - -} - static void modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mime_part) { - ModestAttachmentViewPriv *priv = NULL; - const gchar *filename; - gchar *file_icon_name; + ModestAttachmentViewPrivate *priv = NULL; + gchar *filename = NULL; + gchar *file_icon_name = NULL; + gboolean show_size = FALSE; g_return_if_fail (TNY_IS_MIME_PART_VIEW (self)); g_return_if_fail (TNY_IS_MIME_PART (mime_part)); @@ -184,22 +205,33 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim priv->mime_part = mime_part; - if (priv->get_size_idle_id != 0) { - g_source_remove (priv->get_size_idle_id); - priv->get_size_idle_id = 0; - } - - if (priv->get_size_stream != NULL) { - g_object_unref (priv->get_size_stream); - priv->get_size_stream = NULL; - } - priv->size = 0; - - filename = tny_mime_part_get_filename (mime_part); - file_icon_name = modest_platform_get_file_icon_name (filename, - tny_mime_part_get_content_type (mime_part), - NULL); + priv->is_purged = tny_mime_part_is_purged (mime_part); + + if (TNY_IS_MSG (mime_part)) { + TnyHeader *header = tny_msg_get_header (TNY_MSG (mime_part)); + if (TNY_IS_HEADER (header)) { + filename = g_strdup (tny_header_get_subject (header)); + if (filename == NULL || filename[0] == '\0') + filename = g_strdup (_("mail_va_no_subject")); + if (priv->is_purged) + file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL); + else + file_icon_name = + modest_platform_get_file_icon_name ( + NULL, tny_mime_part_get_content_type (mime_part), NULL); + g_object_unref (header); + } + } else { + filename = g_strdup (tny_mime_part_get_filename (mime_part)); + if (priv->is_purged) { + file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL); + } else { + file_icon_name = modest_platform_get_file_icon_name ( + filename, tny_mime_part_get_content_type (mime_part), NULL); + show_size = TRUE; + } + } if (file_icon_name) { gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), file_icon_name, GTK_ICON_SIZE_MENU); @@ -208,12 +240,25 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), UNKNOWN_FILE_ICON, GTK_ICON_SIZE_MENU); } - gtk_label_set_text (GTK_LABEL (priv->filename_view), filename); + if (priv->is_purged) { + gchar * label_str = g_markup_printf_escaped( + "%s", + filename); + gtk_label_set_markup (GTK_LABEL (priv->filename_view), label_str); + g_free (label_str); + } else { + gtk_label_set_text (GTK_LABEL (priv->filename_view), filename); + } + g_free (filename); update_filename_request (MODEST_ATTACHMENT_VIEW (self)); - gtk_label_set_text (GTK_LABEL (priv->size_view), " "); + gtk_label_set_text (GTK_LABEL (priv->size_view), ""); - priv->get_size_idle_id = g_idle_add ((GSourceFunc) get_size_idle_func, (gpointer) self); + if (show_size) { + tny_camel_mem_stream_get_type (); + g_object_ref (self); + g_thread_create (get_mime_part_size_thread, self, FALSE, NULL); + } gtk_widget_queue_draw (GTK_WIDGET (self)); } @@ -228,7 +273,7 @@ modest_attachment_view_clear (TnyMimePartView *self) static void modest_attachment_view_clear_default (TnyMimePartView *self) { - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self); if (priv->mime_part != NULL) { g_object_unref (priv->mime_part); @@ -257,46 +302,6 @@ modest_attachment_view_clear_default (TnyMimePartView *self) gtk_widget_queue_draw (GTK_WIDGET (self)); } -static gint -button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (MODEST_ATTACHMENT_VIEW (user_data)); - - if (event->type == GDK_BUTTON_PRESS && event->button == 1) { - priv->button_pressed = TRUE; - priv->pressed_x = event->x; - priv->pressed_y = event->y; - } - return TRUE; -} - -static gint -button_release_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (MODEST_ATTACHMENT_VIEW (user_data)); - - if (event->type != GDK_BUTTON_RELEASE) - return TRUE; - - if ((priv->button_pressed) && - (event->type == GDK_BUTTON_RELEASE) && - (priv->pressed_x == event->x) && - (priv->pressed_y == event->y)) { - priv->button_pressed = FALSE; - if (event->button == 1) { - g_signal_emit (G_OBJECT (user_data), signals[ACTIVATE_SIGNAL], 0); - return TRUE; - } - } - priv->button_pressed = FALSE; - return TRUE; -} - - /** * modest_attachment_view_new: @@ -310,8 +315,6 @@ GtkWidget* modest_attachment_view_new (TnyMimePart *mime_part) { ModestAttachmentView *self = g_object_new (MODEST_TYPE_ATTACHMENT_VIEW, - "homogeneous", FALSE, - "spacing", 0, NULL); modest_attachment_view_set_part (TNY_MIME_PART_VIEW (self), mime_part); @@ -322,9 +325,9 @@ modest_attachment_view_new (TnyMimePart *mime_part) static void modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class) { - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (instance); + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (instance); PangoContext *context; - GtkWidget *icon_eventbox; + GtkWidget *box = NULL; priv->mime_part = NULL; priv->icon = gtk_image_new (); @@ -332,10 +335,10 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class) gtk_label_set_line_wrap (GTK_LABEL (priv->filename_view), FALSE); gtk_label_set_ellipsize (GTK_LABEL (priv->filename_view), PANGO_ELLIPSIZE_END); gtk_label_set_single_line_mode (GTK_LABEL (priv->filename_view), TRUE); - gtk_label_set_selectable (GTK_LABEL (priv->filename_view), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->filename_view), FALSE); priv->size_view = gtk_label_new (" "); gtk_label_set_line_wrap (GTK_LABEL (priv->size_view), FALSE); - gtk_label_set_selectable (GTK_LABEL (priv->size_view), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->size_view), FALSE); gtk_misc_set_alignment (GTK_MISC (priv->size_view), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (priv->filename_view), 0.0, 0.5); @@ -343,22 +346,25 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class) priv->get_size_stream = NULL; priv->size = 0; - icon_eventbox = gtk_event_box_new (); + box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), priv->icon, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), priv->filename_view, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), priv->size_view, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (instance), box); - gtk_container_add (GTK_CONTAINER (icon_eventbox), priv->icon); - gtk_box_pack_start (GTK_BOX (instance), icon_eventbox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (instance), priv->filename_view, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (instance), priv->size_view, FALSE, FALSE, 0); +/* gtk_widget_get_style */ +/* gtk_widget_modify_bg (instance, GTK_STATE_SELECTED, selection_color); */ context = gtk_widget_get_pango_context (priv->filename_view); priv->layout_full_filename = pango_layout_new (context); + + pango_layout_set_ellipsize (priv->layout_full_filename, PANGO_ELLIPSIZE_NONE); + + gtk_event_box_set_above_child (GTK_EVENT_BOX (instance), FALSE); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (instance), TRUE); + gtk_widget_set_events (GTK_WIDGET (instance), 0); - g_signal_connect (G_OBJECT (priv->filename_view), "button-press-event", G_CALLBACK (button_press_event), instance); - g_signal_connect (G_OBJECT (priv->filename_view), "button-release-event", G_CALLBACK (button_release_event), instance); - g_signal_connect (G_OBJECT (priv->size_view), "button-press-event", G_CALLBACK (button_press_event), instance); - g_signal_connect (G_OBJECT (priv->size_view), "button-release-event", G_CALLBACK (button_release_event), instance); - g_signal_connect (G_OBJECT (icon_eventbox), "button-press-event", G_CALLBACK (button_press_event), instance); - g_signal_connect (G_OBJECT (icon_eventbox), "button-release-event", G_CALLBACK (button_release_event), instance); + GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (instance), GTK_CAN_FOCUS); return; } @@ -366,7 +372,7 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class) static void modest_attachment_view_finalize (GObject *object) { - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (object); + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (object); if (priv->get_size_idle_id) { g_source_remove (priv->get_size_idle_id); @@ -391,10 +397,12 @@ modest_attachment_view_finalize (GObject *object) static void size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (widget); + ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (widget); gint width, width_diff; GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); + pango_layout_set_font_description (priv->layout_full_filename, pango_context_get_font_description(pango_layout_get_context (gtk_label_get_layout (GTK_LABEL (priv->filename_view))))); + pango_layout_get_pixel_size (priv->layout_full_filename, &width, NULL); width_diff = priv->filename_view->allocation.width - width; if (width_diff > 0) { @@ -426,21 +434,11 @@ modest_attachment_view_class_init (ModestAttachmentViewClass *klass) klass->get_part_func = modest_attachment_view_get_part_default; klass->set_part_func = modest_attachment_view_set_part_default; klass->clear_func = modest_attachment_view_clear_default; - klass->activate = NULL; widget_class->size_allocate = size_allocate; - g_type_class_add_private (object_class, sizeof (ModestAttachmentViewPriv)); + g_type_class_add_private (object_class, sizeof (ModestAttachmentViewPrivate)); - signals[ACTIVATE_SIGNAL] = - g_signal_new ("activate", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET(ModestAttachmentViewClass, activate), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - return; } @@ -483,7 +481,7 @@ modest_attachment_view_get_type (void) NULL /* interface_data */ }; - type = g_type_register_static (GTK_TYPE_HBOX, + type = g_type_register_static (GTK_TYPE_EVENT_BOX, "ModestAttachmentView", &info, 0);