X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=f60a829986cb8a8531912fb2ff75d9290eb6dafb;hp=3a8ec1c65a57d0f189ce13e0fc6ced14f65a4297;hb=696513af58477062f87cf9095ba2760f7492ade0;hpb=9373a406dc6ac62a374958051d1f72b7bff79642 diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index 3a8ec1c..f60a829 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 @@ -41,6 +42,7 @@ #include #include #include +#include #include /* for strlen */ static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, @@ -94,7 +96,6 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass) static void modest_details_dialog_init (ModestDetailsDialog *self) { - MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self); } GtkWidget* @@ -110,8 +111,12 @@ modest_details_dialog_new_with_header (GtkWindow *parent, "transient-for", parent, NULL)); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header); + /* Add close button */ + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE); + return GTK_WIDGET (dialog); } @@ -128,8 +133,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); } @@ -162,6 +171,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); @@ -191,12 +201,13 @@ 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]; + ModestDatetimeFormatter *datetime_formatter; + const gchar *date_time_str; + + datetime_formatter = modest_datetime_formatter_new (); - /* Set window title & Add close button */ + /* 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); @@ -205,10 +216,10 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, 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)); - subject = g_strdup (tny_header_get_subject (header)); - cc = g_strdup (tny_header_get_cc (header)); + from = tny_header_dup_from (header); + to = tny_header_dup_to (header); + subject = tny_header_dup_subject (header); + cc = tny_header_dup_cc (header); received = tny_header_get_date_received (header); sent = tny_header_get_date_sent (header); size = tny_header_get_message_size (header); @@ -231,33 +242,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)) { + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); - 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); + date_time_str); } - /* 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); + /* for drafts (created) */ + if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { + 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); @@ -266,14 +275,12 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc); /* Set size */ - 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); 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); @@ -285,41 +292,50 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, TnyFolder *folder) { gchar *count_s, *size_s, *name = NULL; - gint size, count; - + gchar *tmp = NULL; + guint size, count; g_return_if_fail (folder && TNY_IS_FOLDER (folder)); - g_return_if_fail (modest_tny_folder_get_local_or_mmc_folder_type (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 */ - 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)) { + if (modest_tny_folder_is_local_folder (folder) || + modest_tny_folder_is_memory_card_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)); + if (!name) { + if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) + name = g_strdup (_("mcen_me_folder_inbox")); + else + 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); - modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), name); - modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count_s); - modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s); + 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); @@ -327,6 +343,40 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, 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: + 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); + return TRUE; + } + 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); + return TRUE; + } + break; + } + } + + return FALSE; +} + static void modest_details_dialog_create_container_default (ModestDetailsDialog *self) { @@ -343,7 +393,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); }