* src/widgets/modest-details-dialog.c:

[modest] / src / widgets / modest-details-dialog.c

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 3cd6c9b..e3b7278 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -30,6 +30,7 @@
 #include "modest-details-dialog.h"
 
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtkstock.h>
@@ -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);
 
@@ -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,12 +299,12 @@ 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 */
-       if (TNY_IS_FOLDER_STORE (folder)) {
-               count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder));
-               size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder));
-       } else {
+       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 */
@@ -322,9 +324,17 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        if (!name)      
                name = g_strdup (tny_folder_get_name (folder));
 
-       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_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);
@@ -332,6 +342,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)
 {
@@ -348,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);
 }