-/* Copyright (c) 2006, 2008, Nokia Corporation
+/* Copyright (c) 2006, Nokia Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#ifdef MODEST_TOOLKIT_HILDON2
-#include <hildon/hildon-pannable-area.h>
-#else
#include <gtk/gtkscrolledwindow.h>
-#endif
#include <gtk/gtktable.h>
#include <gtk/gtkstock.h>
#include <gtk/gtklabel.h>
#include <modest-tny-folder.h>
#include <modest-tny-account.h>
#include <modest-text-utils.h>
+#include <modest-datetime-formatter.h>
#include <string.h> /* for strlen */
static void modest_details_dialog_set_header_default (ModestDetailsDialog *self,
static void
modest_details_dialog_init (ModestDetailsDialog *self)
{
- MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self);
}
GtkWidget*
"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 */
"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 */
const gchar *label,
const gchar *value)
{
- ModestDetailsDialogPrivate *priv;
+ ModestDetailsDialogPrivate *priv;
guint n_rows = 0;
GtkWidget *label_w, *value_w;
modest_details_dialog_set_header_default (ModestDetailsDialog *self,
TnyHeader *header)
{
- gchar *from, *subject, *to, *cc;
+ gchar *from = NULL, *subject = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
time_t received, sent;
guint size;
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 */
gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties"));
folder = tny_header_get_folder (header);
- folder_type = modest_tny_folder_guess_folder_type (folder);
- g_object_unref (folder);
+ if (folder) {
+ folder_type = modest_tny_folder_guess_folder_type (folder);
+ g_object_unref (folder);
+ } else {
+ folder_type = TNY_FOLDER_TYPE_NORMAL;
+ }
g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID);
-
+
/* Get header data */
from = tny_header_dup_from (header);
to = tny_header_dup_to (header);
subject = tny_header_dup_subject (header);
cc = tny_header_dup_cc (header);
+ bcc = tny_header_dup_bcc (header);
received = tny_header_get_date_received (header);
sent = tny_header_get_date_sent (header);
size = tny_header_get_message_size (header);
if (cc == NULL)
cc = g_strdup ("");
+ if (!strcmp (subject, "")) {
+ g_free (subject);
+ subject = g_strdup (_("mail_va_no_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);
if (received && (folder_type != TNY_FOLDER_TYPE_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",
- received);
+ date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter,
+ received);
+
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"),
- date_time_buffer);
+ date_time_str);
}
/* for drafts (created) */
if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
- modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
- received);
+ 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);
if (cc && strlen(cc) > 0)
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
+ /* only show cc when it's there */
+ if (bcc && strlen(bcc) > 0)
+ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_bcc"), bcc);
+
/* 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);
g_free (cc);
+ g_free (bcc);
}
static void
{
gchar *count_s, *size_s, *name = NULL;
gchar *tmp = NULL;
- gint size, count;
+ guint 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"));
/* 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) ||
g_free (count_s);
}
-#ifndef MODEST_TOOLKIT_HILDON2
static gboolean
on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata)
{
return FALSE;
}
-#endif
static void
modest_details_dialog_create_container_default (ModestDetailsDialog *self)
{
ModestDetailsDialogPrivate *priv;
-#ifdef MODEST_TOOLKIT_HILDON2
- GtkWidget *pannable;
-#else
GtkWidget *scrollbar;
-#endif
priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self);
-
-#ifdef MODEST_TOOLKIT_HILDON2
- pannable= hildon_pannable_area_new ();
-#else
scrollbar = gtk_scrolled_window_new (NULL, NULL);
-#endif
gtk_window_set_default_size (GTK_WINDOW (self), 400, 220);
priv->props_table = gtk_table_new (0, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (priv->props_table), 12);
gtk_table_set_row_spacings (GTK_TABLE (priv->props_table), 1);
-
-#ifdef MODEST_TOOLKIT_HILDON2
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->props_table);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), pannable);
-#else
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);
- g_signal_connect (self, "key-press-event", G_CALLBACK (on_key_press_event), self);
-#endif
-
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