X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=8dac69bda0c51a9e7be7fb536233317d00342a58;hp=cf6e8c07fb9f912e9cd959907e3623ec44c04235;hb=a5d88bf4a414881d1ec744c48af29e99b5ff03ff;hpb=916ea735de40bbeddf166adf209499dac13a2701 diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index cf6e8c0..8dac69b 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -91,6 +92,8 @@ #define IMAGE_MAX_WIDTH 560 #define DEFAULT_FONT_SCALE 1.5 #define ATTACHMENT_BUTTON_WIDTH 118 +#define MAX_FROM_VALUE 36 +#define MAX_BODY_LENGTH 4096 static gboolean is_wp_text_buffer_started = FALSE; @@ -109,6 +112,11 @@ static void text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, GtkTextIter *start, GtkTextIter *end, gpointer userdata); static void text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id); +static void body_insert_text (GtkTextBuffer *buffer, + GtkTextIter *location, + gchar *text, + gint len, + ModestMsgEditWindow *window); static void subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window); static void subject_field_insert_text (GtkEditable *editable, gchar *new_text, @@ -176,6 +184,11 @@ static void font_size_clicked (GtkToolButton *button, ModestMsgEditWindow *window); static void font_face_clicked (GtkToolButton *button, ModestMsgEditWindow *window); +static void update_signature (ModestMsgEditWindow *self, + const gchar *old_account, + const gchar *new_account); +static GtkWidget *_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group, + const gchar *label, GtkWidget *control); static void DEBUG_BUFFER (WPTextBuffer *buffer) { #ifdef DEBUG @@ -241,6 +254,11 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *from_field; gchar *last_from_account; gchar *original_account_name; + + gchar *references; + gchar *in_reply_to; + + gchar *original_mailbox; GtkWidget *to_field; GtkWidget *cc_field; @@ -249,7 +267,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *attachments_view; GtkWidget *priority_icon; GtkWidget *subject_box; - GtkWidget *add_attachment_button; + GtkWidget *send_button; GtkWidget *cc_caption; GtkWidget *bcc_caption; @@ -425,6 +443,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 (); @@ -436,6 +457,45 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) HILDON_WINDOW(obj)); } +static gchar * +multimailbox_get_default_mailbox (const gchar *account_name) +{ + gchar *transport_account; + gchar *result = NULL; + + transport_account = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), + account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (transport_account) { + gchar *proto; + ModestProtocolRegistry *registry; + + registry = modest_runtime_get_protocol_registry (); + + proto = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), transport_account, + MODEST_ACCOUNT_PROTO, TRUE); + if (proto != NULL) { + ModestProtocol *protocol = + modest_protocol_registry_get_protocol_by_name (registry, + MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS, + proto); + if (MODEST_ACCOUNT_PROTOCOL (protocol)) { + ModestPairList *pair_list; + + pair_list = modest_account_protocol_get_from_list (MODEST_ACCOUNT_PROTOCOL (protocol), + account_name); + if (pair_list) { + ModestPair *pair = (ModestPair *) pair_list->data; + result = g_strdup ((const gchar *) pair->first); + modest_pair_list_free (pair_list); + } + } + + } + } + + return result; +} /** * @result: A ModestPairList, which must be freed with modest_pair_list_free(). @@ -452,17 +512,41 @@ get_transports (void) GSList *cursor = accounts; while (cursor) { gchar *account_name = cursor->data; - gchar *from_string = NULL; if (account_name) { - from_string = modest_account_mgr_get_from_string (account_mgr, - account_name); - } - - if (from_string && account_name) { - gchar *name = account_name; - ModestPair *pair = modest_pair_new ((gpointer) name, - (gpointer) from_string , TRUE); - transports = g_slist_prepend (transports, pair); + + gchar *transport_account; + gboolean multi_mailbox = FALSE; + ModestProtocol *protocol = NULL; + + if (modest_account_mgr_account_is_multimailbox (account_mgr, account_name, &protocol)) { + + transport_account = modest_account_mgr_get_server_account_name + (modest_runtime_get_account_mgr (), + account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (protocol && MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + ModestPairList *pair_list; + pair_list = modest_account_protocol_get_from_list (MODEST_ACCOUNT_PROTOCOL (protocol), + account_name); + if (pair_list) { + transports = g_slist_concat (transports, pair_list); + multi_mailbox = TRUE; + } + } + } + + if (!multi_mailbox) { + gchar *from_string = NULL; + + from_string = modest_account_mgr_get_from_string (account_mgr, + account_name, NULL); + if (from_string && account_name) { + gchar *name = account_name; + ModestPair *pair = modest_pair_new ((gpointer) name, + (gpointer) from_string , TRUE); + transports = g_slist_prepend (transports, pair); + } + } } cursor = cursor->next; @@ -485,6 +569,10 @@ scroll_drag_timeout (gpointer userdata) ModestMsgEditWindow *win = (ModestMsgEditWindow *) userdata; ModestMsgEditWindowPrivate *priv; + /* It could happen that the window was already closed */ + if (!GTK_WIDGET_VISIBLE (win)) + return FALSE; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(win); correct_scroll_without_drag_check (win, TRUE); @@ -505,6 +593,10 @@ correct_scroll_without_drag_check_idle (gpointer userdata) GtkTextMark *insert; GtkAdjustment *vadj; + /* It could happen that the window was already closed */ + if (!GTK_WIDGET_VISIBLE (w)) + return FALSE; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); insert = gtk_text_buffer_get_insert (priv->text_buffer); @@ -538,8 +630,10 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu return; } - priv->correct_scroll_idle = g_idle_add ((GSourceFunc) correct_scroll_without_drag_check_idle, - (gpointer) w); + priv->correct_scroll_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + (GSourceFunc) correct_scroll_without_drag_check_idle, + g_object_ref (w), + g_object_unref); } static void @@ -550,8 +644,11 @@ correct_scroll (ModestMsgEditWindow *w) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); if (gtk_grab_get_current () == priv->msg_body) { if (priv->scroll_drag_timeout_id == 0) { - priv->scroll_drag_timeout_id = g_timeout_add (500, (GSourceFunc) scroll_drag_timeout, - (gpointer) w); + priv->scroll_drag_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT, + 500, + (GSourceFunc) scroll_drag_timeout, + g_object_ref (w), + g_object_unref); } return; } @@ -624,6 +721,8 @@ connect_signals (ModestMsgEditWindow *obj) G_CALLBACK (text_buffer_can_redo), obj); g_signal_connect (G_OBJECT (priv->text_buffer), "changed", G_CALLBACK (body_changed), obj); + g_signal_connect (G_OBJECT (priv->text_buffer), "insert-text", + G_CALLBACK (body_insert_text), obj); g_signal_connect (G_OBJECT (priv->text_buffer), "modified-changed", G_CALLBACK (body_changed), obj); g_signal_connect (G_OBJECT (priv->text_buffer), "end-user-action", @@ -639,8 +738,6 @@ connect_signals (ModestMsgEditWindow *obj) g_signal_connect_swapped (G_OBJECT (priv->bcc_field), "open-addressbook", G_CALLBACK (modest_msg_edit_window_open_addressbook), obj); - g_signal_connect (G_OBJECT (priv->add_attachment_button), "clicked", - G_CALLBACK (modest_msg_edit_window_add_attachment_clicked), obj); g_signal_connect (G_OBJECT (priv->from_field), "value-changed", G_CALLBACK (from_field_changed), obj); @@ -690,7 +787,6 @@ init_window (ModestMsgEditWindow *obj) { GtkWidget *to_caption, *subject_caption; GtkWidget *main_vbox; - GtkWidget *add_attachment_align; ModestMsgEditWindowPrivate *priv; GtkActionGroup *action_group; ModestWindowPrivate *parent_priv; @@ -699,12 +795,14 @@ init_window (ModestMsgEditWindow *obj) GtkSizeGroup *title_size_group; GtkSizeGroup *value_size_group; - GtkWidget *attachment_icon; GtkWidget *window_box; GtkWidget *window_align; #if (GTK_MINOR_VERSION >= 10) GdkAtom deserialize_type; #endif + GtkWidget *from_send_hbox; + GtkWidget *send_icon; + GtkWidget *attachments_label; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); @@ -770,12 +868,19 @@ init_window (ModestMsgEditWindow *obj) priv->from_field = modest_selector_picker_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL, NULL, g_str_equal); - modest_maemo_utils_set_hbutton_layout (title_size_group, value_size_group, + modest_selector_picker_set_value_max_chars (MODEST_SELECTOR_PICKER (priv->from_field), MAX_FROM_VALUE); + modest_maemo_utils_set_hbutton_layout (title_size_group, NULL, _("mail_va_from"), priv->from_field); + hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 1.0); + hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5); + hildon_button_set_value_alignment (HILDON_BUTTON (priv->from_field), 1.0, 0.5); priv->to_field = modest_recpt_editor_new (); priv->cc_field = modest_recpt_editor_new (); priv->bcc_field = modest_recpt_editor_new (); + modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->to_field), FALSE); + modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->cc_field), FALSE); + modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->bcc_field), FALSE); priv->subject_box = gtk_hbox_new (FALSE, MODEST_MARGIN_NONE); priv->priority_icon = gtk_image_new (); gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0); @@ -785,49 +890,46 @@ init_window (ModestMsgEditWindow *obj) hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->subject_field, TRUE, TRUE, 0); - priv->add_attachment_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL); - gtk_widget_set_size_request (priv->add_attachment_button, ATTACHMENT_BUTTON_WIDTH, -1); - GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS); - gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE); - attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER); - hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon); - add_attachment_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (add_attachment_align), 0, 0, MODEST_MARGIN_DEFAULT, 0); - gtk_container_add (GTK_CONTAINER (add_attachment_align), priv->add_attachment_button); - gtk_box_pack_start (GTK_BOX (priv->subject_box), add_attachment_align, FALSE, FALSE, 0); priv->attachments_view = modest_attachments_view_new (NULL); modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS); priv->header_box = gtk_vbox_new (FALSE, 0); - to_caption = modest_maemo_utils_create_captioned_with_size_type + to_caption = _create_addressbook_box (title_size_group, value_size_group, - _("mail_va_to"), FALSE, priv->to_field, - HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); - priv->cc_caption = modest_maemo_utils_create_captioned_with_size_type + _("mail_va_to"), priv->to_field); + priv->cc_caption = _create_addressbook_box (title_size_group, value_size_group, - _("mail_va_cc"), FALSE, priv->cc_field, - HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); - priv->bcc_caption = modest_maemo_utils_create_captioned_with_size_type + _("mail_va_cc"), priv->cc_field); + priv->bcc_caption = _create_addressbook_box (title_size_group, value_size_group, - _("mail_va_hotfix1"), FALSE, priv->bcc_field, - HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + _("mail_va_hotfix1"), priv->bcc_field); subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, _("mail_va_subject"), FALSE, priv->subject_box); - priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, + priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (NULL, NULL, _("mail_va_attachment"), FALSE, priv->attachments_view, HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_AUTO_HEIGHT); - /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), value_size_group); */ - /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), value_size_group); */ - /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), value_size_group); */ + attachments_label = modest_maemo_utils_captioned_get_label_widget (priv->attachments_caption); + hildon_gtk_widget_set_theme_size (attachments_label, HILDON_SIZE_AUTO_HEIGHT); + + + priv->send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); + send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER); + gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon); + gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1); + g_object_unref (title_size_group); g_object_unref (value_size_group); - gtk_box_pack_start (GTK_BOX (priv->header_box), priv->from_field, FALSE, FALSE, 0); + from_send_hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->from_field, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0); + + gtk_box_pack_start (GTK_BOX (priv->header_box), from_send_hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), priv->cc_caption, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0); @@ -859,6 +961,8 @@ init_window (ModestMsgEditWindow *obj) /* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */ priv->pannable = hildon_pannable_area_new (); + + g_object_set (G_OBJECT (priv->pannable), "hscrollbar-policy", GTK_POLICY_NEVER, NULL); main_vbox = gtk_vbox_new (FALSE, DEFAULT_MAIN_VBOX_SPACING); window_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); @@ -869,8 +973,6 @@ init_window (ModestMsgEditWindow *obj) gtk_container_add (GTK_CONTAINER (window_align), main_vbox); hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), - hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable))); gtk_widget_show_all (GTK_WIDGET(priv->pannable)); window_box = gtk_vbox_new (FALSE, 0); @@ -959,8 +1061,12 @@ modest_msg_edit_window_finalize (GObject *obj) } if (priv->original_account_name) g_free (priv->original_account_name); + if (priv->original_mailbox) + g_free (priv->original_mailbox); 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); @@ -972,6 +1078,27 @@ modest_msg_edit_window_finalize (GObject *obj) G_OBJECT_CLASS(parent_class)->finalize (obj); } +static void +pixbuf_size_prepared (GdkPixbufLoader *loader, + gint width, + gint height, + ModestMsgEditWindow *self) +{ + gint new_height, new_width; + gboolean set_size; + + new_height = height; + new_width = width; + set_size = FALSE; + + if (width > IMAGE_MAX_WIDTH) { + new_height = height * IMAGE_MAX_WIDTH / width; + new_width = IMAGE_MAX_WIDTH; + } + + gdk_pixbuf_loader_set_size (loader, new_width, new_height); +} + static GdkPixbuf * pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, @@ -992,6 +1119,7 @@ pixbuf_from_stream (TnyStream *stream, *stream_size = 0; return NULL; } + g_signal_connect (G_OBJECT (loader), "size-prepared", G_CALLBACK (pixbuf_size_prepared), self); hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE); @@ -1177,6 +1305,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) @@ -1312,6 +1442,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"); @@ -1348,9 +1480,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) markup = g_strconcat ("", size_text, "", 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++) { @@ -1379,9 +1518,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) priv->font_tool_button_label = gtk_label_new (NULL); markup = g_strconcat ("Tt", 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++) { @@ -1403,9 +1549,6 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) priv->font_face_toolitem = tool_item; /* Set expand and homogeneous for remaining items */ - tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend"); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold"); gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); @@ -1427,7 +1570,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) ModestWindow* -modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean preserve_is_rich) +modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar *mailbox, gboolean preserve_is_rich) { GObject *obj; ModestWindowPrivate *parent_priv; @@ -1448,9 +1591,26 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre /* Menubar. Update the state of some toggles */ priv->from_field_protos = get_transports (); + priv->original_mailbox = NULL; modest_selector_picker_set_pair_list (MODEST_SELECTOR_PICKER (priv->from_field), priv->from_field_protos); modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name); priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); + if (mailbox && modest_pair_list_find_by_first_as_string (priv->from_field_protos, mailbox)) { + modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) mailbox); + priv->original_mailbox = g_strdup (mailbox); + } else if (modest_account_mgr_account_is_multimailbox (modest_runtime_get_account_mgr (), account_name, NULL)) { + /* We set the first mailbox as the active mailbox */ + priv->original_mailbox = multimailbox_get_default_mailbox (account_name); + if (priv->original_mailbox != NULL) + modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), + (gpointer) priv->original_mailbox); + else + modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), + (gpointer) account_name); + } else { + modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name); + } + priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); hildon_button_set_title (HILDON_BUTTON (priv->from_field), _("mail_va_from")); hildon_button_set_value (HILDON_BUTTON (priv->from_field), @@ -1465,6 +1625,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre restore_settings (MODEST_MSG_EDIT_WINDOW(obj)); modest_window_set_active_account (MODEST_WINDOW(obj), account_name); + modest_window_set_active_mailbox (MODEST_WINDOW(obj), priv->original_mailbox); priv->original_account_name = (account_name) ? g_strdup (account_name) : NULL; @@ -1484,6 +1645,9 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_face_toolitem, G_CALLBACK (modest_ui_dimming_rules_on_set_style), MODEST_WINDOW (obj)); + modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->send_button, + G_CALLBACK (modest_ui_dimming_rules_on_send), + MODEST_WINDOW (obj)); /* Insert dimming rules group for this window */ modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group); @@ -1559,24 +1723,26 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) const gchar *account_name; ModestMsgEditWindowPrivate *priv; TnyIterator *att_iter; + const gchar *picker_active_id; g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (edit_window); - - account_name = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); - g_return_val_if_fail (account_name, NULL); + picker_active_id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); + g_return_val_if_fail (picker_active_id, NULL); + account_name = modest_utils_get_account_name_from_recipient (picker_active_id, NULL); /* don't free these (except from) */ data = g_slice_new0 (MsgData); - data->from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), - account_name); + data->from = g_strdup ((gchar *) modest_selector_picker_get_active_display_name (MODEST_SELECTOR_PICKER (priv->from_field))); data->account_name = g_strdup (account_name); data->to = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field))); 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) { @@ -1676,6 +1842,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); @@ -1728,16 +1896,20 @@ modest_msg_edit_window_set_format (ModestMsgEditWindow *self, ModestMsgEditFormat format) { ModestMsgEditWindowPrivate *priv; + ModestWindowPrivate *parent_priv; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + parent_priv = MODEST_WINDOW_GET_PRIVATE (self); switch (format) { case MODEST_MSG_EDIT_FORMAT_HTML: wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE); + if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar); break; case MODEST_MSG_EDIT_FORMAT_TEXT: wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); + if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar); break; default: g_return_if_reached (); @@ -1749,9 +1921,11 @@ modest_msg_edit_window_get_format_state (ModestMsgEditWindow *self) { ModestMsgEditFormatState *format_state = NULL; ModestMsgEditWindowPrivate *priv; - WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); + WPTextBufferFormat *buffer_format; g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self), NULL); + + buffer_format = g_new0 (WPTextBufferFormat, 1); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, TRUE); @@ -1775,11 +1949,15 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self, const ModestMsgEditFormatState *format_state) { ModestMsgEditWindowPrivate *priv; - WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); - WPTextBufferFormat *current_format = g_new0 (WPTextBufferFormat, 1); + WPTextBufferFormat *buffer_format; + WPTextBufferFormat *current_format; + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); g_return_if_fail (format_state != NULL); + buffer_format = g_new0 (WPTextBufferFormat, 1); + current_format = g_new0 (WPTextBufferFormat, 1); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); gtk_widget_grab_focus (priv->msg_body); buffer_format->bold = (format_state->bold != FALSE); @@ -2123,8 +2301,22 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) response = gtk_dialog_run (GTK_DIALOG (dialog)); switch (response) { case GTK_RESPONSE_OK: + { + gchar *current_folder; uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog)); - break; + current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog)); + if (current_folder && current_folder != '\0') { + GError *err = NULL; + modest_conf_set_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_INSERT_IMAGE_PATH, + current_folder, &err); + if (err != NULL) { + g_debug ("Error storing latest used folder: %s", err->message); + g_error_free (err); + } + } + g_free (current_folder); + } + break; default: break; } @@ -2236,8 +2428,23 @@ on_attach_file_response (GtkDialog *dialog, switch (arg1) { case GTK_RESPONSE_OK: + { + gchar *current_folder; + uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog)); - break; + current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog)); + if (current_folder && current_folder != '\0') { + GError *err = NULL; + modest_conf_set_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_ATTACH_FILE_PATH, + current_folder, &err); + if (err != NULL) { + g_debug ("Error storing latest used folder: %s", err->message); + g_error_free (err); + } + } + g_free (current_folder); + } + break; default: break; } @@ -2276,6 +2483,7 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) { GtkWidget *dialog = NULL; ModestMsgEditWindowPrivate *priv; + gchar *conf_folder; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window)); @@ -2287,6 +2495,18 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN); gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title")); + conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL); + if (conf_folder && conf_folder[0] != '\0') { + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), conf_folder); + } else { + gchar *docs_folder; + /* Set the default folder to images folder */ + docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV), + ".documents", NULL); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), docs_folder); + g_free (docs_folder); + } + g_free (conf_folder); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (window)); @@ -2352,6 +2572,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, if (size > allowed_size) { modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); + g_free (filename); return 0; } } else @@ -2364,6 +2585,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); g_object_unref (mime_part); + g_free (filename); gnome_vfs_file_info_unref (info); return 0; } @@ -2523,6 +2745,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; @@ -2572,12 +2795,14 @@ font_face_clicked (GtkToolButton *button, selector = hildon_touch_selector_new (); renderer = gtk_cell_renderer_text_new (); + g_object_set (G_OBJECT (renderer), "alignment", PANGO_ALIGN_CENTER, "xalign", 0.5, NULL); hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), priv->faces_model, renderer, "family", 0, "text", 0, NULL); hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, priv->current_face_index); 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; @@ -2712,17 +2937,27 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self, gboolean show_toolbar) { ModestWindowPrivate *parent_priv; + ModestMsgEditWindowPrivate *priv; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); /* We can not just use the code of modest_msg_edit_window_setup_toolbar because it has a mixture of both initialization and creation code. */ - if (show_toolbar) - gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); - else + if (show_toolbar) { + gint current_format; + current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)) + ? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT; + if (current_format == MODEST_FILE_FORMAT_PLAIN_TEXT) { + gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); + } else { + gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); + } + } else { gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); + } } void @@ -2787,6 +3022,16 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)) ? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT; + gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE); + + if (parent_priv->toolbar) { + if (file_format == MODEST_FILE_FORMAT_PLAIN_TEXT) { + gtk_widget_hide (parent_priv->toolbar); + } else { + gtk_widget_show (parent_priv->toolbar); + } + } + if (current_format != file_format) { switch (file_format) { case MODEST_FILE_FORMAT_FORMATTED_TEXT: @@ -2802,6 +3047,7 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, gtk_widget_destroy (dialog); if (response == GTK_RESPONSE_OK) { wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); + if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar); } else { GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu")); modest_utils_toggle_action_set_active_block_notify (action, TRUE); @@ -3129,8 +3375,12 @@ modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor) return TRUE; if (gtk_text_buffer_get_modified (priv->text_buffer)) return TRUE; + account_name = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); - if (!priv->original_account_name || strcmp(account_name, priv->original_account_name)) { + if (priv->original_mailbox) { + if (!account_name || strcmp (account_name, priv->original_mailbox)) + return TRUE; + } else if (!priv->original_account_name || strcmp(account_name, priv->original_account_name)) { return TRUE; } @@ -3206,6 +3456,8 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); GtkClipboard *selection_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); gchar *text = NULL; + + /* It could happen that the window was already closed */ if (!GTK_WIDGET_VISIBLE (window)) return; @@ -3217,9 +3469,8 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, } priv->clipboard_text = text; - if (GTK_WIDGET_VISIBLE (window)) { - modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD); - } + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD); + g_object_unref (window); } @@ -3244,7 +3495,10 @@ modest_msg_edit_window_clipboard_owner_handle_change_in_idle (ModestMsgEditWindo { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); if (priv->clipboard_owner_idle == 0) { - priv->clipboard_owner_idle = g_idle_add (clipboard_owner_change_idle, window); + priv->clipboard_owner_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + clipboard_owner_change_idle, + g_object_ref (window), + g_object_unref); } } @@ -3255,6 +3509,7 @@ subject_field_move_cursor (GtkEntry *entry, gboolean a2, gpointer window) { + /* It could happen that the window was already closed */ if (!GTK_WIDGET_VISIBLE (window)) return; @@ -3276,6 +3531,43 @@ update_window_title (ModestMsgEditWindow *window) } + +static void +body_insert_text (GtkTextBuffer *buffer, + GtkTextIter *location, + gchar *text, + gint len, + ModestMsgEditWindow *window) +{ + GtkTextIter end_iter; + gint offset; + + gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end_iter); + + offset = gtk_text_iter_get_offset (&end_iter); + + if (offset + len > MAX_BODY_LENGTH) { + g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text"); + if (offset < MAX_BODY_LENGTH) + { + gchar *result; + + /* Prevent endless recursion */ + result = g_strndup (text, MAX_BODY_LENGTH - offset); + g_signal_handlers_block_by_func (G_OBJECT (buffer), G_CALLBACK (body_insert_text), window); + g_signal_emit_by_name (G_OBJECT (buffer), "insert-text", location, + (gpointer) result, (gpointer) MAX_BODY_LENGTH - offset, + (gpointer) window); + g_signal_handlers_unblock_by_func (G_OBJECT (buffer), G_CALLBACK (body_insert_text), window); + } + + } + if (offset + len > MAX_BODY_LENGTH) { + hildon_banner_show_information (GTK_WIDGET (window), NULL, + _CS("ckdg_ib_maximum_characters_reached")); + } +} + static void subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window) @@ -3286,7 +3578,6 @@ subject_field_changed (GtkEditable *editable, modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); } - static void subject_field_insert_text (GtkEditable *editable, gchar *new_text, @@ -3396,8 +3687,10 @@ gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, if (!g_utf8_collate (range_subtext, str_casefold)) { gchar *found_text = g_strndup (range_text + offset, str_chars_n); result = TRUE; - gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY, - match_start, match_end, NULL); + if (!gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY, + match_start, match_end, NULL)) { + g_warning ("Matched string with collate, but not matched in model"); + } g_free (found_text); } g_free (range_subtext); @@ -3511,7 +3804,6 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft))); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); if (priv->draft_msg != NULL) { g_object_unref (priv->draft_msg); @@ -3525,12 +3817,6 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, priv->msg_uid = NULL; } priv->msg_uid = modest_tny_folder_get_header_unique_id (header); - if (GTK_WIDGET_REALIZED (window)) { - if (!modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL)) { - gtk_widget_destroy (GTK_WIDGET (window)); - return; - } - } } priv->draft_msg = draft; @@ -3640,9 +3926,9 @@ on_account_removed (TnyAccountStore *account_store, } } -static void -from_field_changed (HildonPickerButton *button, - ModestMsgEditWindow *self) +static void update_signature (ModestMsgEditWindow *self, + const gchar *old_account, + const gchar *new_account) { ModestMsgEditWindowPrivate *priv; gboolean has_old_signature, has_new_signature; @@ -3654,30 +3940,54 @@ from_field_changed (HildonPickerButton *button, priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + gtk_text_buffer_begin_user_action (priv->text_buffer); + gtk_text_buffer_get_start_iter (priv->text_buffer, &iter); mgr = modest_runtime_get_account_mgr (); - signature = modest_account_mgr_get_signature (mgr, priv->last_from_account, &has_old_signature); - if (has_old_signature) { - full_signature = g_strconcat ("\n--\n", signature, NULL); - if (gtk_text_iter_forward_search (&iter, full_signature, 0, &match_start, &match_end, NULL)) { - gtk_text_buffer_delete (priv->text_buffer, &match_start, &match_end); - iter = match_start; - } else if (gtk_text_iter_forward_search (&iter, _("mcen_ia_editor_original_message"), 0, - &match_start, &match_end, NULL)) { - iter = match_start; + + + if (old_account) { + signature = modest_account_mgr_get_signature_from_recipient (mgr, old_account, &has_old_signature); + if (has_old_signature) { + full_signature = g_strconcat ("\n--\n", signature, NULL); + if (gtk_text_iter_forward_search (&iter, full_signature, 0, &match_start, &match_end, NULL)) { + gtk_text_buffer_delete (priv->text_buffer, &match_start, &match_end); + iter = match_start; + } else if (gtk_text_iter_forward_search (&iter, _("mcen_ia_editor_original_message"), 0, + &match_start, &match_end, NULL)) { + iter = match_start; + } + g_free (full_signature); } - g_free (full_signature); + g_free (signature); } - g_free (signature); priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); - signature = modest_account_mgr_get_signature (mgr, priv->last_from_account, &has_new_signature); + signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature); if (has_new_signature) { full_signature = g_strconcat ("\n--\n", signature, NULL); gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1); g_free (full_signature); } g_free (signature); + gtk_text_buffer_end_user_action (priv->text_buffer); +} + +static void +from_field_changed (HildonPickerButton *button, + ModestMsgEditWindow *self) +{ + ModestMsgEditWindowPrivate *priv; + gchar *old_account, *new_account; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + old_account = priv->last_from_account; + priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); + new_account = priv->last_from_account; + + update_signature (self, old_account, new_account); + } typedef struct _MessageSettingsHelper { @@ -3947,6 +4257,9 @@ setup_menu (ModestMsgEditWindow *self) NULL); g_signal_connect (G_OBJECT (priv->cc_button), "toggled", G_CALLBACK (on_cc_button_toggled), (gpointer) self); + gtk_button_set_alignment (GTK_BUTTON (priv->cc_button), 0.5, 0.5); + gtk_button_set_alignment (GTK_BUTTON (priv->cc_button), 0.5, 0.5); + priv->bcc_button = hildon_check_button_new (0); gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc")); hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), @@ -3955,10 +4268,15 @@ setup_menu (ModestMsgEditWindow *self) NULL); g_signal_connect (G_OBJECT (priv->bcc_button), "toggled", G_CALLBACK (on_bcc_button_toggled), (gpointer) self); + gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5); + gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_insert_image), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style)); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: add attachment"), NULL, + APP_MENU_CALLBACK (modest_msg_edit_window_add_attachment_clicked), + NULL); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); @@ -3970,3 +4288,43 @@ setup_menu (ModestMsgEditWindow *self) NULL); } +static void +emit_open_addressbook (GtkButton *button, + ModestRecptEditor *editor) +{ + g_signal_emit_by_name (G_OBJECT (editor), "open-addressbook"); +} + +static GtkWidget * +_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group, + const gchar *label, GtkWidget *control) +{ + GtkWidget *abook_button; + GtkWidget *align; + GtkWidget *box; + GtkWidget *label_widget; + + box = gtk_hbox_new (FALSE, 0); + + align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT); + + abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); + label_widget = gtk_label_new (label); + gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); + gtk_container_add (GTK_CONTAINER (abook_button), label_widget); + + gtk_container_add (GTK_CONTAINER (align), abook_button); + gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1); + gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0); + if (title_size_group) + gtk_size_group_add_widget (title_size_group, label_widget); + if (value_size_group) + gtk_size_group_add_widget (value_size_group, control); + + g_signal_connect (G_OBJECT (abook_button), "clicked", + G_CALLBACK (emit_open_addressbook), control); + + return box; +}