X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=5d2eddc79db75151873814add0c9c96ba5803e0e;hb=5f456f4b288067f9de646b31adabedef5a7171af;hp=2aeff6b40283b7ec1fc20441b8148c09468637bc;hpb=5b325cd7be1088e885786f7a9065659e6baf7614;p=modest diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index 2aeff6b..5d2eddc 100644 --- a/src/widgets/modest-details-dialog.c +++ b/src/widgets/modest-details-dialog.c @@ -31,10 +31,7 @@ #include #include -#include -#include -#include -#include +#include #include #include #include @@ -42,14 +39,19 @@ #include #include #include +#include #include /* for strlen */ static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, - TnyHeader *header); + TnyHeader *header, + gboolean get_size); static void modest_details_dialog_set_folder_default (ModestDetailsDialog *self, TnyFolder *foler); +static void modest_details_dialog_set_message_size_default (ModestDetailsDialog *self, + guint message_size); + static void modest_details_dialog_create_container_default (ModestDetailsDialog *self); static void modest_details_dialog_add_data_default (ModestDetailsDialog *self, @@ -89,18 +91,19 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass) klass->create_container_func = modest_details_dialog_create_container_default; klass->add_data_func = modest_details_dialog_add_data_default; klass->set_header_func = modest_details_dialog_set_header_default; + klass->set_message_size_func = modest_details_dialog_set_message_size_default; klass->set_folder_func = modest_details_dialog_set_folder_default; } static void modest_details_dialog_init (ModestDetailsDialog *self) { - MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self); } GtkWidget* modest_details_dialog_new_with_header (GtkWindow *parent, - TnyHeader *header) + TnyHeader *header, + gboolean get_size) { ModestDetailsDialog *dialog; @@ -111,7 +114,11 @@ modest_details_dialog_new_with_header (GtkWindow *parent, "transient-for", parent, NULL)); - MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header, get_size); + + /* Add close button */ + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); return GTK_WIDGET (dialog); } @@ -129,8 +136,12 @@ modest_details_dialog_new_with_folder (GtkWindow *parent, "transient-for", parent, NULL)); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_folder_func (dialog, folder); + /* Add close button */ + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); + return GTK_WIDGET (dialog); } @@ -142,6 +153,13 @@ modest_details_dialog_add_data (ModestDetailsDialog *self, MODEST_DETAILS_DIALOG_GET_CLASS (self)->add_data_func (self, label, value); } +void +modest_details_dialog_set_message_size (ModestDetailsDialog *self, + guint size) +{ + MODEST_DETAILS_DIALOG_GET_CLASS (self)->set_message_size_func (self, size); +} + static void modest_details_dialog_add_data_default (ModestDetailsDialog *self, const gchar *label, @@ -150,6 +168,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, ModestDetailsDialogPrivate *priv; guint n_rows = 0; GtkWidget *label_w, *value_w; + gchar *secure_value; priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self); @@ -160,12 +179,15 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, gtk_misc_set_alignment (GTK_MISC (label_w), 1.0, 0.0); gtk_label_set_justify (GTK_LABEL (label_w), GTK_JUSTIFY_RIGHT); + /* Create secure value */ + secure_value = modest_text_utils_get_secure_header (value, ""); + /* Create value */ - value_w = gtk_label_new (value); - gtk_label_set_line_wrap (GTK_LABEL (value_w), TRUE); - gtk_label_set_line_wrap_mode (GTK_LABEL (value_w), PANGO_WRAP_WORD_CHAR); + value_w = gtk_label_new (secure_value); + gtk_label_set_line_wrap ((GtkLabel *) value_w, TRUE); + gtk_label_set_line_wrap_mode ((GtkLabel *) value_w, PANGO_WRAP_WORD_CHAR); gtk_misc_set_alignment (GTK_MISC (value_w), 0.0, 0.0); - gtk_label_set_justify (GTK_LABEL (value_w), GTK_JUSTIFY_LEFT); + gtk_label_set_justify ((GtkLabel *) value_w, GTK_JUSTIFY_LEFT); /* Attach label and value */ gtk_table_attach (GTK_TABLE (priv->props_table), @@ -180,49 +202,75 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_FILL, 0, 0); + + g_free (secure_value); } +static void +replace_recipients (gchar **recipients) +{ + + gchar *result; + + result = modest_text_utils_simplify_recipients (*recipients); + + g_free (*recipients); + *recipients = result; +} static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, - TnyHeader *header) + TnyHeader *header, + gboolean get_size) { - gchar *from, *subject, *to, *cc; + gchar *from = NULL, *subject = NULL, *to = NULL, *cc = NULL, *bcc = NULL; time_t received, sent; guint size; gchar *size_s; TnyFolder *folder; TnyFolderType folder_type; -#define DATE_TIME_BUFFER_SIZE 128 - gchar date_time_buffer [DATE_TIME_BUFFER_SIZE]; - - /* Set window title & Add close button */ + ModestDatetimeFormatter *datetime_formatter; + const gchar *date_time_str; + + datetime_formatter = modest_datetime_formatter_new (); + + /* Set window title */ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties")); - gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); folder = tny_header_get_folder (header); - folder_type = modest_tny_folder_guess_folder_type (folder); - g_object_unref (folder); + if (folder) { + folder_type = modest_tny_folder_guess_folder_type (folder); + g_object_unref (folder); + } else { + folder_type = TNY_FOLDER_TYPE_NORMAL; + } g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID); - + /* Get header data */ from = tny_header_dup_from (header); to = tny_header_dup_to (header); subject = tny_header_dup_subject (header); cc = tny_header_dup_cc (header); + bcc = tny_header_dup_bcc (header); received = tny_header_get_date_received (header); sent = tny_header_get_date_sent (header); - size = tny_header_get_message_size (header); + if (get_size) { + size = tny_header_get_message_size (header); + } else { + size = -1; + } - if (from == NULL) - from = g_strdup (""); - if (to == NULL) - to = g_strdup (""); + replace_recipients (&from); + replace_recipients (&to); + replace_recipients (&cc); if (subject == NULL) subject = g_strdup (""); - if (cc == NULL) - cc = g_strdup (""); + + if (!strcmp (subject, "")) { + g_free (subject); + subject = g_strdup (_("mail_va_no_subject")); + } /* Add from and subject for all folders */ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_from"), from); @@ -233,31 +281,31 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, if (received && (folder_type != TNY_FOLDER_TYPE_SENT) && (folder_type != TNY_FOLDER_TYPE_DRAFTS) && (folder_type != TNY_FOLDER_TYPE_OUTBOX)) { - - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - received); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"), - date_time_buffer); + date_time_str); } /* for drafts (created) */ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - received); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"), - date_time_buffer); + date_time_str); } /* for everyting except outbox, drafts: Sent */ if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&& (folder_type != TNY_FOLDER_TYPE_OUTBOX)) { - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - sent); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + sent); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"), - date_time_buffer); + date_time_str); } - + /* Set To and CC */ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to); @@ -265,19 +313,37 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, if (cc && strlen(cc) > 0) modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc); + /* only show cc when it's there */ + if (bcc && strlen(bcc) > 0) { + replace_recipients (&bcc); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_bcc"), bcc); + } + /* Set size */ - if (size <= 0) - size_s = g_strdup (_("mcen_va_message_properties_size_noinfo")); - else + if (get_size) { size_s = modest_text_utils_get_display_size (size); - modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s); - g_free (size_s); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s); + g_free (size_s); + } /* Frees */ + g_object_unref (datetime_formatter); g_free (to); g_free (from); g_free (subject); g_free (cc); + g_free (bcc); +} + +static void +modest_details_dialog_set_message_size_default (ModestDetailsDialog *self, + guint size) +{ + gchar *size_s; + size_s = modest_text_utils_get_display_size (size); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s); + g_free (size_s); + gtk_widget_show_all (GTK_WIDGET (self)); } static void @@ -286,31 +352,22 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, { gchar *count_s, *size_s, *name = NULL; gchar *tmp = NULL; - gint size, count; + guint size, count; g_return_if_fail (folder && TNY_IS_FOLDER (folder)); g_return_if_fail (modest_tny_folder_guess_folder_type (folder) != TNY_FOLDER_TYPE_INVALID); - + /* Set window title */ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties")); - gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); /* Get data. We use our function because it's recursive */ - if (TNY_IS_FOLDER (folder)) { - count = tny_folder_get_all_count (TNY_FOLDER (folder)); - size = tny_folder_get_local_size (TNY_FOLDER (folder)); - } else { - count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder)); - size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder)); - } + count = tny_folder_get_all_count (TNY_FOLDER (folder)); + size = tny_folder_get_local_size (TNY_FOLDER (folder)); /* Format count and size */ count_s = g_strdup_printf ("%d", count); - if (size <= 0) - size_s = g_strdup (_("mcen_va_message_properties_size_noinfo")); - else - size_s = modest_text_utils_get_display_size (size); + size_s = modest_text_utils_get_display_size (size); /* Different names for the local folders */ if (modest_tny_folder_is_local_folder (folder) || @@ -358,6 +415,7 @@ on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata) vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (focused)); switch (event->keyval) { case GDK_Up: + case GDK_KP_Up: if (vadj->value > 0.0) { g_signal_emit_by_name (G_OBJECT (focused), "scroll-child", GTK_SCROLL_STEP_UP, FALSE, &return_value); @@ -365,6 +423,7 @@ on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata) } break; case GDK_Down: + case GDK_KP_Down: if (vadj->value < vadj->upper - vadj->page_size) { g_signal_emit_by_name (G_OBJECT (focused), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE, &return_value);