X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=de77559f90e633762e6dedde19635a21fb826461;hp=c269c4a8239a77413af743780bde9bbd4df281f6;hb=HEAD;hpb=61f07097af4b36b441b206ab25fc063928b8a928 diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index c269c4a..de77559 100644 --- a/src/widgets/modest-details-dialog.c +++ b/src/widgets/modest-details-dialog.c @@ -31,10 +31,7 @@ #include #include -#include -#include -#include -#include +#include #include #include #include @@ -44,19 +41,30 @@ #include #include #include /* for strlen */ +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#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, @@ -90,6 +98,7 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass) 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; } @@ -100,7 +109,8 @@ modest_details_dialog_init (ModestDetailsDialog *self) GtkWidget* modest_details_dialog_new_with_header (GtkWindow *parent, - TnyHeader *header) + TnyHeader *header, + gboolean get_size) { ModestDetailsDialog *dialog; @@ -112,7 +122,7 @@ modest_details_dialog_new_with_header (GtkWindow *parent, NULL)); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); - MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header); + 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); @@ -150,6 +160,13 @@ modest_details_dialog_add_data (ModestDetailsDialog *self, 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, @@ -158,6 +175,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, ModestDetailsDialogPrivate *priv; guint n_rows = 0; GtkWidget *label_w, *value_w; + gchar *secure_value; priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self); @@ -165,15 +183,26 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *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), @@ -188,6 +217,8 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_FILL, 0, 0); + + g_free (secure_value); } static void @@ -204,7 +235,8 @@ replace_recipients (gchar **recipients) static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, - TnyHeader *header) + TnyHeader *header, + gboolean get_size) { gchar *from = NULL, *subject = NULL, *to = NULL, *cc = NULL, *bcc = NULL; time_t received, sent; @@ -238,7 +270,11 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, 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; + } replace_recipients (&from); replace_recipients (&to); @@ -299,9 +335,11 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, } /* Set 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); + 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); + } /* Frees */ g_object_unref (datetime_formatter); @@ -313,11 +351,21 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, } 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 modest_details_dialog_set_folder_default (ModestDetailsDialog *self, TnyFolder *folder) { gchar *count_s, *size_s, *name = NULL; - gchar *tmp = NULL; guint size, count; g_return_if_fail (folder && TNY_IS_FOLDER (folder)); @@ -350,17 +398,29 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, 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); @@ -368,6 +428,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, 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) {