X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=503739cf589353ade5a398417ab1d8dbca67dcc6;hp=7a893bb014e8c7e34ceb1ddce396618a52f48ee3;hb=ae6cc4558ea0f5afc82a06376200904ee7b061dd;hpb=aa030218771ad53bf01c092b1b689c28e340202f diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 7a893bb..503739c 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -55,6 +55,7 @@ #include "modest-mail-operation.h" #include "modest-tny-platform-factory.h" #include "modest-tny-msg.h" +#include "modest-tny-folder.h" #include "modest-address-book.h" #include "modest-text-utils.h" #include @@ -82,6 +83,7 @@ #define DEFAULT_MAIN_VBOX_SPACING 6 #define SUBJECT_MAX_LENGTH 1000 #define IMAGE_MAX_WIDTH 640 +#define DEFAULT_FONT_SCALE 1.5 static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass); static void modest_msg_edit_window_init (ModestMsgEditWindow *obj); @@ -91,15 +93,13 @@ static gboolean msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer 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 remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor); -static void zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor); -static void paste_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_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id); static void subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window); static void modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, @@ -127,9 +127,6 @@ 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 modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard, - GdkEvent *event, - ModestMsgEditWindow *window); static void update_window_title (ModestMsgEditWindow *window); static void update_dimmed (ModestMsgEditWindow *window); static void update_paste_dimming (ModestMsgEditWindow *window); @@ -141,6 +138,18 @@ static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, ModestMsgEditWindow *window); static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, ModestMsgEditWindow *window); +static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, + const gchar *str, + GtkTextIter *match_start, + GtkTextIter *match_end); + + + +/* static gboolean */ +/* on_key_pressed (GtkWidget *self, */ +/* GdkEventKey *event, */ +/* gpointer user_data); */ + static void edit_menu_activated (GtkAction *action, gpointer userdata); static void view_menu_activated (GtkAction *action, @@ -184,6 +193,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *size_tool_button_label; GtkWidget *find_toolbar; + gchar *last_search; GtkWidget *scroll; GtkWidget *scroll_area; @@ -196,9 +206,9 @@ struct _ModestMsgEditWindowPrivate { gdouble zoom_level; gulong clipboard_change_handler_id; - gulong system_clipboard_change_handler_id; TnyMsg *draft_msg; + gboolean sent; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -268,10 +278,11 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass) modest_window_class->zoom_plus_func = modest_msg_edit_window_zoom_plus; 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; g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate)); - modest_window_class->save_state_func = save_state; + } static void @@ -296,10 +307,11 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->priority_flags = 0; priv->find_toolbar = NULL; + priv->last_search = NULL; priv->draft_msg = NULL; priv->clipboard_change_handler_id = 0; - priv->system_clipboard_change_handler_id = 0; + priv->sent = FALSE; } @@ -372,6 +384,7 @@ init_window (ModestMsgEditWindow *obj) priv->priority_icon = gtk_image_new (); gtk_box_pack_start (GTK_BOX (subject_box), priv->priority_icon, FALSE, FALSE, 0); priv->subject_field = gtk_entry_new_with_max_length (SUBJECT_MAX_LENGTH); + g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL); hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); gtk_box_pack_start (GTK_BOX (subject_box), priv->subject_field, TRUE, TRUE, 0); @@ -415,20 +428,27 @@ init_window (ModestMsgEditWindow *obj) priv->msg_body = wp_text_view_new (); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->msg_body), GTK_WRAP_WORD_CHAR); priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); - g_object_set (priv->text_buffer, "font_scale", 1.0, NULL); + 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); -/* gtk_text_buffer_set_can_paste_rich_text (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"); +#endif wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE); priv->find_toolbar = hildon_find_toolbar_new (NULL); gtk_widget_set_no_show_all (priv->find_toolbar, TRUE); +/* 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); @@ -461,7 +481,8 @@ init_window (ModestMsgEditWindow *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); - + modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->scroll), TRUE); + main_vbox = gtk_vbox_new (FALSE, DEFAULT_MAIN_VBOX_SPACING); gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0); @@ -497,8 +518,6 @@ init_window (ModestMsgEditWindow *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->system_clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)), "owner-change", - G_CALLBACK (modest_msg_edit_window_system_clipboard_owner_change), obj); } @@ -513,12 +532,16 @@ modest_msg_edit_window_finalize (GObject *obj) priv->clipboard_change_handler_id = 0; } - if (priv->system_clipboard_change_handler_id > 0) { - g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - priv->system_clipboard_change_handler_id); - priv->system_clipboard_change_handler_id = 0; + if (priv->draft_msg != NULL) { + TnyHeader *header = tny_msg_get_header (priv->draft_msg); + if (TNY_IS_HEADER (header)) { + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + modest_window_mgr_unregister_header (mgr, header); + } + g_object_unref (priv->draft_msg); + priv->draft_msg = NULL; } - + /* This had to stay alive for as long as the combobox that used it: */ modest_pair_list_free (priv->from_field_protos); @@ -560,6 +583,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) ModestMsgEditWindowPrivate *priv; GtkTextIter iter; TnyHeaderFlags priority_flags; + TnyFolder *msg_folder; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); g_return_if_fail (TNY_IS_MSG (msg)); @@ -598,7 +622,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) update_window_title (self); -/* gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */ wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE); body = modest_tny_msg_get_body (msg, TRUE); @@ -646,8 +669,16 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) update_dimmed (self); text_buffer_can_undo (priv->text_buffer, FALSE, self); + text_buffer_can_redo (priv->text_buffer, FALSE, self); - priv->draft_msg = msg; + /* 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); + g_object_unref (msg_folder); + } } static void @@ -917,8 +948,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) restore_settings (MODEST_MSG_EDIT_WINDOW(obj)); - gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL); - modest_window_set_active_account (MODEST_WINDOW(obj), account_name); modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj)); @@ -935,7 +964,10 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) /* Set window icon */ window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON); - gtk_window_set_icon (GTK_WINDOW (obj), window_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"); @@ -1044,13 +1076,34 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) else data->html_body = NULL; - data->attachments = priv->attachments; /* TODO: copy and free ? */ + /* deep-copy the data */ + GList *cursor = priv->attachments; + data->attachments = NULL; + 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); + } + data->priority_flags = priv->priority_flags; return data; } -/* TODO: We must duplicate this implementation for GNOME and Maemo, but that is unwise. */ + +static void +unref_gobject (GObject *obj, gpointer data) +{ + if (!G_IS_OBJECT(obj)) + return; + g_object_unref (obj); +} + void modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, MsgData *data) @@ -1066,14 +1119,16 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, g_free (data->subject); g_free (data->plain_body); g_free (data->html_body); + g_free (data->account_name); + if (data->draft_msg != NULL) { g_object_unref (data->draft_msg); data->draft_msg = NULL; } - g_free (data->account_name); - - /* TODO: Free data->attachments? */ - + + g_list_foreach (data->attachments, (GFunc)unref_gobject, NULL); + g_list_free (data->attachments); + g_slice_free (MsgData, data); } @@ -1181,7 +1236,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self, wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) (&(buffer_format->color))); } if (buffer_format->cs.font_size) { - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD, (gpointer) (buffer_format->font_size)); + wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, (gpointer) (buffer_format->font_size)); } if (buffer_format->cs.justification) { switch (buffer_format->justification) { @@ -1200,7 +1255,7 @@ 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_BOLD, (gpointer) (buffer_format->font)); + wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) (buffer_format->font)); } if (buffer_format->cs.bullet) { wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((int)buffer_format->bullet)); @@ -1448,14 +1503,22 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) GdkPixbufLoader *loader; GdkPixbuf *pixbuf; GnomeVFSFileInfo info; - gchar *filename, *basename; + gchar *filename, *basename, *escaped_filename; TnyMimePart *mime_part; TnyStream *stream; gchar *content_id; const gchar *mime_type = NULL; + 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); - filename = g_filename_from_uri (uri, NULL, NULL); - if (gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE) + 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); @@ -1484,9 +1547,9 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL); while (!tny_stream_is_eos (TNY_STREAM (stream))) { - char read_buffer[128]; + unsigned char read_buffer[128]; gint readed; - readed = tny_stream_read (TNY_STREAM (stream), read_buffer, 128); + readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128); if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL)) break; } @@ -1529,6 +1592,7 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) 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); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -1553,13 +1617,25 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) TnyStream *stream; const gchar *mime_type = NULL; gchar *basename; + gchar *escaped_filename; gchar *filename; gchar *content_id; GnomeVFSFileInfo info; + GnomeVFSURI *vfs_uri; - filename = g_filename_from_uri (uri, NULL, NULL); + vfs_uri = gnome_vfs_uri_new (uri); - if (gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE) == GNOME_VFS_OK) + + 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 ()); @@ -1600,7 +1676,7 @@ modest_msg_edit_window_attach_file_noninteractive ( priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - if (file_uri) { + if (file_uri && strlen(file_uri)) { gint file_id = 0; /* TODO: We should probably try to use only the URI, @@ -1608,7 +1684,7 @@ modest_msg_edit_window_attach_file_noninteractive ( */ 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); + g_warning("%s: g_filename_from_uri('%s') failed.\n", __FUNCTION__, file_uri); } file_id = g_open (filename, O_RDONLY, 0); @@ -1756,7 +1832,7 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, WPTextBufferFormat format; memset (&format, 0, sizeof (format)); - wp_text_buffer_get_current_state (WP_TEXT_BUFFER (priv->text_buffer), &format); + wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &format, FALSE); label = gtk_bin_get_child (GTK_BIN (menu_item)); @@ -1765,14 +1841,14 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, format.cs.text_position = TRUE; format.cs.font = TRUE; format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE); - wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); +/* wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */ -/* if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, */ -/* (gpointer) wp_get_font_size_index (new_size_index, 12))) */ -/* wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); */ + if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, + (gpointer) wp_get_font_size_index (new_size_index, 12))) + wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window)); - markup = g_strconcat ("", gtk_label_get_text (GTK_LABEL (label)), "", NULL); + markup = g_strconcat ("", gtk_label_get_text (GTK_LABEL (label)), "", NULL); gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup); g_free (markup); } @@ -1822,7 +1898,7 @@ modest_msg_edit_window_set_zoom (ModestWindow *window, priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); parent_priv = MODEST_WINDOW_GET_PRIVATE (window); priv->zoom_level = zoom; - wp_text_buffer_set_font_scaling_factor (WP_TEXT_BUFFER (priv->text_buffer), zoom); + wp_text_buffer_set_font_scaling_factor (WP_TEXT_BUFFER (priv->text_buffer), zoom*DEFAULT_FONT_SCALE); /* Zoom level menu options should be updated with the current zoom level */ parent_priv = MODEST_WINDOW_GET_PRIVATE (window); @@ -2109,10 +2185,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, gint file_format) { ModestMsgEditWindowPrivate *priv; + ModestWindowPrivate *parent_priv; gint current_format; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); + parent_priv = MODEST_WINDOW_GET_PRIVATE (window); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)) @@ -2130,8 +2208,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, dialog = hildon_note_new_confirmation (NULL, _("emev_nc_formatting_lost")); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - if (response == GTK_RESPONSE_OK) + if (response == GTK_RESPONSE_OK) { 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); + } } break; } @@ -2285,6 +2367,20 @@ modest_msg_edit_window_undo (ModestMsgEditWindow *window) } +void +modest_msg_edit_window_redo (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + wp_text_buffer_redo (WP_TEXT_BUFFER (priv->text_buffer)); + + update_dimmed (window); + +} + static void update_dimmed (ModestMsgEditWindow *window) { @@ -2333,23 +2429,6 @@ setup_insensitive_handlers (ModestMsgEditWindow *window) 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, "/MenuBar/EmailMenu/SendMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window); - - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/InsertImageMenu"); - 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/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"); @@ -2361,13 +2440,6 @@ setup_insensitive_handlers (ModestMsgEditWindow *window) widget = priv->font_face_toolitem; g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (remove_attachment_insensitive_press), window); - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/ViewMenu/ZoomMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (zoom_insensitive_press), window); - - widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu"); - g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (paste_insensitive_press), window); } static void @@ -2380,6 +2452,16 @@ text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWin gtk_action_set_sensitive (action, can_undo); } +static void +text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window) +{ + ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + GtkAction *action; + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/RedoMenu"); + gtk_action_set_sensitive (action, can_redo); +} + static void text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id) { @@ -2481,34 +2563,6 @@ send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first")); } -static void -zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) -{ - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); -} - -static void -remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) -{ - ModestWindowPrivate *parent_priv; - ModestMsgEditWindowPrivate *priv; - GList *selected_attachments = NULL; - gint n_att_selected = 0; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); - parent_priv = MODEST_WINDOW_GET_PRIVATE (editor); - - 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); - - if (n_att_selected > 1) - hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more")); - else if (n_att_selected == 0) - hildon_banner_show_information (NULL, NULL, _("TODO: select one attachment")); - -} - static void style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) { @@ -2605,20 +2659,23 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, ModestWindowPrivate *parent_priv; ModestMsgEditWindowPrivate *priv; GtkAction *action; - gchar *selection; + gboolean has_selection; GtkWidget *focused; GList *selected_attachments = NULL; gint n_att_selected = 0; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - selection = gtk_clipboard_wait_for_text (clipboard); + + if (!GTK_WIDGET_VISIBLE (window)) + return; + has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL); focused = gtk_window_get_focus (GTK_WINDOW (window)); action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu"); - gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); + 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, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); + gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); n_att_selected = g_list_length (selected_attachments); @@ -2627,7 +2684,6 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, 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); } @@ -2675,6 +2731,63 @@ modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, } +static gboolean +gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, + const gchar *str, + GtkTextIter *match_start, + GtkTextIter *match_end) +{ + GtkTextIter end_iter; + gchar *str_casefold; + gint str_chars_n; + gchar *range_text; + gchar *range_casefold; + gint offset; + gint range_chars_n; + gboolean result = FALSE; + + if (str == NULL) + return TRUE; + + /* get end iter */ + end_iter = *iter; + gtk_text_iter_forward_to_end (&end_iter); + + str_casefold = g_utf8_casefold (str, -1); + str_chars_n = strlen (str); + + range_text = gtk_text_iter_get_visible_text (iter, &end_iter); + range_casefold = g_utf8_casefold (range_text, -1); + range_chars_n = strlen (range_casefold); + + if (range_chars_n < str_chars_n) { + g_free (str_casefold); + g_free (range_text); + g_free (range_casefold); + return FALSE; + } + + for (offset = 0; offset <= range_chars_n - str_chars_n; offset++) { + gchar *range_subtext = g_strndup (range_casefold + offset, str_chars_n); + if (!g_utf8_collate (range_subtext, str_casefold)) { + gchar *found_text = g_strndup (range_text + offset, str_chars_n); + result = TRUE; + gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY, + match_start, match_end, NULL); + g_free (found_text); + } + g_free (range_subtext); + if (result) + break; + } + g_free (str_casefold); + g_free (range_text); + g_free (range_casefold); + + return result; +} + + static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, ModestMsgEditWindow *window) @@ -2684,25 +2797,47 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, gboolean result; GtkTextIter selection_start, selection_end; GtkTextIter match_start, match_end; + gboolean continue_search = FALSE; g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL); - if ((current_search == NULL) && (strcmp (current_search, "") == 0)) { + if ((current_search == NULL) || (strcmp (current_search, "") == 0)) { g_free (current_search); + g_free (priv->last_search); + priv->last_search = NULL; + /* Information banner about empty search */ + hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text")); return; } - gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end); - result = gtk_text_iter_forward_search (&selection_end, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, NULL); - if (!result) { + if ((priv->last_search != NULL)&&(!strcmp (current_search, priv->last_search))) { + continue_search = TRUE; + } else { + g_free (priv->last_search); + priv->last_search = g_strdup (current_search); + } + + if (continue_search) { + gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end); + result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, + &match_start, &match_end); + if (!result) + hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete")); + } else { GtkTextIter buffer_start; gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start); - result = gtk_text_iter_forward_search (&buffer_start, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, &selection_start); + result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, + &match_start, &match_end); + if (!result) + hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches")); } + + /* Mark as selected the string found in search */ if (result) { gtk_text_buffer_select_range (priv->text_buffer, &match_start, &match_end); gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->msg_body), &match_start, 0.0, TRUE, 0.0, 0.0); } else { - /* TODO: warning about non succesful search */ + g_free (priv->last_search); + priv->last_search = NULL; } g_free (current_search); } @@ -2744,27 +2879,6 @@ update_paste_dimming (ModestMsgEditWindow *window) } -static void -paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) -{ - GtkWidget *focused = gtk_window_get_focus (GTK_WINDOW (editor)); - - if (MODEST_IS_ATTACHMENTS_VIEW (focused)) - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here")); - else - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecoc_ib_edwin_nothing_to_paste")); - -} - - -static void -modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard, - GdkEvent *event, - ModestMsgEditWindow *window) -{ - update_paste_dimming (window); -} - static void update_select_all_dimming (ModestMsgEditWindow *window) { @@ -2809,6 +2923,7 @@ edit_menu_activated (GtkAction *action, ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata); update_select_all_dimming (window); + update_paste_dimming (window); } static void view_menu_activated (GtkAction *action, @@ -2818,3 +2933,54 @@ view_menu_activated (GtkAction *action, update_zoom_dimming (window); } + +gboolean +modest_msg_edit_window_get_sent (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); + return priv->sent; +} + +void +modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, + gboolean sent) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); + priv->sent = sent; +} + + +void +modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, + TnyMsg *draft) +{ + ModestMsgEditWindowPrivate *priv; + TnyHeader *header = NULL; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); + g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft))); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + + if (priv->draft_msg != NULL) { + 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); + } + + priv->draft_msg = draft; +}