X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=3c0b0bcf38d123d9b1c696691626bdc31d5ead30;hp=0ac9aa681177e20ed2bc4ba12ba3ff573e06f7a3;hb=8f7aad0dd79ba73052e58292a8b76582b8fdfa23;hpb=832c77270a9a6f2ecbf7f42aeda724bffdc29749 diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 0ac9aa6..3c0b0bc 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -56,12 +56,14 @@ #include "modest-tny-platform-factory.h" #include "modest-tny-msg.h" #include "modest-tny-folder.h" +#include "modest-tny-account.h" #include "modest-address-book.h" #include "modest-text-utils.h" #include #include #include #include "modest-scroll-area.h" +#include "modest-msg-edit-window-ui-dimming.h" #include "modest-hildon-includes.h" #ifdef MODEST_HAVE_HILDON0_WIDGETS @@ -82,7 +84,7 @@ #define DEFAULT_SIZE_COMBOBOX_WIDTH 80 #define DEFAULT_MAIN_VBOX_SPACING 6 #define SUBJECT_MAX_LENGTH 1000 -#define IMAGE_MAX_WIDTH 640 +#define IMAGE_MAX_WIDTH 560 #define DEFAULT_FONT_SCALE 1.5 static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass); @@ -90,18 +92,22 @@ static void modest_msg_edit_window_init (ModestMsgEditWindow *obj); static void modest_msg_edit_window_finalize (GObject *obj); static gboolean msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer userdata); +static void body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor); static void recpt_field_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor); -static void send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor); -static void style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor); -static void setup_insensitive_handlers (ModestMsgEditWindow *editor); -static void reset_modified (ModestMsgEditWindow *editor); static void text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window); -static void text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata); static void text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window); static void text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window); +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 subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window); +static void subject_field_insert_text (GtkEditable *editable, + gchar *new_text, + gint new_text_length, + gint *position, + ModestMsgEditWindow *window); static void modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, gpointer userdata); static void modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, @@ -118,7 +124,8 @@ static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button, ModestMsgEditWindow *window); /* ModestWindow methods implementation */ -static void modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom); +static void modest_msg_edit_window_disconnect_signals (ModestWindow *window); +static void modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom); static gdouble modest_msg_edit_window_get_zoom (ModestWindow *window); static gboolean modest_msg_edit_window_zoom_minus (ModestWindow *window); static gboolean modest_msg_edit_window_zoom_plus (ModestWindow *window); @@ -127,11 +134,12 @@ static void modest_msg_edit_window_show_toolbar (ModestWindow *window, static void modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgEditWindow *window); +static void subject_field_move_cursor (GtkEntry *entry, + GtkMovementStep step, + gint a1, + gboolean a2, + gpointer userdata); static void update_window_title (ModestMsgEditWindow *window); -static void update_dimmed (ModestMsgEditWindow *window); -static void update_paste_dimming (ModestMsgEditWindow *window); -static void update_select_all_dimming (ModestMsgEditWindow *window); -static void update_zoom_dimming (ModestMsgEditWindow *window); /* Find toolbar */ static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, @@ -142,7 +150,53 @@ static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *ite const gchar *str, GtkTextIter *match_start, GtkTextIter *match_end); - + +static void remove_tags (WPTextBuffer *buffer); + +static void on_account_removed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data); + +static void init_window (ModestMsgEditWindow *obj); + +static void DEBUG_BUFFER (WPTextBuffer *buffer) +{ +#ifdef DEBUG + GtkTextIter iter; + + g_message ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer))); + gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter); + while (!gtk_text_iter_is_end (&iter)) { + GString *output = g_string_new (""); + GSList *toggled_tags; + GSList *node; + + toggled_tags = gtk_text_iter_get_toggled_tags (&iter, FALSE); + g_string_append_printf (output, "%d: CLOSED [ ", gtk_text_iter_get_offset (&iter)); + for (node = toggled_tags; node != NULL; node = g_slist_next (node)) { + GtkTextTag *tag = (GtkTextTag *) node->data; + const gchar *name; + g_object_get (G_OBJECT (tag), "name", &name, NULL); + output = g_string_append (output, name); + g_string_append (output, " "); + } + output = g_string_append (output, "] OPENED [ "); + toggled_tags = gtk_text_iter_get_toggled_tags (&iter, TRUE); + for (node = toggled_tags; node != NULL; node = g_slist_next (node)) { + GtkTextTag *tag = (GtkTextTag *) node->data; + const gchar *name; + g_object_get (G_OBJECT (tag), "name", &name, NULL); + output = g_string_append (output, name); + g_string_append (output, " "); + } + output = g_string_append (output, "]\n"); + g_message ("%s", output->str); + g_string_free (output, TRUE); + gtk_text_iter_forward_to_tag_toggle (&iter, NULL); + } + g_message ("END BUFFER"); +#endif +} /* static gboolean */ @@ -150,11 +204,6 @@ static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *ite /* GdkEventKey *event, */ /* gpointer user_data); */ -static void edit_menu_activated (GtkAction *action, - gpointer userdata); -static void view_menu_activated (GtkAction *action, - gpointer userdata); - /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -180,6 +229,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *cc_caption; GtkWidget *bcc_caption; + gboolean update_caption_visibility; GtkWidget *attachments_caption; GtkTextBuffer *text_buffer; @@ -197,17 +247,26 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *scroll; GtkWidget *scroll_area; + gint last_vadj_upper; gint last_cid; GList *attachments; + GList *images; TnyHeaderFlags priority_flags; gdouble zoom_level; + gboolean can_undo, can_redo; gulong clipboard_change_handler_id; + gulong default_clipboard_change_handler_id; + gulong account_removed_handler_id; + gchar *clipboard_text; TnyMsg *draft_msg; + TnyMsg *outbox_msg; + gchar *msg_uid; + gboolean sent; }; @@ -257,7 +316,37 @@ save_state (ModestWindow *self) static void restore_settings (ModestMsgEditWindow *self) { - modest_widget_memory_restore (modest_runtime_get_conf(), + ModestConf *conf = NULL; + GtkAction *action; + ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self); + + conf = modest_runtime_get_conf (); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarNormalScreenMenu"); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL)); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarFullScreenMenu"); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)); + + /* set initial state of cc and bcc */ + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu"); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu"); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)); + + /* Dim at start clipboard actions */ + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu"); + gtk_action_set_sensitive (action, FALSE); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu"); + gtk_action_set_sensitive (action, FALSE); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu"); + gtk_action_set_sensitive (action, FALSE); + + modest_widget_memory_restore (conf, G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY); } @@ -279,10 +368,9 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass) modest_window_class->zoom_minus_func = modest_msg_edit_window_zoom_minus; modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar; modest_window_class->save_state_func = save_state; + modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals; g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate)); - - } static void @@ -298,11 +386,13 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->bcc_field = NULL; priv->subject_field = NULL; priv->attachments = NULL; + priv->images = NULL; priv->last_cid = 0; priv->zoom_level = 1.0; priv->cc_caption = NULL; priv->bcc_caption = NULL; + priv->update_caption_visibility = FALSE; priv->priority_flags = 0; @@ -310,8 +400,22 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->last_search = NULL; priv->draft_msg = NULL; + priv->outbox_msg = NULL; + priv->msg_uid = NULL; + + priv->can_undo = FALSE; + priv->can_redo = FALSE; priv->clipboard_change_handler_id = 0; + priv->default_clipboard_change_handler_id = 0; + priv->account_removed_handler_id = 0; + priv->clipboard_text = NULL; priv->sent = FALSE; + + priv->last_vadj_upper = 0; + + modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), + GTK_WINDOW(obj),"applications_email_editor"); + init_window (obj); } @@ -352,6 +456,112 @@ get_transports (void) return transports; } +void vadj_changed (GtkAdjustment *adj, + ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + GdkRectangle rectangle, cursor_rectangle; + GtkTextIter position; + gboolean visible; + gint cursor_bottom; + + /* We detect if cursor is visible using the full height, not only the center. This + seems to work */ + gtk_text_view_get_visible_rect (GTK_TEXT_VIEW (priv->msg_body), &rectangle); + gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), + &position, + gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer))); + gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &position, &cursor_rectangle); + + cursor_bottom = (cursor_rectangle.y + cursor_rectangle.height); + visible = (cursor_rectangle.y >= rectangle.y) && (cursor_bottom < (rectangle.y + rectangle.height)); + + if (gtk_widget_is_focus (priv->msg_body) && + !visible) { + if (priv->last_vadj_upper != adj->upper) { + GtkTextMark *insert; + + insert = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer)); + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (priv->msg_body), + insert, 0.1, FALSE, 0.0, 0.0); + } + } + priv->last_vadj_upper = adj->upper; +} + + +static void +connect_signals (ModestMsgEditWindow *obj) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); + + g_signal_connect (G_OBJECT (priv->text_buffer), "refresh_attributes", + G_CALLBACK (text_buffer_refresh_attributes), obj); + g_signal_connect (G_OBJECT (priv->text_buffer), "can-undo", + G_CALLBACK (text_buffer_can_undo), obj); + g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo", + 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 (obj), "window-state-event", + G_CALLBACK (modest_msg_edit_window_window_state_event), + NULL); + g_signal_connect_after (G_OBJECT (priv->text_buffer), "apply-tag", + G_CALLBACK (text_buffer_apply_tag), obj); + g_signal_connect_swapped (G_OBJECT (priv->to_field), "open-addressbook", + G_CALLBACK (modest_msg_edit_window_open_addressbook), obj); + g_signal_connect_swapped (G_OBJECT (priv->cc_field), "open-addressbook", + G_CALLBACK (modest_msg_edit_window_open_addressbook), 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->msg_body), "focus-in-event", + G_CALLBACK (msg_body_focus), obj); + g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event", + G_CALLBACK (msg_body_focus), obj); + g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))), + "changed", G_CALLBACK (recpt_field_changed), obj); + g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))), + "changed", G_CALLBACK (recpt_field_changed), obj); + g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))), + "changed", G_CALLBACK (recpt_field_changed), obj); + g_signal_connect (G_OBJECT (priv->subject_field), "changed", G_CALLBACK (subject_field_changed), obj); + g_signal_connect_after (G_OBJECT (priv->subject_field), "move-cursor", G_CALLBACK (subject_field_move_cursor), obj); + g_signal_connect (G_OBJECT (priv->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), obj); + + g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj); + g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj); + + g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))), + "changed", + G_CALLBACK (vadj_changed), + obj); + + priv->clipboard_change_handler_id = + g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", + G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj); + priv->default_clipboard_change_handler_id = + g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)), "owner-change", + G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj); + +} + +static GtkWidget * +menubar_to_menu (GtkUIManager *ui_manager) +{ + GtkWidget *main_menu; + + /* Get the menubar from the UI manager */ + main_menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); + + return main_menu; +} static void init_window (ModestMsgEditWindow *obj) @@ -359,23 +569,84 @@ init_window (ModestMsgEditWindow *obj) GtkWidget *from_caption, *to_caption, *subject_caption; GtkWidget *main_vbox; ModestMsgEditWindowPrivate *priv; + GtkActionGroup *action_group; + ModestWindowPrivate *parent_priv; + GdkPixbuf *window_icon = NULL; + GError *error = NULL; GtkSizeGroup *size_group; GtkWidget *frame; GtkWidget *subject_box; GtkWidget *attachment_icon; GtkWidget *window_box; - +#if (GTK_MINOR_VERSION >= 10) + GdkAtom deserialize_type; +#endif priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); + parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); + + parent_priv->ui_manager = gtk_ui_manager_new(); + action_group = gtk_action_group_new ("ModestMsgEditWindowActions"); + gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); + + /* Add common actions */ + gtk_action_group_add_actions (action_group, + modest_msg_edit_action_entries, + G_N_ELEMENTS (modest_msg_edit_action_entries), + obj); + gtk_action_group_add_toggle_actions (action_group, + modest_msg_edit_toggle_action_entries, + G_N_ELEMENTS (modest_msg_edit_toggle_action_entries), + obj); + gtk_action_group_add_radio_actions (action_group, + modest_msg_edit_alignment_radio_action_entries, + G_N_ELEMENTS (modest_msg_edit_alignment_radio_action_entries), + GTK_JUSTIFY_LEFT, + G_CALLBACK (modest_ui_actions_on_change_justify), + obj); + gtk_action_group_add_radio_actions (action_group, + modest_msg_edit_zoom_action_entries, + G_N_ELEMENTS (modest_msg_edit_zoom_action_entries), + 100, + G_CALLBACK (modest_ui_actions_on_change_zoom), + obj); + gtk_action_group_add_radio_actions (action_group, + modest_msg_edit_priority_action_entries, + G_N_ELEMENTS (modest_msg_edit_priority_action_entries), + 0, + G_CALLBACK (modest_ui_actions_msg_edit_on_change_priority), + obj); + gtk_action_group_add_radio_actions (action_group, + modest_msg_edit_file_format_action_entries, + G_N_ELEMENTS (modest_msg_edit_file_format_action_entries), + modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL), + G_CALLBACK (modest_ui_actions_msg_edit_on_change_file_format), + obj); + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); + g_object_unref (action_group); + + /* Load the UI definition */ + gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml", + &error); + if (error != NULL) { + g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message); + g_clear_error (&error); + } + + /* Add accelerators */ + gtk_window_add_accel_group (GTK_WINDOW (obj), + gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); + + /* Menubar. Update the state of some toggles */ + parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager); + hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar)); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); /* Note: This ModestPairList* must exist for as long as the combo * that uses it, because the ModestComboBox uses the ID opaquely, * so it can't know how to manage its memory. */ - priv->from_field_protos = get_transports (); - - priv->from_field = modest_combo_box_new (priv->from_field_protos, g_str_equal); + priv->from_field = modest_combo_box_new (NULL, g_str_equal); priv->to_field = modest_recpt_editor_new (); priv->cc_field = modest_recpt_editor_new (); @@ -430,9 +701,13 @@ init_window (ModestMsgEditWindow *obj) priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); g_object_set (priv->text_buffer, "font_scale", DEFAULT_FONT_SCALE, NULL); wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE); +#if (GTK_MINOR_VERSION >= 10) gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer"); - gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer"); - + deserialize_type = gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), + "wp-text-buffer"); + gtk_text_buffer_deserialize_set_can_create_tags (GTK_TEXT_BUFFER (priv->text_buffer), + deserialize_type, TRUE); +#endif wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE); priv->find_toolbar = hildon_find_toolbar_new (NULL); @@ -440,43 +715,6 @@ init_window (ModestMsgEditWindow *obj) /* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */ - g_signal_connect (G_OBJECT (priv->text_buffer), "refresh_attributes", - G_CALLBACK (text_buffer_refresh_attributes), obj); - g_signal_connect (G_OBJECT (priv->text_buffer), "delete-range", - G_CALLBACK (text_buffer_delete_range), obj); - g_signal_connect (G_OBJECT (priv->text_buffer), "can-undo", - G_CALLBACK (text_buffer_can_undo), obj); - g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo", - G_CALLBACK (text_buffer_can_redo), obj); - g_signal_connect (G_OBJECT (obj), "window-state-event", - G_CALLBACK (modest_msg_edit_window_window_state_event), - NULL); - g_signal_connect_swapped (G_OBJECT (priv->to_field), "open-addressbook", - G_CALLBACK (modest_msg_edit_window_open_addressbook), obj); - g_signal_connect_swapped (G_OBJECT (priv->cc_field), "open-addressbook", - G_CALLBACK (modest_msg_edit_window_open_addressbook), 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->msg_body), "focus-in-event", - G_CALLBACK (msg_body_focus), obj); - g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event", - G_CALLBACK (msg_body_focus), obj); - g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))), - "changed", G_CALLBACK (recpt_field_changed), obj); - g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))), - "changed", G_CALLBACK (recpt_field_changed), obj); - g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))), - "changed", G_CALLBACK (recpt_field_changed), obj); - recpt_field_changed (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)), MODEST_MSG_EDIT_WINDOW (obj)); - g_signal_connect (G_OBJECT (priv->subject_field), "changed", G_CALLBACK (subject_field_changed), obj); - - g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj); - g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj); - priv->scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SHADOW_NONE); @@ -490,45 +728,62 @@ init_window (ModestMsgEditWindow *obj) gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->scroll), main_vbox); gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))); + g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))), + "changed", + G_CALLBACK (vadj_changed), + obj); gtk_widget_show_all (GTK_WIDGET(priv->scroll)); - if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)) { - gtk_widget_set_no_show_all (priv->cc_caption, TRUE); - gtk_widget_hide (priv->cc_caption); - } - if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)) { - gtk_widget_set_no_show_all (priv->bcc_caption, TRUE); - gtk_widget_hide (priv->bcc_caption); - } - window_box = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (window_box), priv->find_toolbar, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER(obj), window_box); priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body); gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area); - - /* - TODO: scroll_area was never instantiated. - Stop building without warnings-as-errors. murrayc. - gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), - gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))); - */ - priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", - G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj); + /* Set window icon */ + window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON); + if (window_icon) { + gtk_window_set_icon (GTK_WINDOW (obj), window_icon); + g_object_unref (window_icon); + } + } +static void +modest_msg_edit_window_disconnect_signals (ModestWindow *window) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + if (gtk_clipboard_get (GDK_SELECTION_PRIMARY) && + g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), + priv->clipboard_change_handler_id)) + g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), + priv->clipboard_change_handler_id); + if (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD) && + g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + priv->default_clipboard_change_handler_id)) + g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + priv->default_clipboard_change_handler_id); + if (priv->account_removed_handler_id && + g_signal_handler_is_connected (modest_runtime_get_account_store (), + priv->account_removed_handler_id)) + g_signal_handler_disconnect(modest_runtime_get_account_store (), + priv->account_removed_handler_id); +} static void modest_msg_edit_window_finalize (GObject *obj) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj); - if (priv->clipboard_change_handler_id > 0) { - g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler_id); - priv->clipboard_change_handler_id = 0; + /* Sanity check: shouldn't be needed, the window mgr should + call this function before */ + modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj)); + + if (priv->clipboard_text != NULL) { + g_free (priv->clipboard_text); + priv->clipboard_text = NULL; } if (priv->draft_msg != NULL) { @@ -540,6 +795,23 @@ modest_msg_edit_window_finalize (GObject *obj) g_object_unref (priv->draft_msg); priv->draft_msg = NULL; } + if (priv->outbox_msg != NULL) { + TnyHeader *header = tny_msg_get_header (priv->outbox_msg); + if (TNY_IS_HEADER (header)) { + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + modest_window_mgr_unregister_header (mgr, header); + } + g_object_unref (priv->outbox_msg); + priv->outbox_msg = NULL; + } + g_free (priv->msg_uid); + g_free (priv->last_search); + g_slist_free (priv->font_items_group); + g_slist_free (priv->size_items_group); + g_list_foreach (priv->attachments, (GFunc) g_object_unref, NULL); + g_list_free (priv->attachments); + g_list_foreach (priv->images, (GFunc) g_object_unref, NULL); + g_list_free (priv->images); /* This had to stay alive for as long as the combobox that used it: */ modest_pair_list_free (priv->from_field_protos); @@ -547,34 +819,147 @@ modest_msg_edit_window_finalize (GObject *obj) G_OBJECT_CLASS(parent_class)->finalize (obj); } -static GtkWidget * -menubar_to_menu (GtkUIManager *ui_manager) +static GdkPixbuf * +pixbuf_from_stream (TnyStream *stream, const gchar *mime_type) { - GtkWidget *main_menu; - GtkWidget *menubar; - GList *iter; + GdkPixbufLoader *loader; + GdkPixbuf *pixbuf; - /* Create new main menu */ - main_menu = gtk_menu_new(); + loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL); - /* Get the menubar from the UI manager */ - menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); + if (loader == NULL) + return NULL; - iter = gtk_container_get_children (GTK_CONTAINER (menubar)); - while (iter) { - GtkWidget *menu; + tny_stream_reset (TNY_STREAM (stream)); + while (!tny_stream_is_eos (TNY_STREAM (stream))) { + unsigned char read_buffer[128]; + gint readed; + readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128); + if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL)) + break; + } - menu = GTK_WIDGET (iter->data); - gtk_widget_reparent(menu, main_menu); + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + g_object_ref (pixbuf); + gdk_pixbuf_loader_close (loader, NULL); + g_object_unref (loader); - iter = g_list_next (iter); + if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) { + GdkPixbuf *new_pixbuf; + gint new_height; + new_height = (gdk_pixbuf_get_height (pixbuf) * IMAGE_MAX_WIDTH) / + gdk_pixbuf_get_width (pixbuf); + new_pixbuf = gdk_pixbuf_scale_simple (pixbuf, IMAGE_MAX_WIDTH, new_height, GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + pixbuf = new_pixbuf; } - return main_menu; + + return pixbuf; } +static void +replace_with_images (ModestMsgEditWindow *self, GList *attachments) +{ + ModestMsgEditWindowPrivate *priv; + GList *node; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + for (node = attachments; node != NULL; node = g_list_next (node)) { + TnyMimePart *part = (TnyMimePart *) node->data; + const gchar *cid = tny_mime_part_get_content_id (part); + const gchar *mime_type = tny_mime_part_get_content_type (part); + if ((cid != NULL)&&(mime_type != NULL)) { + TnyStream *stream = tny_mime_part_get_stream (part); + GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type); + g_object_unref (stream); + + if (pixbuf != NULL) { + wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); + g_object_unref (pixbuf); + } + } + } +} static void -set_msg (ModestMsgEditWindow *self, TnyMsg *msg) +get_related_images (ModestMsgEditWindow *self, TnyMsg *msg) +{ + TnyMimePart *parent = NULL; + const gchar *content_type = NULL; + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg)); + + if (content_type && !g_strcasecmp (content_type, "multipart/related")) { + parent = g_object_ref (msg); + } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) { + TnyList *parts = TNY_LIST (tny_simple_list_new ()); + TnyIterator *iter; + + tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + iter = tny_list_create_iterator (parts); + while (!tny_iterator_is_done (iter)) { + TnyMimePart *part; + part = TNY_MIME_PART (tny_iterator_get_current (iter)); + content_type = tny_mime_part_get_content_type (part); + if (content_type && !g_strcasecmp (content_type, "multipart/related")) { + parent = part; + break; + } else { + g_object_unref (part); + } + tny_iterator_next (iter); + } + g_object_unref (iter); + g_object_unref (parts); + } + + if (parent != NULL) { + TnyList *parts = TNY_LIST (tny_simple_list_new ()); + TnyIterator *iter; + + tny_mime_part_get_parts (TNY_MIME_PART (parent), parts); + iter = tny_list_create_iterator (parts); + while (!tny_iterator_is_done (iter)) { + TnyMimePart *part; + part = TNY_MIME_PART (tny_iterator_get_current (iter)); + content_type = tny_mime_part_get_content_type (part); + if (content_type && g_str_has_prefix (content_type, "image/")) { + priv->images = g_list_prepend (priv->images, part); + } else { + g_object_unref (part); + } + tny_iterator_next (iter); + } + g_object_unref (iter); + g_object_unref (parts); + g_object_unref (parent); + } +} + +static void +update_last_cid (ModestMsgEditWindow *self, GList *attachments) +{ + GList *node; + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + for (node = attachments; node != NULL; node = g_list_next (node)) { + TnyMimePart *part = (TnyMimePart *) node->data; + const gchar *cid = tny_mime_part_get_content_id (part); + if (cid != NULL) { + char *invalid = NULL; + gint int_cid = strtol (cid, &invalid, 10); + if ((invalid != NULL) && (*invalid == '\0') && (int_cid > priv->last_cid)) { + priv->last_cid = int_cid; + } + } + + } +} + +static void +set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) { TnyHeader *header; const gchar *to, *cc, *bcc, *subject; @@ -583,6 +968,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) GtkTextIter iter; TnyHeaderFlags priority_flags; TnyFolder *msg_folder; + gboolean is_html = FALSE; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); g_return_if_fail (TNY_IS_MSG (msg)); @@ -594,7 +980,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) cc = tny_header_get_cc (header); bcc = tny_header_get_bcc (header); subject = tny_header_get_subject (header); - priority_flags = tny_header_get_flags (header) & TNY_HEADER_FLAG_PRIORITY; + priority_flags = tny_header_get_priority (header); if (to) modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to); @@ -603,15 +989,15 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) gtk_widget_set_no_show_all (priv->cc_caption, FALSE); gtk_widget_show (priv->cc_caption); } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) { - gtk_widget_set_no_show_all (priv->cc_caption, FALSE); + gtk_widget_set_no_show_all (priv->cc_caption, TRUE); gtk_widget_hide (priv->cc_caption); } if (bcc) { modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc); - gtk_widget_set_no_show_all (priv->cc_caption, FALSE); + gtk_widget_set_no_show_all (priv->bcc_caption, FALSE); gtk_widget_show (priv->bcc_caption); } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) { - gtk_widget_set_no_show_all (priv->bcc_caption, FALSE); + gtk_widget_set_no_show_all (priv->bcc_caption, TRUE); gtk_widget_hide (priv->bcc_caption); } if (subject) @@ -622,11 +1008,12 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) update_window_title (self); wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE); - body = modest_tny_msg_get_body (msg, TRUE); + body = modest_tny_msg_get_body (msg, TRUE, &is_html); if ((body == NULL)||(body[0] == '\0')) { g_free (body); body = modest_text_utils_convert_to_html (""); + is_html = FALSE; } wp_text_buffer_load_document_begin (WP_TEXT_BUFFER (priv->text_buffer), TRUE); wp_text_buffer_load_document_write (WP_TEXT_BUFFER (priv->text_buffer), @@ -635,8 +1022,24 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer)); g_free (body); + /* Add attachments to the view */ + modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), msg); + priv->attachments = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); + if (priv->attachments == NULL) { + gtk_widget_hide (priv->attachments_caption); + } else { + gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); + gtk_widget_show_all (priv->attachments_caption); + } + get_related_images (self, msg); + update_last_cid (self, priv->attachments); + update_last_cid (self, priv->images); + replace_with_images (self, priv->images); + + if (preserve_is_rich && !is_html) { + wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); /* Get the default format required from configuration */ - if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) { + } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) { wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); } @@ -649,33 +1052,38 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) /* TODO: lower priority, select in the From: combo to the value that comes from msg <- not sure, should it be - allowed? */ - - /* Add attachments to the view */ - modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), msg); - priv->attachments = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); - if (priv->attachments == NULL) { - gtk_widget_hide (priv->attachments_caption); - } else { - gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); - gtk_widget_show_all (priv->attachments_caption); - } + allowed? */ + + DEBUG_BUFFER (WP_TEXT_BUFFER (priv->text_buffer)); gtk_text_buffer_get_start_iter (priv->text_buffer, &iter); gtk_text_buffer_place_cursor (priv->text_buffer, &iter); - reset_modified (self); + modest_msg_edit_window_reset_modified (self); - update_dimmed (self); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); text_buffer_can_undo (priv->text_buffer, FALSE, self); text_buffer_can_redo (priv->text_buffer, FALSE, self); + if (priv->msg_uid) { + g_free (priv->msg_uid); + priv->msg_uid = NULL; + } + /* we should set a reference to the incoming message if it is a draft */ msg_folder = tny_msg_get_folder (msg); - if (msg_folder) { - if (modest_tny_folder_is_local_folder (msg_folder) && - modest_tny_folder_get_local_folder_type (msg_folder) == TNY_FOLDER_TYPE_DRAFTS) - priv->draft_msg = g_object_ref(msg); + if (msg_folder) { + if (modest_tny_folder_is_local_folder (msg_folder)) { + TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + + if (type == TNY_FOLDER_TYPE_DRAFTS) + priv->draft_msg = g_object_ref(msg); + if (type == TNY_FOLDER_TYPE_OUTBOX) + priv->outbox_msg = g_object_ref(msg); + priv->msg_uid = modest_tny_folder_get_header_unique_id (header); + } g_object_unref (msg_folder); } } @@ -741,10 +1149,6 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar)); - /* should we hide the toolbar? */ - if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL)) - gtk_widget_hide (parent_priv->toolbar); - /* Font color placeholder */ placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontColor"); insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder)); @@ -758,7 +1162,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); - g_signal_connect_swapped (G_OBJECT (priv->font_color_button), "notify::color", G_CALLBACK (modest_msg_edit_window_color_button_change), window); + g_signal_connect_swapped (G_OBJECT (priv->font_color_button), + "notify::color", + G_CALLBACK (modest_msg_edit_window_color_button_change), + window); /* Font size and face placeholder */ placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontAttributes"); @@ -858,152 +1265,110 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); + /* Explicitelly show all the toolbar (a normal gtk_widget_show + will not show the tool items added to the placeholders) */ + gtk_widget_show_all (parent_priv->toolbar); + /* Set the no show all *after* showing all items. We do not + want the toolbar to be shown with a show all because it + could go agains the gconf setting regarding showing or not + the toolbar of the editor window */ + gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); } ModestWindow* -modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) +modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean preserve_is_rich) { GObject *obj; ModestWindowPrivate *parent_priv; ModestMsgEditWindowPrivate *priv; - GtkActionGroup *action_group; - GError *error = NULL; - GdkPixbuf *window_icon = NULL; - GtkAction *action; - ModestConf *conf; - gboolean prefer_formatted; - gint file_format; ModestPair *account_pair = NULL; + ModestDimmingRulesGroup *menu_rules_group = NULL; + ModestDimmingRulesGroup *toolbar_rules_group = NULL; + ModestDimmingRulesGroup *clipboard_rules_group = NULL; + ModestWindowMgr *mgr = NULL; g_return_val_if_fail (msg, NULL); g_return_val_if_fail (account_name, NULL); + + mgr = modest_runtime_get_window_mgr (); - obj = g_object_new(MODEST_TYPE_MSG_EDIT_WINDOW, NULL); + obj = G_OBJECT (modest_window_mgr_get_msg_edit_window (mgr)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj); parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); - parent_priv->ui_manager = gtk_ui_manager_new(); - action_group = gtk_action_group_new ("ModestMsgEditWindowActions"); - gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); - - /* Add common actions */ - gtk_action_group_add_actions (action_group, - modest_msg_edit_action_entries, - G_N_ELEMENTS (modest_msg_edit_action_entries), - obj); - gtk_action_group_add_toggle_actions (action_group, - modest_msg_edit_toggle_action_entries, - G_N_ELEMENTS (modest_msg_edit_toggle_action_entries), - obj); - gtk_action_group_add_radio_actions (action_group, - modest_msg_edit_alignment_radio_action_entries, - G_N_ELEMENTS (modest_msg_edit_alignment_radio_action_entries), - GTK_JUSTIFY_LEFT, - G_CALLBACK (modest_ui_actions_on_change_justify), - obj); - gtk_action_group_add_radio_actions (action_group, - modest_msg_edit_zoom_action_entries, - G_N_ELEMENTS (modest_msg_edit_zoom_action_entries), - 100, - G_CALLBACK (modest_ui_actions_on_change_zoom), - obj); - gtk_action_group_add_radio_actions (action_group, - modest_msg_edit_priority_action_entries, - G_N_ELEMENTS (modest_msg_edit_priority_action_entries), - 0, - G_CALLBACK (modest_ui_actions_msg_edit_on_change_priority), - obj); - gtk_action_group_add_radio_actions (action_group, - modest_msg_edit_file_format_action_entries, - G_N_ELEMENTS (modest_msg_edit_file_format_action_entries), - modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL), - G_CALLBACK (modest_ui_actions_msg_edit_on_change_file_format), - obj); - gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); - g_object_unref (action_group); - - /* Load the UI definition */ - gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml", - &error); - if (error != NULL) { - g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message); - g_clear_error (&error); - } - - /* Add accelerators */ - gtk_window_add_accel_group (GTK_WINDOW (obj), - gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); - - /* Menubar */ - parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager); - hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar)); + priv->from_field_protos = get_transports (); + modest_combo_box_set_pair_list (MODEST_COMBO_BOX (priv->from_field), priv->from_field_protos); + modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj)); + hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar)); /* Init window */ - init_window (MODEST_MSG_EDIT_WINDOW(obj)); + connect_signals (MODEST_MSG_EDIT_WINDOW(obj)); restore_settings (MODEST_MSG_EDIT_WINDOW(obj)); modest_window_set_active_account (MODEST_WINDOW(obj), account_name); - modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj)); - - setup_insensitive_handlers (MODEST_MSG_EDIT_WINDOW (obj)); - account_pair = modest_pair_list_find_by_first_as_string (priv->from_field_protos, account_name); if (account_pair != NULL) modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), account_pair->first); - set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg); + parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new (); + menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE); + toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE); + clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE); + /* Add common dimming rules */ + modest_dimming_rules_group_add_rules (menu_rules_group, + modest_msg_edit_window_menu_dimming_entries, + G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries), + MODEST_WINDOW (obj)); + modest_dimming_rules_group_add_rules (toolbar_rules_group, + modest_msg_edit_window_toolbar_dimming_entries, + G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries), + MODEST_WINDOW (obj)); + modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_button, + G_CALLBACK (modest_ui_dimming_rules_on_set_style), + MODEST_WINDOW (obj)); + modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_size_toolitem, + G_CALLBACK (modest_ui_dimming_rules_on_set_style), + MODEST_WINDOW (obj)); + 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_rules (clipboard_rules_group, + modest_msg_edit_window_clipboard_dimming_entries, + G_N_ELEMENTS (modest_msg_edit_window_clipboard_dimming_entries), + MODEST_WINDOW (obj)); + /* Insert dimming rules group for this window */ + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); + 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); + /* Checks the dimming rules */ + g_object_unref (menu_rules_group); + g_object_unref (toolbar_rules_group); + g_object_unref (clipboard_rules_group); + + set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich); text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (obj)); - /* Set window icon */ - window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON); - if (window_icon) { - gtk_window_set_icon (GTK_WINDOW (obj), window_icon); - g_object_unref (window_icon); - } - - /* Dim at start clipboard actions */ - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu"); - gtk_action_set_sensitive (action, FALSE); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu"); - gtk_action_set_sensitive (action, FALSE); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu"); - gtk_action_set_sensitive (action, FALSE); - - /* Update select all */ - update_select_all_dimming (MODEST_MSG_EDIT_WINDOW (obj)); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu"); - g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (edit_menu_activated), obj); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu"); - g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (view_menu_activated), obj); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj)); + modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules"); + priv->update_caption_visibility = TRUE; - /* set initial state of cc and bcc */ - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)); + modest_msg_edit_window_reset_modified (MODEST_MSG_EDIT_WINDOW (obj)); - /* Setup the file format */ - conf = modest_runtime_get_conf (); - prefer_formatted = modest_conf_get_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, &error); - if (error) { - g_clear_error (&error); - file_format = MODEST_FILE_FORMAT_FORMATTED_TEXT; - } else - file_format = (prefer_formatted) ? - MODEST_FILE_FORMAT_FORMATTED_TEXT : - MODEST_FILE_FORMAT_PLAIN_TEXT; - modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (obj), file_format); - - update_paste_dimming (MODEST_MSG_EDIT_WINDOW (obj)); + /* Track account-removed signal, this window should be closed + in the case we're creating a mail associated to the account + that is deleted */ + priv->account_removed_handler_id = + g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()), + "account_removed", + G_CALLBACK(on_account_removed), + obj); return (ModestWindow*) obj; } @@ -1061,6 +1426,8 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) data->subject = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field))); if (priv->draft_msg) { data->draft_msg = g_object_ref (priv->draft_msg); + } else if (priv->outbox_msg) { + data->draft_msg = g_object_ref (priv->outbox_msg); } else { data->draft_msg = NULL; } @@ -1068,7 +1435,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); GtkTextIter b, e; gtk_text_buffer_get_bounds (buf, &b, &e); - data->plain_body = g_strdup (gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE)); /* returns a copy */ + data->plain_body = modest_text_utils_text_buffer_get_text (priv->text_buffer); /* returns a copy */ if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) data->html_body = get_formatted_data (edit_window); /* returns a copy. */ @@ -1081,12 +1448,42 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) while (cursor) { if (!(TNY_IS_MIME_PART(cursor->data))) { g_warning ("strange data in attachment list"); + cursor = g_list_next (cursor); continue; } data->attachments = g_list_append (data->attachments, g_object_ref (cursor->data)); cursor = g_list_next (cursor); } + + GtkTextTagTable *tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (priv->text_buffer)); + cursor = priv->images; + data->images = NULL; + while (cursor) { + const gchar *cid; + if (!(TNY_IS_MIME_PART(cursor->data))) { + g_warning ("strange data in attachment list"); + cursor = g_list_next (cursor); + continue; + } + cid = tny_mime_part_get_content_id (cursor->data); + if (cid) { + gchar *image_tag_id; + GtkTextTag *image_tag; + GtkTextIter iter; + image_tag_id = g_strdup_printf ("image-tag-%s", cid); + image_tag = gtk_text_tag_table_lookup (tag_table, image_tag_id); + g_free (image_tag_id); + + gtk_text_buffer_get_start_iter (priv->text_buffer, &iter); + if (image_tag && + ((gtk_text_iter_has_tag (&iter, image_tag))|| + (gtk_text_iter_forward_to_tag_toggle (&iter, image_tag)))) + data->images = g_list_append (data->images, + g_object_ref (cursor->data)); + } + cursor = g_list_next (cursor); + } data->priority_flags = priv->priority_flags; @@ -1114,6 +1511,7 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, g_free (data->to); g_free (data->cc); g_free (data->bcc); + g_free (data->from); g_free (data->subject); g_free (data->plain_body); g_free (data->html_body); @@ -1126,6 +1524,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, g_list_foreach (data->attachments, (GFunc)unref_gobject, NULL); g_list_free (data->attachments); + g_list_foreach (data->images, (GFunc)unref_gobject, NULL); + g_list_free (data->images); g_slice_free (MsgData, data); } @@ -1217,7 +1617,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self, buffer_format->cs.bold = ((buffer_format->bold&0x1) != (current_format->bold&0x1)); buffer_format->cs.italic = ((buffer_format->italic&0x1) != (current_format->italic&0x1)); - buffer_format->cs.color = gdk_color_equal(&(buffer_format->color), &(current_format->color)); + buffer_format->cs.color = !gdk_color_equal(&(buffer_format->color), &(current_format->color)); buffer_format->cs.font_size = (buffer_format->font_size != current_format->font_size); buffer_format->cs.font = (buffer_format->font != current_format->font); buffer_format->cs.justification = (buffer_format->justification != current_format->justification); @@ -1255,38 +1655,17 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self, if (buffer_format->cs.font) { wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) (buffer_format->font)); } + wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer)); if (buffer_format->cs.bullet) { - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((int)buffer_format->bullet)); + wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((buffer_format->bullet)?1:0)); } /* wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */ - wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer)); g_free (current_format); } static void -toggle_action_set_active_block_notify (GtkToggleAction *action, - gboolean value) -{ - GSList *proxies = NULL; - - for (proxies = gtk_action_get_proxies (GTK_ACTION (action)); - proxies != NULL; proxies = g_slist_next (proxies)) { - GtkWidget *widget = (GtkWidget *) proxies->data; - gtk_action_block_activate_from (GTK_ACTION (action), widget); - } - - gtk_toggle_action_set_active (action, value); - - for (proxies = gtk_action_get_proxies (GTK_ACTION (action)); - proxies != NULL; proxies = g_slist_next (proxies)) { - GtkWidget *widget = (GtkWidget *) proxies->data; - gtk_action_unblock_activate_from (GTK_ACTION (action), widget); - } -} - -static void text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window) { WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); @@ -1302,23 +1681,23 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) { action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu"); if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE); } else { action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatPlainTextMenu"); if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE); } wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE); - + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBold"); - toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bold); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bold); action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics"); - toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); - toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet); +/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); */ +/* modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet); */ g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button), G_CALLBACK (modest_msg_edit_window_color_button_change), @@ -1370,7 +1749,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo } - +#ifdef MODEST_HILDON_VERSION_0 void modest_msg_edit_window_select_color (ModestMsgEditWindow *window) { @@ -1379,43 +1758,26 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window) ModestMsgEditWindowPrivate *priv; GtkWidget *dialog = NULL; gint response; - const GdkColor *new_color = NULL; - + GdkColor *new_color = NULL; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE); -#ifdef MODEST_HILDON_VERSION_0 dialog = hildon_color_selector_new (GTK_WINDOW (window)); hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color)); -#else - dialog = hildon_color_chooser_new (); - hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color)); -#endif /*MODEST_HILDON_VERSION_0*/ g_free (buffer_format); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - switch (response) { - case GTK_RESPONSE_OK: { -#ifdef MODEST_HILDON_VERSION_0 + if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); -#else - GdkColor col; - hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col); - new_color = &col; -#endif /*MODEST_HILDON_VERSION_0*/ - } - - break; - default: - break; + if (new_color != NULL) { + wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, + (gpointer) new_color); + } } gtk_widget_destroy (dialog); - - if (new_color != NULL) - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color); - } + void modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) { @@ -1429,36 +1791,87 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer)); -#ifdef MODEST_HILDON_VERSION_0 dialog = hildon_color_selector_new (GTK_WINDOW (window)); hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color); -#else - dialog = hildon_color_chooser_new (); - hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog),(GdkColor*)old_color); -#endif /*MODEST_HILDON_VERSION_9*/ - response = gtk_dialog_run (GTK_DIALOG (dialog)); - switch (response) { - case GTK_RESPONSE_OK: { -#ifdef MODEST_HILDON_VERSION_0 + if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); -#else + if (new_color != NULL) + wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color); + } + gtk_widget_destroy (dialog); + +} + +#else +void +modest_msg_edit_window_select_color (ModestMsgEditWindow *window) +{ + + WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); + ModestMsgEditWindowPrivate *priv; + GtkWidget *dialog = NULL; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE); + + dialog = hildon_color_chooser_new (); + hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color)); + g_free (buffer_format); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { GdkColor col; hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col); - new_color = &col; -#endif /*MODEST_HILDON_VERSION_0*/ - } - break; - default: - break; + wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, + (gpointer) &col); } gtk_widget_destroy (dialog); +} + - if (new_color != NULL) - wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color); +void +modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) +{ + + ModestMsgEditWindowPrivate *priv; + GtkWidget *dialog = NULL; + GdkColor *old_color = NULL; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer)); + + dialog = hildon_color_chooser_new (); + hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog),(GdkColor*)old_color); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + GdkColor col; + hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col); + wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), &col); + } + gtk_widget_destroy (dialog); } +#endif /*!MODEST_HILDON_VERSION_0*/ + + + +static TnyStream* create_stream_for_uri (const gchar* uri) +{ + if (!uri) + return NULL; + + TnyStream *result = NULL; + + GnomeVFSHandle *handle = NULL; + GnomeVFSResult test = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); + if (test == GNOME_VFS_OK) { + /* Create the tinymail stream: */ + /* Presumably tinymai will call gnome_vfs_close (handle) later. */ + result = TNY_STREAM (tny_vfs_stream_new (handle)); + } + + return result; +} void modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) @@ -1498,12 +1911,10 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) uri = (const gchar *) uri_node->data; result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); if (result == GNOME_VFS_OK) { - GdkPixbufLoader *loader; GdkPixbuf *pixbuf; GnomeVFSFileInfo info; gchar *filename, *basename, *escaped_filename; TnyMimePart *mime_part; - TnyStream *stream; gchar *content_id; const gchar *mime_type = NULL; GnomeVFSURI *vfs_uri; @@ -1522,8 +1933,8 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) mime_part = tny_platform_factory_new_mime_part (modest_runtime_get_platform_factory ()); - stream = TNY_STREAM (tny_vfs_stream_new (handle)); - + + TnyStream *stream = create_stream_for_uri (uri); tny_mime_part_construct_from_stream (mime_part, stream, mime_type); content_id = g_strdup_printf ("%d", priv->last_cid); @@ -1534,43 +1945,19 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) basename = g_path_get_basename (filename); tny_mime_part_set_filename (mime_part, basename); g_free (basename); - - priv->attachments = g_list_prepend (priv->attachments, mime_part); - modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), - mime_part); - gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); - gtk_widget_show_all (priv->attachments_caption); - gtk_text_buffer_set_modified (priv->text_buffer, TRUE); - g_free (filename); - - loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL); - while (!tny_stream_is_eos (TNY_STREAM (stream))) { - unsigned char read_buffer[128]; - gint readed; - readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128); - if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL)) - break; - } - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - g_object_ref (pixbuf); - gdk_pixbuf_loader_close (loader, NULL); - g_object_unref (loader); - - if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) { - GdkPixbuf *new_pixbuf; - gint new_height; - new_height = (gdk_pixbuf_get_height (pixbuf) * IMAGE_MAX_WIDTH) / - gdk_pixbuf_get_width (pixbuf); - new_pixbuf = gdk_pixbuf_scale_simple (pixbuf, IMAGE_MAX_WIDTH, new_height, GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - pixbuf = new_pixbuf; - } + pixbuf = pixbuf_from_stream (stream, mime_type); + if (pixbuf != NULL) { insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer)); gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark); wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf); } + + priv->images = g_list_prepend (priv->images, mime_part); + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); + g_free (filename); + } } @@ -1578,17 +1965,13 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) } void -modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) -{ - - ModestMsgEditWindowPrivate *priv; +modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) +{ GtkWidget *dialog = NULL; gint response = 0; GSList *uris = NULL; GSList *uri_node; - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (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")); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); @@ -1603,125 +1986,73 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) } gtk_widget_destroy (dialog); - for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) { - const gchar *uri; - GnomeVFSHandle *handle = NULL; - GnomeVFSResult result; - - uri = (const gchar *) uri_node->data; - result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); - if (result == GNOME_VFS_OK) { - TnyMimePart *mime_part; - TnyStream *stream; - const gchar *mime_type = NULL; - gchar *basename; - gchar *escaped_filename; - gchar *filename; - gchar *content_id; - GnomeVFSFileInfo info; - GnomeVFSURI *vfs_uri; - - vfs_uri = gnome_vfs_uri_new (uri); - - - escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri)); - filename = gnome_vfs_unescape_string_for_display (escaped_filename); - g_free (escaped_filename); - gnome_vfs_uri_unref (vfs_uri); - - if (gnome_vfs_get_file_info (uri, - &info, - GNOME_VFS_FILE_INFO_GET_MIME_TYPE | - GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE) - == GNOME_VFS_OK) - mime_type = gnome_vfs_file_info_get_mime_type (&info); - mime_part = tny_platform_factory_new_mime_part - (modest_runtime_get_platform_factory ()); - stream = TNY_STREAM (tny_vfs_stream_new (handle)); - - tny_mime_part_construct_from_stream (mime_part, stream, mime_type); - - content_id = g_strdup_printf ("%d", priv->last_cid); - tny_mime_part_set_content_id (mime_part, content_id); - g_free (content_id); - priv->last_cid++; - - basename = g_path_get_basename (filename); - tny_mime_part_set_filename (mime_part, basename); - g_free (basename); - - priv->attachments = g_list_prepend (priv->attachments, mime_part); - modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), - mime_part); - gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); - gtk_widget_show_all (priv->attachments_caption); - gtk_text_buffer_set_modified (priv->text_buffer, TRUE); - g_free (filename); - - } + for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) { + const gchar *uri = (const gchar *) uri_node->data; + modest_msg_edit_window_attach_file_one (window, uri); } g_slist_foreach (uris, (GFunc) g_free, NULL); g_slist_free (uris); } void -modest_msg_edit_window_attach_file_noninteractive ( +modest_msg_edit_window_attach_file_one ( ModestMsgEditWindow *window, - const gchar *file_uri) + const gchar *uri) { + g_return_if_fail (window); + g_return_if_fail (uri); + + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - ModestMsgEditWindowPrivate *priv; - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - - if (file_uri && strlen(file_uri)) { - gint file_id = 0; + GnomeVFSHandle *handle = NULL; + GnomeVFSResult result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); + if (result == GNOME_VFS_OK) { + TnyMimePart *mime_part; + TnyStream *stream; + const gchar *mime_type = NULL; + gchar *basename; + gchar *escaped_filename; + gchar *filename; + gchar *content_id; + GnomeVFSFileInfo info; + GnomeVFSURI *vfs_uri; + + vfs_uri = gnome_vfs_uri_new (uri); - /* TODO: We should probably try to use only the URI, - * instead of using a filename. - */ - gchar* filename = g_filename_from_uri (file_uri, NULL, NULL); - if (!filename) { - g_warning("%s: g_filename_from_uri('%s') failed.\n", __FUNCTION__, file_uri); - } - - file_id = g_open (filename, O_RDONLY, 0); - if (file_id != -1) { - TnyMimePart *mime_part; - TnyStream *stream; - const gchar *mime_type; - gchar *basename; - gchar *content_id; -#ifdef MODEST_HAVE_HILDON0_WIDGETS - mime_type = gnome_vfs_get_mime_type(filename); -#else - mime_type = gnome_vfs_get_file_mime_type_fast (filename, NULL); -#endif - mime_part = tny_platform_factory_new_mime_part - (modest_runtime_get_platform_factory ()); - stream = TNY_STREAM (tny_fs_stream_new (file_id)); - - tny_mime_part_construct_from_stream (mime_part, stream, mime_type); - - content_id = g_strdup_printf ("%d", priv->last_cid); - tny_mime_part_set_content_id (mime_part, content_id); - g_free (content_id); - priv->last_cid++; - - basename = g_path_get_basename (filename); - tny_mime_part_set_filename (mime_part, basename); - g_free (basename); - - priv->attachments = g_list_prepend (priv->attachments, mime_part); - modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), - mime_part); - gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); - gtk_widget_show_all (priv->attachments_caption); - } else if (file_id == -1) { - close (file_id); - g_warning("file to be attached does not exist: %s", filename); - } + escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri)); + filename = gnome_vfs_unescape_string_for_display (escaped_filename); + g_free (escaped_filename); + gnome_vfs_uri_unref (vfs_uri); + + if (gnome_vfs_get_file_info (uri, + &info, + GNOME_VFS_FILE_INFO_GET_MIME_TYPE | + GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE) + == GNOME_VFS_OK) + mime_type = gnome_vfs_file_info_get_mime_type (&info); + mime_part = tny_platform_factory_new_mime_part + (modest_runtime_get_platform_factory ()); + stream = TNY_STREAM (tny_vfs_stream_new (handle)); + + tny_mime_part_construct_from_stream (mime_part, stream, mime_type); + + content_id = g_strdup_printf ("%d", priv->last_cid); + tny_mime_part_set_content_id (mime_part, content_id); + g_free (content_id); + priv->last_cid++; + + basename = g_path_get_basename (filename); + tny_mime_part_set_filename (mime_part, basename); + g_free (basename); + + priv->attachments = g_list_prepend (priv->attachments, mime_part); + modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), + mime_part); + gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); + gtk_widget_show_all (priv->attachments_caption); + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); g_free (filename); } } @@ -1748,15 +2079,27 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, gboolean dialog_response; GList *node; gchar *message = NULL; - const gchar *filename = NULL; + gchar *filename = NULL; if (att_list->next == NULL) { - filename = tny_mime_part_get_filename (TNY_MIME_PART (att_list->data)); + if (TNY_IS_MSG (att_list->data)) { + TnyHeader *header = tny_msg_get_header (TNY_MSG (att_list->data)); + if (header) { + filename = g_strdup (tny_header_get_subject (header)); + g_object_unref (header); + } + if (filename == NULL) { + filename = g_strdup (_("mail_va_no_subject")); + } + } else { + filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (att_list->data))); + } } else { - filename = ""; + filename = g_strdup (""); } message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments", att_list->next == NULL), filename); + g_free (filename); confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message); g_free (message); dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK); @@ -2020,34 +2363,22 @@ modest_msg_edit_window_window_state_event (GtkWidget *widget, GdkEventWindowStat } void -modest_msg_edit_window_toggle_fullscreen (ModestMsgEditWindow *window) -{ - ModestWindowPrivate *parent_priv; - GtkAction *fs_toggle_action; - gboolean active; - - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - - fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu"); - active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), !active); -} - -void modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, gboolean show) { ModestMsgEditWindowPrivate *priv = NULL; - const gchar *recipients; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + if (!priv->update_caption_visibility) + return; + gtk_widget_set_no_show_all (priv->cc_caption, TRUE); - recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)); - if ((show) || ((recipients != NULL) && (recipients[0] != '\0'))) + if (show) gtk_widget_show (priv->cc_caption); else gtk_widget_hide (priv->cc_caption); + modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, show, NULL); } @@ -2056,16 +2387,18 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window, gboolean show) { ModestMsgEditWindowPrivate *priv = NULL; - const gchar *recipients; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + if (!priv->update_caption_visibility) + return; + gtk_widget_set_no_show_all (priv->bcc_caption, TRUE); - recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)); - if ((show) || ((recipients != NULL) && (recipients[0] != '\0'))) + if (show) gtk_widget_show (priv->bcc_caption); else gtk_widget_hide (priv->bcc_caption); + modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, show, NULL); } @@ -2122,18 +2455,34 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self, gboolean show_toolbar) { ModestWindowPrivate *parent_priv; + const gchar *action_name; + GtkAction *action; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - /* FIXME: we can not just use the code of + /* 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 gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); + + /* Update also the actions (to update the toggles in the + menus), we have to do it manually because some other window + of the same time could have changed it (remember that the + toolbar fullscreen mode is shared by all the windows of the + same type */ + if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ())) + action_name = "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarFullScreenMenu"; + else + action_name = "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarNormalScreenMenu"; + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + show_toolbar); + } void @@ -2147,7 +2496,6 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window, priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - priority_flags = priority_flags & (TNY_HEADER_FLAG_PRIORITY); if (priv->priority_flags != priority_flags) { GtkAction *priority_action = NULL; @@ -2198,6 +2546,7 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, switch (file_format) { case MODEST_FILE_FORMAT_FORMATTED_TEXT: wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE); + remove_tags (WP_TEXT_BUFFER (priv->text_buffer)); break; case MODEST_FILE_FORMAT_PLAIN_TEXT: { @@ -2210,12 +2559,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); } else { GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu")); - toggle_action_set_active_block_notify (action, TRUE); + modest_maemo_toggle_action_set_active_block_notify (action, TRUE); } } break; } - update_dimmed (window); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); } } @@ -2345,6 +2694,7 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window) fmt.cs.font_size = TRUE; } wp_text_buffer_set_format(WP_TEXT_BUFFER(priv->text_buffer), &fmt); + text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), window); } gtk_widget_destroy (dialog); @@ -2361,7 +2711,7 @@ modest_msg_edit_window_undo (ModestMsgEditWindow *window) wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer)); - update_dimmed (window); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); } @@ -2375,91 +2725,47 @@ modest_msg_edit_window_redo (ModestMsgEditWindow *window) wp_text_buffer_redo (WP_TEXT_BUFFER (priv->text_buffer)); - update_dimmed (window); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); } -static void -update_dimmed (ModestMsgEditWindow *window) +static void +text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - GtkAction *action; - GtkWidget *widget; - gboolean rich_text; - gboolean editor_focused; - rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)); - editor_focused = gtk_widget_is_focus (priv->msg_body); - - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/InsertImageMenu"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBold"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics"); - gtk_action_set_sensitive (action, rich_text && editor_focused); - widget = priv->font_color_button; - gtk_widget_set_sensitive (widget, rich_text && editor_focused); - widget = priv->font_size_toolitem; - gtk_widget_set_sensitive (widget, rich_text && editor_focused); - widget = priv->font_face_toolitem; - gtk_widget_set_sensitive (widget, rich_text && editor_focused); + priv->can_undo = can_undo; } -static void -setup_insensitive_handlers (ModestMsgEditWindow *window) +static void +text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window) { - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - GtkWidget *widget; - - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = priv->font_color_button; - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = priv->font_size_toolitem; - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = priv->font_face_toolitem; - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); + priv->can_redo = can_redo; } -static void -text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window) +gboolean +modest_msg_edit_window_can_undo (ModestMsgEditWindow *window) { - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - GtkAction *action; + ModestMsgEditWindowPrivate *priv; + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/UndoMenu"); - gtk_action_set_sensitive (action, can_undo); + return priv->can_undo; } -static void -text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window) +gboolean +modest_msg_edit_window_can_redo (ModestMsgEditWindow *window) { - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - GtkAction *action; + ModestMsgEditWindowPrivate *priv; + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/RedoMenu"); - gtk_action_set_sensitive (action, can_redo); + return priv->can_redo; } + static void text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id) { @@ -2490,35 +2796,23 @@ text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id) } } -static void -text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata) +gboolean +message_is_empty (ModestMsgEditWindow *window) { - ModestMsgEditWindow *window = (ModestMsgEditWindow *) userdata; - GtkTextIter real_start, real_end; - ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + ModestMsgEditWindowPrivate *priv = NULL; - if (gtk_text_iter_compare (start, end) > 0) { - real_start = *end; - real_end = *start; - } else { - real_start = *start; - real_end = *end; - } - do { - GSList *tags = gtk_text_iter_get_tags (&real_start); - GSList *node; - for (node = tags; node != NULL; node = g_slist_next (node)) { - GtkTextTag *tag = (GtkTextTag *) node->data; - if (g_object_get_data (G_OBJECT (tag), "image-set") != NULL) { - gchar *image_id = g_object_get_data (G_OBJECT (tag), "image-index"); + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - modest_attachments_view_remove_attachment_by_id (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), - image_id); - gtk_text_buffer_remove_tag (buffer, tag, start, end); - } - } - } while (gtk_text_iter_forward_char (&real_start)&& - (gtk_text_iter_compare (&real_start, &real_end)<=0)); + /** TODO: Add wpeditor API to tell us if there is any _visible_ text, + * so we can ignore markup. + */ + GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); + gint count = 0; + if (buf) + count = gtk_text_buffer_get_char_count (buf); + + return count == 0; } static gboolean @@ -2527,7 +2821,7 @@ msg_body_focus (GtkWidget *focus, gpointer userdata) { - update_dimmed (MODEST_MSG_EDIT_WINDOW (userdata)); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (userdata)); return FALSE; } @@ -2535,49 +2829,17 @@ static void recpt_field_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor) { - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (editor); - ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); - GtkTextBuffer *to_buffer, *cc_buffer, *bcc_buffer; - gboolean dim = FALSE; - GtkAction *action; - - to_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)); - cc_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field)); - bcc_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field)); - - dim = ((gtk_text_buffer_get_char_count (to_buffer) + - gtk_text_buffer_get_char_count (cc_buffer) + - gtk_text_buffer_get_char_count (bcc_buffer)) == 0); - - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSend"); - gtk_action_set_sensitive (action, !dim); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EmailMenu/SendMenu"); - gtk_action_set_sensitive (action, !dim); -} - -static void -send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) -{ - hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first")); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor)); } static void -style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) +body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor) { - gboolean rich_text, editor_focused; - - ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); - rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)); - editor_focused = gtk_widget_is_focus (priv->msg_body); - - if (!rich_text) - hildon_banner_show_information (NULL, NULL, _("mcen_ib_item_unavailable_plaintext")); - else if (!editor_focused) - hildon_banner_show_information (NULL, NULL, _("mcen_ib_move_cursor_to_message")); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor)); } -static void -reset_modified (ModestMsgEditWindow *editor) +void +modest_msg_edit_window_reset_modified (ModestMsgEditWindow *editor) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); GtkTextBuffer *buffer; @@ -2612,11 +2874,14 @@ modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor) return FALSE; } + + + gboolean -modest_msg_edit_window_check_names (ModestMsgEditWindow *window) +modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook) { ModestMsgEditWindowPrivate *priv = NULL; - + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); @@ -2629,14 +2894,22 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window) return FALSE; } - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field))) + if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook)) { + modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field)); return FALSE; - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field))) + } + if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook)) { + modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field)); return FALSE; - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field))) + } + if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) { + modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field)); return FALSE; + } - modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field)); + if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) && + !modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field))) + modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field)); return TRUE; @@ -2646,7 +2919,15 @@ static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button, ModestMsgEditWindow *window) { - modest_msg_edit_window_attach_file (window); + modest_msg_edit_window_offer_attach_file (window); +} + +const gchar * +modest_msg_edit_window_get_clipboard_text (ModestMsgEditWindow *win) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win); + + return priv->clipboard_text; } static void @@ -2654,32 +2935,32 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgEditWindow *window) { - ModestWindowPrivate *parent_priv; - ModestMsgEditWindowPrivate *priv; - GtkAction *action; - gboolean has_selection; - GtkWidget *focused; - GList *selected_attachments = NULL; - gint n_att_selected = 0; + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + GtkClipboard *selection_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + gchar *text = NULL; + if (!GTK_WIDGET_VISIBLE (window)) + return; - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL); - focused = gtk_window_get_focus (GTK_WINDOW (window)); + text = gtk_clipboard_wait_for_text (selection_clipboard); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu"); - gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu"); - gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); + if (priv->clipboard_text != NULL) { + g_free (priv->clipboard_text); + } + priv->clipboard_text = text; - selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); - n_att_selected = g_list_length (selected_attachments); - g_list_free (selected_attachments); + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules"); +} +static void +subject_field_move_cursor (GtkEntry *entry, + GtkMovementStep step, + gint a1, + gboolean a2, + gpointer window) +{ + if (!GTK_WIDGET_VISIBLE (window)) + return; - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu"); - gtk_action_set_sensitive (action, n_att_selected == 1); - - update_paste_dimming (window); + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules"); } static void @@ -2704,6 +2985,57 @@ subject_field_changed (GtkEditable *editable, ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); update_window_title (window); gtk_text_buffer_set_modified (priv->text_buffer, TRUE); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +static void +subject_field_insert_text (GtkEditable *editable, + gchar *new_text, + gint new_text_length, + gint *position, + ModestMsgEditWindow *window) +{ + GString *result = g_string_new (""); + gchar *current; + gint result_len = 0; + const gchar *entry_text = NULL; + gint old_length; + + entry_text = gtk_entry_get_text (GTK_ENTRY (editable)); + old_length = g_utf8_strlen (entry_text, -1); + + for (current = new_text; current != NULL && *current != '\0'; current = g_utf8_next_char (current)) { + gunichar c = g_utf8_get_char_validated (current, 8); + /* Invalid unichar, stop */ + if (c == -1) + break; + /* a bullet */ + if (c == 0x2022) + continue; + result = g_string_append_unichar (result, c); + result_len++; + } + + if (MIN (result_len, 1000) != g_utf8_strlen (new_text, 1000)) { + g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text"); + if (result_len > 0) + { + /* Prevent endless recursion */ + g_signal_handlers_block_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window); + g_signal_emit_by_name (editable, "insert-text", + (gpointer) result->str, (gpointer) result->len, + (gpointer) position, (gpointer) window); + g_signal_handlers_unblock_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window); + } + } + + if (result_len + old_length > 1000) { + hildon_banner_show_information (GTK_WIDGET (window), NULL, + dgettext("hildon-common-strings", + "ckdg_ib_maximum_characters_reached")); + } + + g_string_free (result, TRUE); } void @@ -2716,6 +3048,7 @@ modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); gtk_widget_set_no_show_all (priv->find_toolbar, FALSE); + if (show) { gtk_widget_show_all (priv->find_toolbar); hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE); @@ -2794,6 +3127,13 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, GtkTextIter match_start, match_end; gboolean continue_search = FALSE; + if (message_is_empty (window)) { + g_free (priv->last_search); + priv->last_search = NULL; + hildon_banner_show_information (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find")); + return; + } + g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL); if ((current_search == NULL) || (strcmp (current_search, "") == 0)) { g_free (current_search); @@ -2849,86 +3189,6 @@ modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, gtk_toggle_action_set_active (toggle, FALSE); } - -static void -update_paste_dimming (ModestMsgEditWindow *window) -{ - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - GtkAction *action = NULL; - GtkClipboard *clipboard = NULL; - GtkWidget *focused; - gboolean active; - - focused = gtk_window_get_focus (GTK_WINDOW (window)); - - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - active = gtk_clipboard_wait_is_text_available (clipboard); - - if (active) { - if (MODEST_IS_ATTACHMENTS_VIEW (focused)) - active = FALSE; - } - - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu"); - gtk_action_set_sensitive (action, active); - -} - -static void -update_select_all_dimming (ModestMsgEditWindow *window) -{ - GtkWidget *focused; - gboolean dimmed = FALSE; - GtkAction *action; - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - - focused = gtk_window_get_focus (GTK_WINDOW (window)); - if (GTK_IS_ENTRY (focused)) { - const gchar *current_text; - current_text = gtk_entry_get_text (GTK_ENTRY (focused)); - dimmed = ((current_text == NULL) || (current_text[0] == '\0')); - } else if (GTK_IS_TEXT_VIEW (focused)) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused)); - dimmed = (gtk_text_buffer_get_char_count (buffer) < 1); - } else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) { - dimmed = FALSE; - } - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/SelectAllMenu"); - gtk_action_set_sensitive (action, !dimmed); -} - -static void -update_zoom_dimming (ModestMsgEditWindow *window) -{ - GtkWidget *focused; - gboolean dimmed = FALSE; - GtkAction *action; - ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - - focused = gtk_window_get_focus (GTK_WINDOW (window)); - dimmed = ! WP_IS_TEXT_VIEW (focused); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ZoomMenu"); - gtk_action_set_sensitive (action, !dimmed); -} - -static void -edit_menu_activated (GtkAction *action, - gpointer userdata) -{ - ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata); - - update_select_all_dimming (window); - update_paste_dimming (window); -} -static void -view_menu_activated (GtkAction *action, - gpointer userdata) -{ - ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata); - - update_zoom_dimming (window); -} - gboolean modest_msg_edit_window_get_sent (ModestMsgEditWindow *window) { @@ -2963,19 +3223,125 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); if (priv->draft_msg != NULL) { - header = tny_msg_get_header (priv->draft_msg); - if (TNY_IS_HEADER (header)) { - modest_window_mgr_unregister_header (mgr, header); - } g_object_unref (priv->draft_msg); } if (draft != NULL) { g_object_ref (draft); header = tny_msg_get_header (draft); - if (TNY_IS_HEADER (header)) - modest_window_mgr_register_header (mgr, header); + if (priv->msg_uid) { + g_free (priv->msg_uid); + priv->msg_uid = NULL; + } + priv->msg_uid = modest_tny_folder_get_header_unique_id (header); + if (GTK_WIDGET_REALIZED (window)) + modest_window_mgr_register_window (mgr, MODEST_WINDOW (window)); } priv->draft_msg = draft; } + +static void +text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, + GtkTextIter *start, GtkTextIter *end, + gpointer userdata) +{ + ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata); + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (userdata); + gchar *tag_name; + + if (tag == NULL+13) return; + g_object_get (G_OBJECT (tag), "name", &tag_name, NULL); + if ((tag_name != NULL) && (g_str_has_prefix (tag_name, "image-tag-replace-"))) { + replace_with_images (window, priv->images); + } +} + +void +modest_msg_edit_window_add_part (ModestMsgEditWindow *window, + TnyMimePart *part) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + g_return_if_fail (TNY_IS_MIME_PART (part)); + priv->attachments = g_list_prepend (priv->attachments, part); + g_object_ref (part); + modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part); + gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); + gtk_widget_show_all (priv->attachments_caption); + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); +} + +const gchar* +modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), NULL); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + return priv->msg_uid; +} + +GtkWidget * +modest_msg_edit_window_get_child_widget (ModestMsgEditWindow *win, + ModestMsgEditWindowWidgetType widget_type) +{ + ModestMsgEditWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), NULL); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win); + + switch (widget_type) { + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BODY: + return priv->msg_body; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO: + return priv->to_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC: + return priv->cc_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC: + return priv->bcc_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT: + return priv->subject_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS: + return priv->attachments_view; + break; + default: + return NULL; + } +} + +static void +remove_tags (WPTextBuffer *buffer) +{ + GtkTextIter start, end; + + gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start); + gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end); + + gtk_text_buffer_remove_all_tags (GTK_TEXT_BUFFER (buffer), &start, &end); +} + +static void +on_account_removed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) +{ + /* Do nothing if it's a store account, because we use the + transport to send the messages */ + if (tny_account_get_account_type(account) == TNY_ACCOUNT_TYPE_TRANSPORT) { + const gchar *parent_acc = NULL; + const gchar *our_acc = NULL; + + our_acc = modest_window_get_active_account (MODEST_WINDOW (user_data)); + parent_acc = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + /* Close this window if I'm showing a message of the removed account */ + if (strcmp (parent_acc, our_acc) == 0) + modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (user_data)); + } +}