#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include <tny-msg.h>
#include <tny-header.h>
#include <tny-header-view.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 */
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-helper.h>
+#endif
static void modest_details_dialog_set_header_default (ModestDetailsDialog *self,
- TnyHeader *header);
+ TnyHeader *header,
+ gboolean get_size);
static void modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
TnyFolder *foler);
+static void modest_details_dialog_set_message_size_default (ModestDetailsDialog *self,
+ guint message_size);
+
static void modest_details_dialog_create_container_default (ModestDetailsDialog *self);
static void modest_details_dialog_add_data_default (ModestDetailsDialog *self,
const gchar *label,
const gchar *value);
+static gboolean on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata);
+
+static void value_w_size_allocate (GtkWidget *label, GtkAllocation *allocation, gpointer data);
+
G_DEFINE_TYPE (ModestDetailsDialog,
modest_details_dialog,
klass->create_container_func = modest_details_dialog_create_container_default;
klass->add_data_func = modest_details_dialog_add_data_default;
klass->set_header_func = modest_details_dialog_set_header_default;
+ klass->set_message_size_func = modest_details_dialog_set_message_size_default;
klass->set_folder_func = modest_details_dialog_set_folder_default;
}
static void
modest_details_dialog_init (ModestDetailsDialog *self)
{
- MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self);
}
GtkWidget*
modest_details_dialog_new_with_header (GtkWindow *parent,
- TnyHeader *header)
+ TnyHeader *header,
+ gboolean get_size)
{
ModestDetailsDialog *dialog;
"transient-for", parent,
NULL));
- MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header);
+ MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog);
+ MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header, get_size);
/* Add close button */
gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
"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 */
MODEST_DETAILS_DIALOG_GET_CLASS (self)->add_data_func (self, label, value);
}
+void
+modest_details_dialog_set_message_size (ModestDetailsDialog *self,
+ guint size)
+{
+ MODEST_DETAILS_DIALOG_GET_CLASS (self)->set_message_size_func (self, size);
+}
+
static void
modest_details_dialog_add_data_default (ModestDetailsDialog *self,
const gchar *label,
ModestDetailsDialogPrivate *priv;
guint n_rows = 0;
GtkWidget *label_w, *value_w;
+ gchar *secure_value;
priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self);
/* Create label */
label_w = gtk_label_new (label);
- gtk_misc_set_alignment (GTK_MISC (label_w), 1.0, 0.0);
- gtk_label_set_justify (GTK_LABEL (label_w), GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment (GTK_MISC (label_w), 0.0, 0.0);
+ gtk_label_set_justify (GTK_LABEL (label_w), GTK_JUSTIFY_LEFT);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ hildon_helper_set_logical_color (label_w,
+ GTK_RC_FG, GTK_STATE_NORMAL, "SecondaryTextColor");
+#endif
+
+ /* Create secure value */
+ secure_value = modest_text_utils_get_secure_header (value, "");
/* 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);
+ value_w = gtk_label_new (secure_value);
+ g_signal_connect (G_OBJECT (value_w), "size-allocate",
+ G_CALLBACK (value_w_size_allocate), NULL);
+
+ gtk_label_set_line_wrap ((GtkLabel *) value_w, TRUE);
+ gtk_label_set_line_wrap_mode ((GtkLabel *) 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);
+ gtk_label_set_justify ((GtkLabel *) value_w, GTK_JUSTIFY_LEFT);
/* Attach label and value */
gtk_table_attach (GTK_TABLE (priv->props_table),
GTK_EXPAND|GTK_FILL,
GTK_SHRINK|GTK_FILL,
0, 0);
+
+ g_free (secure_value);
}
+static void
+replace_recipients (gchar **recipients)
+{
+
+ gchar *result;
+
+ result = modest_text_utils_simplify_recipients (*recipients);
+
+ g_free (*recipients);
+ *recipients = result;
+}
static void
modest_details_dialog_set_header_default (ModestDetailsDialog *self,
- TnyHeader *header)
+ TnyHeader *header,
+ gboolean get_size)
{
- 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 (get_size) {
+ size = tny_header_get_message_size (header);
+ } else {
+ size = -1;
+ }
- if (from == NULL)
- from = g_strdup ("");
- if (to == NULL)
- to = g_strdup ("");
+ replace_recipients (&from);
+ replace_recipients (&to);
+ replace_recipients (&cc);
if (subject == NULL)
subject = g_strdup ("");
- 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);
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) {
+ replace_recipients (&bcc);
+ 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
+ if (get_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);
+ 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
+modest_details_dialog_set_message_size_default (ModestDetailsDialog *self,
+ guint size)
+{
+ gchar *size_s;
+ 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);
+ gtk_widget_show_all (GTK_WIDGET (self));
}
static void
TnyFolder *folder)
{
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) ||
name = g_strdup (tny_folder_get_name (folder));
}
- tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
+ modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), name);
+#else
+ gchar *tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
modest_details_dialog_add_data (self, tmp, name);
g_free (tmp);
+#endif
+#ifdef MODEST_TOOLKIT_HILDON2
+ modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count_s);
+#else
tmp = g_strconcat (_("mcen_fi_folder_properties_messages"), ":", NULL);
modest_details_dialog_add_data (self, tmp, count_s);
g_free (tmp);
+#endif
+#ifdef MODEST_TOOLKIT_HILDON2
+ modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s);
+#else
tmp = g_strconcat (_("mcen_fi_folder_properties_size"), ":", NULL);
modest_details_dialog_add_data (self, tmp, size_s);
g_free (tmp);
+#endif
/* Frees */
g_free (name);
g_free (count_s);
}
+static void
+value_w_size_allocate (GtkWidget *label, GtkAllocation *allocation, gpointer data)
+{
+ gtk_widget_set_size_request(label, allocation->width, -1);
+}
+
static gboolean
on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata)
{
projects / modest / blobdiff