#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>
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);
date_time_buffer);
}
- /* for outbox, drafts: Modified: (_created) */
- if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
- (folder_type == TNY_FOLDER_TYPE_OUTBOX) ||
- (folder_type == TNY_FOLDER_TYPE_SENT)) {
+ /* for drafts (created) */
+ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
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"),
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);
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 {
- count = tny_folder_get_all_count (TNY_FOLDER (folder));
- size = tny_folder_get_local_size (TNY_FOLDER (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);
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);
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)
{
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);
}
projects / modest / blobdiff