X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=c9e924c3b20ca3e85b4abc339ec0bb2bfdb7d04f;hp=93f2c7d4472f32caade6de09846e507431824a18;hb=a4ff794e748d1f067868f5683e196082a5418035;hpb=7b9db8885dba9968b48c1ddca7e2e2bd183ac219 diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 93f2c7d..c9e924c 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -82,7 +82,7 @@ #define DEFAULT_SIZE_COMBOBOX_WIDTH 80 #define DEFAULT_MAIN_VBOX_SPACING 6 #define SUBJECT_MAX_LENGTH 1000 -#define IMAGE_MAX_WIDTH 608 +#define IMAGE_MAX_WIDTH 560 #define DEFAULT_FONT_SCALE 1.5 static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass); @@ -104,6 +104,11 @@ static void text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, 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, @@ -120,7 +125,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); @@ -238,6 +244,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *scroll; GtkWidget *scroll_area; + gint last_vadj_upper; gint last_cid; GList *attachments; @@ -249,6 +256,9 @@ struct _ModestMsgEditWindowPrivate { gulong clipboard_change_handler_id; TnyMsg *draft_msg; + TnyMsg *outbox_msg; + gchar *msg_uid; + gboolean sent; }; @@ -320,10 +330,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 @@ -352,8 +361,12 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->last_search = NULL; priv->draft_msg = NULL; + priv->outbox_msg = NULL; + priv->msg_uid = NULL; priv->clipboard_change_handler_id = 0; priv->sent = FALSE; + + priv->last_vadj_upper = 0; } @@ -394,6 +407,40 @@ 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 init_window (ModestMsgEditWindow *obj) @@ -521,6 +568,7 @@ init_window (ModestMsgEditWindow *obj) "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->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); @@ -538,6 +586,10 @@ 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)); window_box = gtk_vbox_new (FALSE, 0); @@ -546,25 +598,30 @@ init_window (ModestMsgEditWindow *obj) priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body); gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->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); } +static void +modest_msg_edit_window_disconnect_signals (ModestWindow *window) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + if (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); +} 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->draft_msg != NULL) { TnyHeader *header = tny_msg_get_header (priv->draft_msg); @@ -575,6 +632,19 @@ 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; + } + if (priv->msg_uid != NULL) { + g_free (priv->msg_uid); + priv->msg_uid = NULL; + } /* This had to stay alive for as long as the combobox that used it: */ modest_pair_list_free (priv->from_field_protos); @@ -663,7 +733,7 @@ replace_with_attachments (ModestMsgEditWindow *self, GList *attachments) g_object_unref (stream); if (pixbuf != NULL) { - wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); +/* wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); */ g_object_unref (pixbuf); } } @@ -691,7 +761,7 @@ update_last_cid (ModestMsgEditWindow *self, GList *attachments) } static void -set_msg (ModestMsgEditWindow *self, TnyMsg *msg) +set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) { TnyHeader *header; const gchar *to, *cc, *bcc, *subject; @@ -700,6 +770,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)); @@ -739,11 +810,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), @@ -752,8 +824,10 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer)); g_free (body); + 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); } @@ -791,12 +865,22 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) 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_or_mmc_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_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); } } @@ -985,7 +1069,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) 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; @@ -1079,7 +1163,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *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); + 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)); @@ -1127,6 +1211,8 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) update_paste_dimming (MODEST_MSG_EDIT_WINDOW (obj)); priv->update_caption_visibility = TRUE; + + reset_modified (MODEST_MSG_EDIT_WINDOW (obj)); return (ModestWindow*) obj; } @@ -1184,6 +1270,9 @@ 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); + } + if (priv->outbox_msg) { + data->draft_msg = g_object_ref (priv->outbox_msg); } else { data->draft_msg = NULL; } @@ -1191,7 +1280,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. */ @@ -1341,7 +1430,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); @@ -1379,11 +1468,11 @@ 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); @@ -2728,6 +2817,40 @@ subject_field_changed (GtkEditable *editable, gtk_text_buffer_set_modified (priv->text_buffer, TRUE); } +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; + + 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) + g_signal_emit_by_name (editable, "insert-text", + (gpointer) result->str, (gpointer) strlen (result->str), + (gpointer) position, (gpointer) window); + } + + g_string_free (result, TRUE); +} + gboolean message_is_empty (ModestMsgEditWindow *window) { @@ -3030,6 +3153,11 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, 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); } priv->draft_msg = draft; @@ -3065,3 +3193,14 @@ modest_msg_edit_window_add_part (ModestMsgEditWindow *window, 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; +}