X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=5e578c08ffc5710b41404978b6e2f29d4343bd44;hb=cdd7ecd9b32d9e68e18f294cefeb0020a65d9da8;hp=221e912cbbded138fd5a15c37ac42d8ecbd2f915;hpb=6d1653a480f516b96881ecd85363e8b3df3e69df;p=modest diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index 221e912..5e578c0 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 @@ -162,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); @@ -205,10 +207,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); @@ -285,9 +287,9 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, TnyFolder *folder) { 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); @@ -297,8 +299,13 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, 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)); + 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); @@ -308,18 +315,31 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, 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) { + 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); - if (!name) - name = g_strdup (tny_folder_get_name (folder)); + 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 +347,38 @@ 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: + 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 modest_details_dialog_create_container_default (ModestDetailsDialog *self) { @@ -343,7 +395,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); }