Added support for setting References and In-Reply-To: mime fields

[modest] / src / hildon2 / modest-msg-edit-window.c

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 6e5aed5..03d0aec 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -241,6 +241,9 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *from_field;
        gchar       *last_from_account;
        gchar       *original_account_name;
+
+       gchar       *references;
+       gchar       *in_reply_to;
        
        GtkWidget   *to_field;
        GtkWidget   *cc_field;
@@ -425,6 +428,9 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->font_dialog = NULL;
        priv->app_menu = NULL;
 
+       priv->references = NULL;
+       priv->in_reply_to = NULL;
+
        if (!is_wp_text_buffer_started) {
                is_wp_text_buffer_started = TRUE;
                wp_text_buffer_library_init ();
@@ -974,6 +980,8 @@ modest_msg_edit_window_finalize (GObject *obj)
                g_free (priv->original_account_name);
        g_free (priv->msg_uid);
        g_free (priv->last_search);
+       g_free (priv->references);
+       g_free (priv->in_reply_to);
        g_object_unref (priv->faces_model);
        g_object_unref (priv->sizes_model);
        g_object_unref (priv->attachments);
@@ -1212,6 +1220,8 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        cc      = tny_header_dup_cc (header);
        bcc     = tny_header_dup_bcc (header);
        subject = tny_header_dup_subject (header);
+
+       modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
        priority_flags = tny_header_get_priority (header);
 
        if (to)
@@ -1347,6 +1357,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        GtkWidget *sizes_menu;
        GtkWidget *fonts_menu;
        gchar *markup;
+       GtkWidget *arrow;
+       GtkWidget *hbox;
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
@@ -1383,9 +1395,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
                              size_text, "</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+       gtk_misc_set_alignment (GTK_MISC (priv->size_tool_button_label), 1.0, 0.5);
        g_free (markup);
        hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont");
-       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label);
+       hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->size_tool_button_label, TRUE, TRUE, 0);
+       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+       gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (arrow, FALSE);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
        sizes_menu = gtk_menu_new ();
        priv->sizes_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
        for (size_index = 0; size_index < WP_FONT_SIZE_COUNT; size_index++) {
@@ -1414,9 +1433,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        priv->font_tool_button_label = gtk_label_new (NULL);
        markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+       gtk_misc_set_alignment (GTK_MISC (priv->font_tool_button_label), 1.0, 0.5);
        g_free(markup);
        hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont");
-       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label);
+       hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->font_tool_button_label, TRUE, TRUE, 0);
+       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+       gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (arrow, FALSE);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
        fonts_menu = gtk_menu_new ();
        priv->faces_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
        for (font_index = 0; font_index < wp_get_font_count (); font_index++) {
@@ -1612,6 +1638,8 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        data->cc      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
        data->bcc     =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)));
        data->subject =  g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
+       data->references = g_strdup (priv->references);
+       data->in_reply_to = g_strdup (priv->in_reply_to);
        if (priv->draft_msg) {
                data->draft_msg = g_object_ref (priv->draft_msg);
        } else if (priv->outbox_msg) {
@@ -1711,6 +1739,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->plain_body);
        g_free (data->html_body);
        g_free (data->account_name);
+       g_free (data->references);
+       g_free (data->in_reply_to);
        
        if (data->draft_msg != NULL) {
                g_object_unref (data->draft_msg);
@@ -2566,6 +2596,7 @@ font_size_clicked (GtkToolButton *button,
 
        dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_size"));
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                gint new_index;
@@ -2621,6 +2652,7 @@ font_face_clicked (GtkToolButton *button,
 
        dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_face"));
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                gint new_font_index;