X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-mail-header-view.c;h=3875202c871a6a5ecfa2a7e0c3c80fa5a150c982;hb=fb20b9c67740dddfb1cd235692173e0495260bf3;hp=629feba771b5209da5e131662da482656a52f2e0;hpb=1e269a39bd6e1c33e72e98b72f59f810d8f64e8a;p=modest diff --git a/src/widgets/modest-mail-header-view.c b/src/widgets/modest-mail-header-view.c index 629feba..3875202 100644 --- a/src/widgets/modest-mail-header-view.c +++ b/src/widgets/modest-mail-header-view.c @@ -87,7 +87,7 @@ add_date_time_header (ModestMailHeaderView *mail_header, const gchar *name, time label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), name); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0); gtk_box_pack_start (GTK_BOX (date_hbox), label, FALSE, FALSE, 0); gtk_size_group_add_widget (priv->labels_size_group, label); @@ -133,7 +133,7 @@ add_header (ModestMailHeaderView *widget, const gchar *field, const gchar *value hbox = gtk_hbox_new (FALSE, 12); label_field = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_field), field); - gtk_misc_set_alignment (GTK_MISC (label_field), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (label_field), 1.0, 0.0); scroll_text = modest_scroll_text_new (NULL, 2); label_value = (GtkWidget *) modest_scroll_text_get_text_view (MODEST_SCROLL_TEXT (scroll_text)); text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (label_value)); @@ -160,7 +160,7 @@ add_recpt_header (ModestMailHeaderView *widget, const gchar *field, const gchar hbox = gtk_hbox_new (FALSE, 12); label_field = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_field), field); - gtk_misc_set_alignment (GTK_MISC (label_field), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (label_field), 1.0, 0.0); label_value = modest_recpt_view_new (); modest_recpt_view_set_recipients (MODEST_RECPT_VIEW(label_value), value); g_signal_connect (G_OBJECT (label_value), "activate", G_CALLBACK (activate_recpt), widget); @@ -262,7 +262,7 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head priv->subject_box = gtk_hbox_new (FALSE, 0); subject_label = gtk_label_new (NULL); - if (subject) + if (subject && (subject[0] != '\0')) gtk_label_set_text (GTK_LABEL (subject_label), subject); else gtk_label_set_text (GTK_LABEL (subject_label), _("mail_va_no_subject")); @@ -288,23 +288,28 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_hotfix1"), bcc); if (priv->is_draft&& from) add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_from"), from); - modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"), priv->subject_box, TRUE, TRUE); + modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"), + priv->subject_box, TRUE, TRUE); if (priv->is_draft) - add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("fixme_Last saved:"), tny_header_get_date_sent (header)); + add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mcen_fi_message_properties_created"), + tny_header_get_date_sent (header)); else - add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("fixme_Sent:"), tny_header_get_date_sent (header)); + add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mcen_fi_message_properties_sent"), + tny_header_get_date_sent (header)); } else { gtk_label_set_markup (GTK_LABEL (priv->fromto_label), _("mail_va_from")); if (from) modest_recpt_view_set_recipients (MODEST_RECPT_VIEW (priv->fromto_contents), from); + if (to) + add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_to"), to); if (cc) add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_cc"), cc); if (bcc) add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_hotfix1"), bcc); - if (to) - add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_to"), to); - modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"), priv->subject_box, TRUE, TRUE); - add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("fixme_Received:"), tny_header_get_date_received (header)); + modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"), + priv->subject_box, TRUE, TRUE); + add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mcen_fi_message_properties_received"), + tny_header_get_date_received (header)); } } @@ -377,7 +382,7 @@ modest_mail_header_view_add_custom_header (ModestMailHeaderView *header_view, hbox = gtk_hbox_new (FALSE, 12); label_field = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_field), label); - gtk_misc_set_alignment (GTK_MISC (label_field), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (label_field), 1.0, 0.0); gtk_box_pack_start (GTK_BOX (hbox), label_field, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), custom_widget, TRUE, TRUE, 0); gtk_size_group_add_widget (priv->labels_size_group, label_field); @@ -433,7 +438,7 @@ modest_mail_header_view_instance_init (GTypeInstance *instance, gpointer g_class fromto_hbox = gtk_hbox_new (FALSE, 12); priv->fromto_label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (priv->fromto_label), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (priv->fromto_label), 1.0, 0.0); priv->fromto_contents = modest_recpt_view_new (); g_signal_connect (G_OBJECT (priv->fromto_contents), "activate", G_CALLBACK (activate_recpt), instance); @@ -583,7 +588,7 @@ modest_mail_header_view_set_priority (ModestMailHeaderView *headers_view, g_return_if_fail (MODEST_IS_MAIL_HEADER_VIEW (headers_view)); priv = MODEST_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view); - priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY); + priv->priority_flags = flags & (TNY_HEADER_FLAG_PRIORITY); if (priv->priority_flags == 0) { if (priv->priority_icon != NULL) {