X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=559d027d7dbbb4fd0b21d4e11daba2f10bdd6ec4;hb=1e992fe6d5d1bb508a84cba052e0c18f555767c7;hp=95a0a9d94ce4b4543b0c1e76960efc80b4c2f53c;hpb=193132acdab430f3cdc4bcd50224d1592bcc32ea;p=modest diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 95a0a9d..559d027 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -34,6 +34,7 @@ #include #include #include +#include #include @@ -78,7 +79,7 @@ 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 to_field_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); @@ -87,9 +88,9 @@ static gboolean is_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_mark_set (GtkTextBuffer *buffer, GtkTextIter *location, GtkTextMark *mark, gpointer userdata); static void text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, 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, gpointer userdata); static void modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, @@ -115,8 +116,15 @@ 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 update_window_title (ModestMsgEditWindow *window); static void update_dimmed (ModestMsgEditWindow *window); +/* Find toolbar */ +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); + /* list my signals */ enum { @@ -129,7 +137,10 @@ typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate; struct _ModestMsgEditWindowPrivate { GtkWidget *msg_body; GtkWidget *header_box; + + ModestPairList *from_field_protos; GtkWidget *from_field; + GtkWidget *to_field; GtkWidget *cc_field; GtkWidget *bcc_field; @@ -151,6 +162,8 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *font_tool_button_label; GSList *size_items_group; GtkWidget *size_tool_button_label; + + GtkWidget *find_toolbar; GtkWidget *scroll; @@ -260,36 +273,43 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->priority_flags = 0; + priv->find_toolbar = NULL; + priv->draft_msg = NULL; priv->clipboard_change_handler_id = 0; } /* FIXME: this is a dup from the one in gtk/ */ + +/** + * @result: A ModestPairList, which must be freed with modest_pair_list_free(). + */ static ModestPairList* get_transports (void) { - ModestAccountMgr *account_mgr; GSList *transports = NULL; - GSList *cursor, *accounts; - account_mgr = modest_runtime_get_account_mgr(); - cursor = accounts = modest_account_mgr_account_names (account_mgr, + ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); + GSList *accounts = modest_account_mgr_account_names (account_mgr, TRUE /* only enabled accounts. */); + + GSList *cursor = accounts; while (cursor) { - gchar *account_name = (gchar*)cursor->data; - gchar *from_string = modest_account_mgr_get_from_string (account_mgr, + const gchar *account_name = cursor->data; + gchar *from_string = NULL; + if (account_name) { + from_string = modest_account_mgr_get_from_string (account_mgr, account_name); - if (!from_string) { - /* something went wrong: ignore this one */ - g_free (account_name); - cursor->data = NULL; - } else { - ModestPair *pair; - pair = modest_pair_new ((gpointer) account_name, + } + + if (from_string && account_name) { + gchar *name = g_strdup (account_name); + ModestPair *pair = modest_pair_new ((gpointer) name, (gpointer) from_string , TRUE); transports = g_slist_prepend (transports, pair); - } /* don't free account name; it's freed when the transports list is freed */ + } + cursor = cursor->next; } g_slist_free (accounts); @@ -298,62 +318,29 @@ get_transports (void) static void -text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, gpointer userdata) -{ - ModestMsgEditWindow *window; - ModestMsgEditWindowPrivate *priv; - GdkRectangle location; - gint v_scroll_min_value = 0; - gint v_scroll_max_value = 0; - gint v_scroll_visible; - GtkAdjustment *vadj; - GtkTextMark *insert_mark; - GtkTextIter insert_iter; - - g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (userdata)); - g_return_if_fail (GTK_IS_TEXT_MARK (mark)); - window = MODEST_MSG_EDIT_WINDOW (userdata); - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - - 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), &insert_iter, insert_mark); - gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &insert_iter, &location); - - if (priv->header_box) - v_scroll_min_value += priv->header_box->allocation.height + DEFAULT_MAIN_VBOX_SPACING; - v_scroll_min_value += location.y; - v_scroll_max_value = v_scroll_min_value + location.height; - - v_scroll_visible = GTK_WIDGET (window)->allocation.height; - - vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)); - - if (((gdouble) v_scroll_min_value) < vadj->value) - gtk_adjustment_set_value (vadj, v_scroll_min_value); - else if (((gdouble) v_scroll_max_value) > (vadj->value + vadj->page_size)) - gtk_adjustment_set_value (vadj, ((gdouble)v_scroll_max_value) - vadj->page_size); -} - -static void init_window (ModestMsgEditWindow *obj) { GtkWidget *from_caption, *to_caption, *subject_caption; GtkWidget *main_vbox; ModestMsgEditWindowPrivate *priv; - ModestPairList *protos; + GtkSizeGroup *size_group; GtkWidget *frame; GtkWidget *scroll_area; GtkWidget *subject_box; GtkWidget *attachment_icon; + GtkWidget *window_box; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - protos = get_transports (); - priv->from_field = modest_combo_box_new (protos, g_str_equal); - modest_pair_list_free (protos); + /* 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->to_field = modest_recpt_editor_new (); priv->cc_field = modest_recpt_editor_new (); @@ -409,10 +396,11 @@ init_window (ModestMsgEditWindow *obj) /* gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */ 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 (priv->text_buffer), "refresh_attributes", G_CALLBACK (text_buffer_refresh_attributes), obj); - g_signal_connect (G_OBJECT (priv->text_buffer), "mark-set", - G_CALLBACK (text_buffer_mark_set), 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", @@ -435,8 +423,16 @@ init_window (ModestMsgEditWindow *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 (to_field_changed), obj); - to_field_changed (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)), MODEST_MSG_EDIT_WINDOW (obj)); + "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); @@ -452,12 +448,19 @@ init_window (ModestMsgEditWindow *obj) gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))); gtk_widget_show_all (GTK_WIDGET(priv->scroll)); - if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)) - gtk_widget_hide (priv->cc_field); - if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)) - gtk_widget_hide (priv->bcc_field); + 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); + } - gtk_container_add (GTK_CONTAINER(obj), priv->scroll); + 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); scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body); gtk_container_add (GTK_CONTAINER (frame), scroll_area); gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), @@ -478,6 +481,10 @@ modest_msg_edit_window_finalize (GObject *obj) g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler_id); priv->clipboard_change_handler_id = 0; } + + /* This had to stay alive for as long as the combobox that used it: */ + modest_pair_list_free (priv->from_field_protos); + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -502,7 +509,7 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self) /* /\* remove old message from drafts *\/ */ /* if (priv->draft_msg) { */ /* TnyHeader *header = tny_msg_get_header (priv->draft_msg); */ -/* TnyAccount *account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(), */ +/* TnyAccount *account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(), */ /* account_name, */ /* TNY_ACCOUNT_TYPE_STORE); */ /* TnyFolder *folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS); */ @@ -572,11 +579,13 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) if (bcc) modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc); if (subject) - gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject); + gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject); + + 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, FALSE); + body = modest_tny_msg_get_body (msg, TRUE); if ((body == NULL)||(body[0] == '\0')) { g_free (body); @@ -607,8 +616,13 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) /* Add attachments to the view */ modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), msg); - if (priv->attachments == NULL) - gtk_widget_hide_all (priv->attachments_caption); + 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); + } gtk_text_buffer_get_start_iter (priv->text_buffer, &iter); gtk_text_buffer_place_cursor (priv->text_buffer, &iter); @@ -694,6 +708,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) tool_item = GTK_WIDGET (gtk_tool_item_new ()); priv->font_color_button = hildon_color_button_new (); GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS); gtk_container_add (GTK_CONTAINER (tool_item), priv->font_color_button); gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); @@ -812,8 +827,13 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) GtkActionGroup *action_group; GError *error = NULL; GdkPixbuf *window_icon = NULL; + GtkAction *action; + ModestConf *conf; + gboolean prefer_formatted; + gint file_format; g_return_val_if_fail (msg, NULL); + g_return_val_if_fail (account_name, NULL); obj = g_object_new(MODEST_TYPE_MSG_EDIT_WINDOW, NULL); @@ -861,11 +881,11 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) 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); + 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_error_free (error); - error = NULL; + g_clear_error (&error); } /* Add accelerators */ @@ -881,7 +901,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) restore_settings (MODEST_MSG_EDIT_WINDOW(obj)); - gtk_window_set_title (GTK_WINDOW(obj), "Modest"); gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL); g_signal_connect (G_OBJECT(obj), "delete-event", @@ -900,8 +919,34 @@ 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); + + /* 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); + + /* 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)); + + /* 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); - return (ModestWindow*)obj; + return (ModestWindow*) obj; } static gint @@ -914,6 +959,9 @@ get_formatted_data_cb (const gchar *buffer, gpointer user_data) return 0; } +/** + * @result: A new string which should be freed with g_free(). + */ static gchar * get_formatted_data (ModestMsgEditWindow *edit_window) { @@ -933,8 +981,6 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) { MsgData *data; const gchar *account_name; - GtkTextBuffer *buf; - GtkTextIter b, e; ModestMsgEditWindowPrivate *priv; g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL); @@ -944,37 +990,62 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field)); g_return_val_if_fail (account_name, NULL); - buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); - gtk_text_buffer_get_bounds (buf, &b, &e); /* don't free these (except from) */ data = g_slice_new0 (MsgData); data->from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name); - data->to = (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->to_field)); - data->cc = (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->cc_field)); - data->bcc = (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->bcc_field)); - data->subject = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field)); - data->plain_body = (gchar *) gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE); + data->account_name = g_strdup (account_name); + data->to = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field))); + data->cc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field))); + data->bcc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field))); + data->subject = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field))); + if (priv->draft_msg) { + data->draft_msg = g_object_ref (priv->draft_msg); + } else { + data->draft_msg = NULL; + } + + 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 */ + if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) - data->html_body = get_formatted_data (edit_window); + data->html_body = get_formatted_data (edit_window); /* returns a copy. */ else data->html_body = NULL; - data->attachments = priv->attachments; + + data->attachments = priv->attachments; /* TODO: copy and free ? */ data->priority_flags = priv->priority_flags; return data; } +/* TODO: We must duplicate this implementation for GNOME and Maemo, but that is unwise. */ void modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, MsgData *data) { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window)); - g_free (data->from); - g_free (data->html_body); + if (!data) + return; + + g_free (data->to); + g_free (data->cc); + g_free (data->bcc); + g_free (data->subject); g_free (data->plain_body); + g_free (data->html_body); + 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_slice_free (MsgData, data); } @@ -1378,6 +1449,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) priv->attachments = g_list_prepend (priv->attachments, image_part); modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), image_part); + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); gtk_widget_show_all (priv->attachments_caption); } else if (image_file_id == -1) { @@ -1396,7 +1468,7 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) ModestMsgEditWindowPrivate *priv; GtkWidget *dialog = NULL; gint response = 0; - gchar *filename = NULL; + gchar *uri = NULL, *filename = NULL; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); @@ -1405,6 +1477,7 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) response = gtk_dialog_run (GTK_DIALOG (dialog)); switch (response) { case GTK_RESPONSE_OK: + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); break; default: @@ -1412,6 +1485,58 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) } gtk_widget_destroy (dialog); + if (uri) { + + GnomeVFSHandle *handle = NULL; + GnomeVFSResult result; + + 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 *content_id; + GnomeVFSFileInfo info; + + if (gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_GET_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); + } +} + +void +modest_msg_edit_window_attach_file_noninteractive ( + ModestMsgEditWindow *window, + gchar *filename) +{ + + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + if (filename) { gint file_id; @@ -1446,6 +1571,7 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) 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); } } } @@ -1481,6 +1607,11 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, } dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK); gtk_widget_destroy (confirmation_dialog); + if (!dialog_response) { + if (clean_list) + g_list_free (att_list); + return; + } hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment")); for (node = att_list; node != NULL; node = g_list_next (node)) { @@ -1490,11 +1621,14 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), mime_part); + if (priv->attachments == NULL) + gtk_widget_hide (priv->attachments_caption); att_id = tny_mime_part_get_content_id (mime_part); if (att_id != NULL) text_buffer_delete_images_by_id (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)), att_id); g_object_unref (mime_part); + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); } } @@ -1539,14 +1673,23 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, if (gtk_check_menu_item_get_active (menu_item)) { gchar *markup; + WPTextBufferFormat format; + + memset (&format, 0, sizeof (format)); + wp_text_buffer_get_current_state (WP_TEXT_BUFFER (priv->text_buffer), &format); label = gtk_bin_get_child (GTK_BIN (menu_item)); new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label))); - - 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)); + format.cs.font_size = TRUE; + 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); + +/* 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); @@ -1710,10 +1853,12 @@ modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + gtk_widget_set_no_show_all (priv->cc_caption, TRUE); 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); } void @@ -1724,10 +1869,12 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window, g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + gtk_widget_set_no_show_all (priv->bcc_caption, TRUE); 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); } static void @@ -1988,12 +2135,11 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window) font_size, DEFAULT_FONT_SIZE); fmt.cs.font_size = TRUE; } - gtk_widget_destroy (dialog); - - gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body)); wp_text_buffer_set_format(WP_TEXT_BUFFER(priv->text_buffer), &fmt); } - + gtk_widget_destroy (dialog); + + gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body)); } void @@ -2124,6 +2270,7 @@ text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id) } } } + gtk_text_iter_forward_char (&iter); } } @@ -2163,21 +2310,33 @@ msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer userdata) { + update_dimmed (MODEST_MSG_EDIT_WINDOW (userdata)); return FALSE; } static void -to_field_changed (GtkTextBuffer *buffer, +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, gtk_text_buffer_get_char_count (buffer) != 0); + gtk_action_set_sensitive (action, !dim); action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EmailMenu/SendMenu"); - gtk_action_set_sensitive (action, gtk_text_buffer_get_char_count (buffer) != 0); + gtk_action_set_sensitive (action, !dim); } static void @@ -2293,3 +2452,92 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, 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))); } + +static void +update_window_title (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv = NULL; + const gchar *subject; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field)); + if (subject == NULL || subject[0] == '\0') + subject = _("mail_va_new_email"); + + gtk_window_set_title (GTK_WINDOW (window), subject); + +} + +static void +subject_field_changed (GtkEditable *editable, + ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + update_window_title (window); + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); +} + +void +modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, + gboolean show) +{ + ModestMsgEditWindowPrivate *priv = NULL; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (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); + } else { + gtk_widget_hide_all (priv->find_toolbar); + gtk_widget_grab_focus (priv->msg_body); + } + +} + +static void +modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, + ModestMsgEditWindow *window) +{ + gchar *current_search = NULL; + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + gboolean result; + GtkTextIter selection_start, selection_end; + GtkTextIter match_start, match_end; + + g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL); + if ((current_search == NULL) && (strcmp (current_search, "") == 0)) { + g_free (current_search); + 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) { + 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); + } + 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 (current_search); +} + +static void +modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, + ModestMsgEditWindow *window) +{ + GtkToggleAction *toggle; + ModestWindowPrivate *parent_priv; + parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + + toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu")); + gtk_toggle_action_set_active (toggle, FALSE); +} +