X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=e3b7278419e87e6f9349b1bde493e0b5bceb179f;hp=ca7313979b94a6b9d828a8dbdc0530f7df56efcc;hb=ca9da3e6c78e627a257e4eb0ec1cae87f56c5e0f;hpb=ec47f9c9669fccab54927a49c3c0f4233df2f180;ds=sidebyside diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index ca73139..e3b7278 100644 --- a/src/widgets/modest-details-dialog.c +++ b/src/widgets/modest-details-dialog.c @@ -30,6 +30,7 @@ #include "modest-details-dialog.h" #include +#include #include #include #include @@ -37,10 +38,11 @@ #include #include #include -#include +#include #include +#include #include - +#include /* for strlen */ static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, TnyHeader *header); @@ -161,6 +163,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, /* 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); gtk_misc_set_alignment (GTK_MISC (value_w), 0.0, 0.0); gtk_label_set_justify (GTK_LABEL (value_w), GTK_JUSTIFY_LEFT); @@ -190,7 +193,9 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, 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 */ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties")); gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); @@ -199,6 +204,8 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, folder_type = modest_tny_folder_guess_folder_type (folder); g_object_unref (folder); + g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID); + /* Get header data */ from = g_strdup (tny_header_get_from (header)); to = g_strdup (tny_header_get_to (header)); @@ -217,38 +224,48 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, if (cc == NULL) cc = g_strdup (""); - /* Add from and subject */ + /* Add from and subject for all folders */ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_from"), from); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_subject"), subject); - /* Set received (optional) */ - if ((folder_type != TNY_FOLDER_TYPE_SENT) && + + /* for inbox, user-created folders and archive: Received */ + if (received && (folder_type != TNY_FOLDER_TYPE_SENT) && (folder_type != TNY_FOLDER_TYPE_DRAFTS) && (folder_type != TNY_FOLDER_TYPE_OUTBOX)) { - gchar *received_s; + + modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", + received); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"), + date_time_buffer); + } - received_s = modest_text_utils_get_display_date (received); - if (received_s == NULL) - received_s = g_strdup (received_s); - modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"), received_s); - g_free (received_s); + /* for outbox, drafts: Modified: (_created) */ + if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) || + (folder_type == TNY_FOLDER_TYPE_OUTBOX) || + (folder_type == TNY_FOLDER_TYPE_SENT)) { + modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", + received); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"), + date_time_buffer); } - /* Set date sent (optional) */ - if ((folder_type != TNY_FOLDER_TYPE_DRAFTS)&& + /* for everyting except outbox, drafts: Sent */ + if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&& (folder_type != TNY_FOLDER_TYPE_OUTBOX)) { - gchar *sent_s; - - sent_s = modest_text_utils_get_display_date (sent); - if (sent_s == NULL) - sent_s = g_strdup (sent_s); - modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"), sent_s); - g_free (sent_s); + + modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", + sent); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"), + date_time_buffer); } - + /* Set To and CC */ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to); - modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc); + + /* only show cc when it's there */ + if (cc && strlen(cc) > 0) + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc); /* Set size */ if (size <= 0) @@ -269,33 +286,92 @@ static void modest_details_dialog_set_folder_default (ModestDetailsDialog *self, TnyFolder *folder) { - TnyFolderStats *stats; - gchar *count, *size_s; - gint size; + gchar *count_s, *size_s, *name = NULL; + gchar *tmp = NULL; + gint 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_folder_properties_close"), GTK_RESPONSE_CLOSE); + gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); - /* Get stats */ - stats = tny_folder_get_stats (folder); - count = g_strdup_printf ("%d", tny_folder_stats_get_all_count (stats)); - /* Format the size */ - size = tny_folder_stats_get_local_size (stats); + /* 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)); + } + + /* 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); - modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), - tny_folder_get_name (folder)); - modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count); - modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s); + /* Different names for the local folders */ + if (modest_tny_folder_is_local_folder (folder)) { + gint type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + if (type != TNY_FOLDER_TYPE_UNKNOWN) + name = g_strdup(modest_local_folder_info_get_type_display_name (type)); + } + + if (!name) + name = g_strdup (tny_folder_get_name (folder)); + + tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL); + modest_details_dialog_add_data (self, tmp, name); + g_free (tmp); + + tmp = g_strconcat (_("mcen_fi_folder_properties_messages"), ":", NULL); + modest_details_dialog_add_data (self, tmp, count_s); + g_free (tmp); + + tmp = g_strconcat (_("mcen_fi_folder_properties_size"), ":", NULL); + modest_details_dialog_add_data (self, tmp, size_s); + g_free (tmp); /* Frees */ + g_free (name); g_free (size_s); - g_free (count); - g_object_unref (stats); + g_free (count_s); +} + +static gboolean +on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata) +{ + GtkWidget *focused; + + focused = gtk_window_get_focus (window); + if (GTK_IS_SCROLLED_WINDOW (focused)) { + GtkAdjustment *vadj; + gboolean return_value; + + vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (focused)); + switch (event->keyval) { + case GDK_Up: + if (vadj->value > 0.0) { + g_signal_emit_by_name (G_OBJECT (focused), "scroll-child", GTK_SCROLL_STEP_UP, FALSE, + &return_value); + return TRUE; + } + break; + case GDK_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); + return TRUE; + } + break; + } + } + + return FALSE; } static void @@ -314,7 +390,11 @@ modest_details_dialog_create_container_default (ModestDetailsDialog *self) gtk_table_set_row_spacings (GTK_TABLE (priv->props_table), 1); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollbar), priv->props_table); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollbar), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->props_table), + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollbar))); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), scrollbar); gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); + + g_signal_connect (self, "key-press-event", G_CALLBACK (on_key_press_event), self); }