X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=bab1cb5adb49aae7028a2fde0a076a9ea661ac26;hp=de7e2a2b169d9ec0866510b1ffa0df78f3cc58e4;hb=5619278be034c3032ce89fc8ce0a2d52ef351e7b;hpb=85b60b61bf30595fabd3bb9b3c5e2d9a0592912f diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index de7e2a2..bab1cb5 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); @@ -132,8 +138,10 @@ static void modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboa static void update_window_title (ModestMsgEditWindow *window); static void update_dimmed (ModestMsgEditWindow *window); static void update_paste_dimming (ModestMsgEditWindow *window); +static void update_copy_cut_dimming (ModestMsgEditWindow *window); static void update_select_all_dimming (ModestMsgEditWindow *window); static void update_zoom_dimming (ModestMsgEditWindow *window); +static void update_send_dimming (ModestMsgEditWindow *window); /* Find toolbar */ static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, @@ -238,6 +246,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *scroll; GtkWidget *scroll_area; + gint last_vadj_upper; gint last_cid; GList *attachments; @@ -250,6 +259,8 @@ struct _ModestMsgEditWindowPrivate { TnyMsg *draft_msg; TnyMsg *outbox_msg; + gchar *msg_uid; + gboolean sent; }; @@ -321,10 +332,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 @@ -354,8 +364,11 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) 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; } @@ -396,6 +409,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) @@ -523,6 +570,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); @@ -540,6 +588,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); @@ -548,25 +600,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); @@ -586,6 +643,10 @@ modest_msg_edit_window_finalize (GObject *obj) 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); @@ -674,7 +735,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); } } @@ -806,6 +867,11 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) 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) { @@ -815,6 +881,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) 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); } @@ -1205,8 +1272,7 @@ 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) { + } else if (priv->outbox_msg) { data->draft_msg = g_object_ref (priv->outbox_msg); } else { data->draft_msg = NULL; @@ -2578,30 +2644,19 @@ 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); + update_send_dimming (editor); } static void send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor) { - hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first")); + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); + const gchar *subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field)); + if (subject == NULL || subject[0] == '\0') { + hildon_banner_show_information (NULL, NULL, _("mcen_ib_subject_or_body_not_modified")); + } else { + hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first")); + } } static void @@ -2672,14 +2727,22 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to return FALSE; } - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook)) + 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), add_to_addressbook)) + } + 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), add_to_addressbook)) + } + 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; @@ -2700,8 +2763,6 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, ModestWindowPrivate *parent_priv; ModestMsgEditWindowPrivate *priv; GtkAction *action; - gboolean has_selection; - GtkWidget *focused; GList *selected_attachments = NULL; gint n_att_selected = 0; @@ -2710,13 +2771,6 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *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, (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))); selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); n_att_selected = g_list_length (selected_attachments); @@ -2725,6 +2779,7 @@ 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_copy_cut_dimming (window); update_paste_dimming (window); } @@ -2750,6 +2805,41 @@ 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); + update_send_dimming (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; + + 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 @@ -2924,6 +3014,33 @@ modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, static void +update_copy_cut_dimming (ModestMsgEditWindow *window) +{ + ModestWindowPrivate *parent_priv = NULL; + ModestMsgEditWindowPrivate *priv = NULL; + GtkClipboard *clipboard = NULL; + GtkAction *action = NULL; + gboolean has_selection = FALSE; + GtkWidget *focused = NULL; + gchar *selection = NULL; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + focused = gtk_window_get_focus (GTK_WINDOW (window)); + + has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL); + + 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 (selection != NULL) + g_free(selection); +} + +static void update_paste_dimming (ModestMsgEditWindow *window) { ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); @@ -2991,12 +3108,40 @@ update_zoom_dimming (ModestMsgEditWindow *window) } static void +update_send_dimming (ModestMsgEditWindow *window) +{ + ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + GtkTextBuffer *to_buffer, *cc_buffer, *bcc_buffer; + const gchar *subject; + 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)); + subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_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); + + dim = dim || (subject == NULL || subject[0] == '\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 edit_menu_activated (GtkAction *action, gpointer userdata) { ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata); update_select_all_dimming (window); + update_copy_cut_dimming (window); update_paste_dimming (window); } static void @@ -3054,6 +3199,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; @@ -3089,3 +3239,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; +}