X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=8d8dd40544b8739cab8eaa785bf5b4a9980ef696;hp=71ca3b27f66639f2cb233515e9ea4f76bb1575dc;hb=2bca28dca2c6aa234f8297eab0dc9cb6affdc50f;hpb=afa6ecf77ada7b00594a0960872620c72bdb323c diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 71ca3b2..8d8dd40 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -64,21 +64,15 @@ #include #include #include -#include +#include +#include #include #include #include "modest-msg-edit-window-ui-dimming.h" #include "modest-hildon-includes.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#endif #include "widgets/modest-msg-edit-window-ui.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else #include -#endif #include #include "modest-maemo-utils.h" #include @@ -87,13 +81,14 @@ #define DEFAULT_FONT_SIZE 3 #define DEFAULT_FONT 2 #define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans" -#define DEFAULT_MAIN_VBOX_SPACING 6 +#define DEFAULT_MAIN_VBOX_SPACING 0 #define SUBJECT_MAX_LENGTH 1000 #define IMAGE_MAX_WIDTH 560 #define DEFAULT_FONT_SCALE 1.5 #define ATTACHMENT_BUTTON_WIDTH 118 -#define MAX_FROM_VALUE 48 -#define MAX_BODY_LENGTH 4096 +#define MAX_FROM_VALUE 36 +#define MAX_BODY_LENGTH 128*1024 +#define MAX_BODY_LINES 2048 static gboolean is_wp_text_buffer_started = FALSE; @@ -148,10 +143,10 @@ static void subject_field_move_cursor (GtkEntry *entry, static void update_window_title (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); +static void modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget, + ModestMsgEditWindow *window); +static void modest_msg_edit_window_isearch_toolbar_close (GtkWidget *widget, + ModestMsgEditWindow *window); static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, const gchar *str, GtkTextIter *match_start, @@ -187,13 +182,16 @@ static void font_face_clicked (GtkToolButton *button, static void update_signature (ModestMsgEditWindow *self, const gchar *old_account, const gchar *new_account); +static void update_branding (ModestMsgEditWindow *self, + const gchar *new_account); static GtkWidget *_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group, const gchar *label, GtkWidget *control); +static void max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref); static void DEBUG_BUFFER (WPTextBuffer *buffer) { #ifdef DEBUG GtkTextIter iter; - g_message ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer))); + g_debug ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer))); gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter); while (!gtk_text_iter_is_end (&iter)) { @@ -220,11 +218,11 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer) g_string_append (output, " "); } output = g_string_append (output, "]\n"); - g_message ("%s", output->str); + g_debug ("%s", output->str); g_string_free (output, TRUE); gtk_text_iter_forward_to_tag_toggle (&iter, NULL); } - g_message ("END BUFFER"); + g_debug ("END BUFFER"); #endif } @@ -267,7 +265,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *attachments_view; GtkWidget *priority_icon; GtkWidget *subject_box; - GtkWidget *add_attachment_button; + GtkWidget *send_button; GtkWidget *cc_caption; GtkWidget *bcc_caption; @@ -288,12 +286,12 @@ struct _ModestMsgEditWindowPrivate { gint current_size_index; GtkWidget *size_tool_button_label; - GtkWidget *find_toolbar; + GtkWidget *isearch_toolbar; gchar *last_search; GtkWidget *font_dialog; - GtkWidget *pannable; + GtkWidget *scrollable; guint correct_scroll_idle; guint scroll_drag_timeout_id; gdouble last_upper; @@ -322,6 +320,12 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *app_menu; GtkWidget *cc_button; GtkWidget *bcc_button; + + GtkWidget *max_chars_banner; + + GtkWidget *brand_icon; + GtkWidget *brand_label; + GtkWidget *brand_container; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -420,7 +424,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->priority_flags = 0; - priv->find_toolbar = NULL; + priv->isearch_toolbar = NULL; priv->last_search = NULL; priv->draft_msg = NULL; @@ -445,6 +449,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->references = NULL; priv->in_reply_to = NULL; + priv->max_chars_banner = NULL; if (!is_wp_text_buffer_started) { is_wp_text_buffer_started = TRUE; @@ -606,7 +611,7 @@ correct_scroll_without_drag_check_idle (gpointer userdata) offset_min = priv->msg_body->allocation.y + rectangle.y; offset_max = offset_min + rectangle.height; - vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable)); + vadj = modest_scrollable_get_vadjustment (MODEST_SCROLLABLE (priv->scrollable)); offset_min = MAX (offset_min - 48, 0); offset_max = MIN (offset_max + 48, vadj->upper); @@ -707,6 +712,16 @@ attachment_deleted (ModestAttachmentsView *attachments_view, } static void +body_size_request (GtkWidget *body, + GtkRequisition *req, + gpointer user_data) +{ + /* Make sure the body always get at least 70 pixels */ + if (req->height < 70) + req->height = 70; +} + +static void connect_signals (ModestMsgEditWindow *obj) { ModestMsgEditWindowPrivate *priv; @@ -738,8 +753,9 @@ connect_signals (ModestMsgEditWindow *obj) g_signal_connect_swapped (G_OBJECT (priv->bcc_field), "open-addressbook", G_CALLBACK (modest_msg_edit_window_open_addressbook), obj); - g_signal_connect (G_OBJECT (priv->add_attachment_button), "clicked", - G_CALLBACK (modest_msg_edit_window_add_attachment_clicked), obj); + g_signal_connect (G_OBJECT (priv->send_button), "clicked", + G_CALLBACK (modest_ui_actions_on_send), obj); + g_signal_connect (G_OBJECT (priv->from_field), "value-changed", G_CALLBACK (from_field_changed), obj); @@ -747,6 +763,8 @@ connect_signals (ModestMsgEditWindow *obj) G_CALLBACK (msg_body_focus), obj); g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event", G_CALLBACK (msg_body_focus), obj); + g_signal_connect (G_OBJECT (priv->msg_body), "size-request", + G_CALLBACK (body_size_request), obj); g_signal_connect (G_OBJECT (obj), "set-focus", G_CALLBACK (window_focus), obj); g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))), "changed", G_CALLBACK (recpt_field_changed), obj); @@ -758,8 +776,10 @@ connect_signals (ModestMsgEditWindow *obj) g_signal_connect_after (G_OBJECT (priv->subject_field), "move-cursor", G_CALLBACK (subject_field_move_cursor), obj); g_signal_connect (G_OBJECT (priv->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), obj); - g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), 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->isearch_toolbar), "isearch-search", + G_CALLBACK (modest_msg_edit_window_isearch_toolbar_search), obj); + g_signal_connect (G_OBJECT (priv->isearch_toolbar), "isearch-close", + G_CALLBACK (modest_msg_edit_window_isearch_toolbar_close), obj); priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", @@ -789,7 +809,6 @@ init_window (ModestMsgEditWindow *obj) { GtkWidget *to_caption, *subject_caption; GtkWidget *main_vbox; - GtkWidget *add_attachment_align; ModestMsgEditWindowPrivate *priv; GtkActionGroup *action_group; ModestWindowPrivate *parent_priv; @@ -798,12 +817,15 @@ init_window (ModestMsgEditWindow *obj) GtkSizeGroup *title_size_group; GtkSizeGroup *value_size_group; - GtkWidget *attachment_icon; GtkWidget *window_box; GtkWidget *window_align; #if (GTK_MINOR_VERSION >= 10) GdkAtom deserialize_type; #endif + GtkWidget *from_send_hbox; + GtkWidget *send_icon; + GtkWidget *attachments_label; + GtkWidget *branding_box; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); @@ -870,32 +892,28 @@ init_window (ModestMsgEditWindow *obj) HILDON_BUTTON_ARRANGEMENT_HORIZONTAL, NULL, g_str_equal); modest_selector_picker_set_value_max_chars (MODEST_SELECTOR_PICKER (priv->from_field), MAX_FROM_VALUE); - modest_maemo_utils_set_hbutton_layout (title_size_group, value_size_group, + modest_maemo_utils_set_hbutton_layout (title_size_group, NULL, _("mail_va_from"), priv->from_field); - hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.5, 0.5); + hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 1.0); + hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5); + hildon_button_set_value_alignment (HILDON_BUTTON (priv->from_field), 1.0, 0.5); priv->to_field = modest_recpt_editor_new (); priv->cc_field = modest_recpt_editor_new (); priv->bcc_field = modest_recpt_editor_new (); + modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->to_field), FALSE); + modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->cc_field), FALSE); + modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->bcc_field), FALSE); priv->subject_box = gtk_hbox_new (FALSE, MODEST_MARGIN_NONE); priv->priority_icon = gtk_image_new (); gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0); - priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE); + priv->subject_field = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ()); gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH); g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL); + modest_entry_set_hint (priv->subject_field, _("mail_va_no_subject")); 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 (priv->subject_box), priv->subject_field, TRUE, TRUE, 0); - priv->add_attachment_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL); - gtk_widget_set_size_request (priv->add_attachment_button, ATTACHMENT_BUTTON_WIDTH, -1); - GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS); - gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE); - attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER); - hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon); - add_attachment_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (add_attachment_align), 0, 0, MODEST_MARGIN_DEFAULT, 0); - gtk_container_add (GTK_CONTAINER (add_attachment_align), priv->add_attachment_button); - gtk_box_pack_start (GTK_BOX (priv->subject_box), add_attachment_align, FALSE, FALSE, 0); priv->attachments_view = modest_attachments_view_new (NULL); modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS); @@ -913,24 +931,54 @@ init_window (ModestMsgEditWindow *obj) _("mail_va_hotfix1"), priv->bcc_field); subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, _("mail_va_subject"), FALSE, priv->subject_box); - priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, + priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (NULL, NULL, _("mail_va_attachment"), FALSE, priv->attachments_view, HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_AUTO_HEIGHT); - /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), value_size_group); */ - /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), value_size_group); */ - /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), value_size_group); */ + attachments_label = modest_maemo_utils_captioned_get_label_widget (priv->attachments_caption); + hildon_gtk_widget_set_theme_size (attachments_label, HILDON_SIZE_AUTO_HEIGHT); + + + priv->send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); + send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER); + gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon); + gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1); + g_object_unref (title_size_group); g_object_unref (value_size_group); - gtk_box_pack_start (GTK_BOX (priv->header_box), priv->from_field, FALSE, FALSE, 0); + priv->brand_icon = gtk_image_new (); + gtk_misc_set_alignment (GTK_MISC (priv->brand_icon), 0.5, 0.5); + priv->brand_label = gtk_label_new (NULL); + hildon_helper_set_logical_font (priv->brand_label, "SmallSystemFont"); + gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 0.0, 0.5); + gtk_widget_set_no_show_all (priv->brand_icon, TRUE); + gtk_widget_set_no_show_all (priv->brand_label, TRUE); + + from_send_hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->from_field, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0); + + branding_box = gtk_hbox_new (FALSE, MODEST_MARGIN_DEFAULT); + gtk_widget_show (branding_box); + gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_icon, FALSE, FALSE, 0); + + priv->brand_container = gtk_alignment_new (0.0, 0.5, 0.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (priv->brand_container), 0, 0, MODEST_MARGIN_DOUBLE, 0); + gtk_container_add (GTK_CONTAINER (priv->brand_container), branding_box); + gtk_widget_set_no_show_all (priv->brand_container, TRUE); + + + gtk_box_pack_start (GTK_BOX (priv->header_box), from_send_hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), priv->cc_caption, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), subject_caption, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (priv->header_box), priv->brand_container, FALSE, FALSE, 0); gtk_widget_set_no_show_all (priv->attachments_caption, TRUE); init_wp_text_view_style (); @@ -951,14 +999,15 @@ init_window (ModestMsgEditWindow *obj) #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); + priv->isearch_toolbar = modest_toolkit_factory_create_isearch_toolbar (modest_runtime_get_toolkit_factory (), + NULL); + gtk_widget_set_no_show_all (priv->isearch_toolbar, TRUE); /* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */ - priv->pannable = hildon_pannable_area_new (); + priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); - g_object_set (G_OBJECT (priv->pannable), "hscrollbar-policy", GTK_POLICY_NEVER, NULL); + g_object_set (G_OBJECT (priv->scrollable), "horizontal-policy", GTK_POLICY_NEVER, NULL); main_vbox = gtk_vbox_new (FALSE, DEFAULT_MAIN_VBOX_SPACING); window_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); @@ -968,13 +1017,13 @@ init_window (ModestMsgEditWindow *obj) gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (window_align), main_vbox); - hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align); - gtk_widget_show_all (GTK_WIDGET(priv->pannable)); + modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), window_align); + gtk_widget_show_all (GTK_WIDGET(priv->scrollable)); window_box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER(obj), window_box); - gtk_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0); /* Set window icon */ window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG); @@ -1011,7 +1060,12 @@ static void modest_msg_edit_window_finalize (GObject *obj) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj); - + + if (priv->max_chars_banner) { + g_object_weak_unref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, obj); + priv->max_chars_banner = FALSE; + } + /* Sanity check: shouldn't be needed, the window mgr should call this function before */ modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj)); @@ -1063,8 +1117,6 @@ modest_msg_edit_window_finalize (GObject *obj) g_free (priv->last_search); g_free (priv->references); g_free (priv->in_reply_to); - g_object_unref (priv->faces_model); - g_object_unref (priv->sizes_model); g_object_unref (priv->attachments); g_object_unref (priv->images); @@ -1207,9 +1259,9 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg) content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg)); - if (content_type && !g_strcasecmp (content_type, "multipart/related")) { + if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) { parent = g_object_ref (msg); - } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) { + } else if (content_type && !g_ascii_strcasecmp (content_type, "multipart/mixed")) { TnyList *parts = TNY_LIST (tny_simple_list_new ()); TnyIterator *iter; @@ -1219,7 +1271,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg) TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); content_type = tny_mime_part_get_content_type (part); - if (content_type && !g_strcasecmp (content_type, "multipart/related")) { + if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) { parent = part; break; } else { @@ -1305,12 +1357,17 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to)); priority_flags = tny_header_get_priority (header); - if (to) - modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to); + if (to) { + gchar *quoted_names = modest_text_utils_quote_names (to); + modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), quoted_names); + g_free (quoted_names); + } field_view_set = TRUE; if (cc) { - modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), cc); + gchar *quoted_names = modest_text_utils_quote_names (cc); + modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), quoted_names); + g_free (quoted_names); gtk_widget_set_no_show_all (priv->cc_caption, FALSE); gtk_widget_show (priv->cc_caption); } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) { @@ -1318,11 +1375,13 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) gtk_widget_hide (priv->cc_caption); field_view_set = FALSE; } - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), field_view_set); + modest_togglable_set_active (priv->cc_button, field_view_set); field_view_set = TRUE; if (bcc) { - modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc); + gchar *quoted_names = modest_text_utils_quote_names (bcc); + modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), quoted_names); + g_free (quoted_names); gtk_widget_set_no_show_all (priv->bcc_caption, FALSE); gtk_widget_show (priv->bcc_caption); } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) { @@ -1330,7 +1389,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) gtk_widget_hide (priv->bcc_caption); field_view_set = FALSE; } - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), field_view_set); + modest_togglable_set_active (priv->bcc_button, field_view_set); if (subject) @@ -1445,7 +1504,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE); gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER); - hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar)); + modest_window_add_toolbar (MODEST_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar)); /* Font color placeholder */ placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontColor"); @@ -1545,9 +1604,6 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) priv->font_face_toolitem = tool_item; /* Set expand and homogeneous for remaining items */ - tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend"); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold"); gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); @@ -1610,13 +1666,14 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name); } priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); + update_branding (MODEST_MSG_EDIT_WINDOW (obj), priv->last_from_account); hildon_button_set_title (HILDON_BUTTON (priv->from_field), _("mail_va_from")); hildon_button_set_value (HILDON_BUTTON (priv->from_field), hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->from_field))))); modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj)); - hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar)); + modest_window_add_toolbar (MODEST_WINDOW (obj), GTK_TOOLBAR (priv->isearch_toolbar)); /* Init window */ connect_signals (MODEST_MSG_EDIT_WINDOW(obj)); @@ -1644,6 +1701,9 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_face_toolitem, G_CALLBACK (modest_ui_dimming_rules_on_set_style), MODEST_WINDOW (obj)); + modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->send_button, + G_CALLBACK (modest_ui_dimming_rules_on_send), + MODEST_WINDOW (obj)); /* Insert dimming rules group for this window */ modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group); @@ -1892,16 +1952,20 @@ modest_msg_edit_window_set_format (ModestMsgEditWindow *self, ModestMsgEditFormat format) { ModestMsgEditWindowPrivate *priv; + ModestWindowPrivate *parent_priv; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + parent_priv = MODEST_WINDOW_GET_PRIVATE (self); switch (format) { case MODEST_MSG_EDIT_FORMAT_HTML: wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE); + if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar); break; case MODEST_MSG_EDIT_FORMAT_TEXT: wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); + if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar); break; default: g_return_if_reached (); @@ -2131,61 +2195,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo } -#ifdef MODEST_HILDON_VERSION_0 -void -modest_msg_edit_window_select_color (ModestMsgEditWindow *window) -{ - - WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); - ModestMsgEditWindowPrivate *priv; - GtkWidget *dialog = NULL; - gint response; - GdkColor *new_color = NULL; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE); - - dialog = hildon_color_selector_new (GTK_WINDOW (window)); - hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color)); - g_free (buffer_format); - - if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { - new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); - if (new_color != NULL) { - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, - (gpointer) new_color); - } - } - gtk_widget_destroy (dialog); -} - - -void -modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) -{ - - ModestMsgEditWindowPrivate *priv; - GtkWidget *dialog = NULL; - gint response; - GdkColor *old_color = NULL; - const GdkColor *new_color = NULL; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer)); - - dialog = hildon_color_selector_new (GTK_WINDOW (window)); - hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color); - - if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { - new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); - if (new_color != NULL) - wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color); - } - gtk_widget_destroy (dialog); - -} -#else void modest_msg_edit_window_select_color (ModestMsgEditWindow *window) { @@ -2233,9 +2243,6 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) gtk_widget_destroy (dialog); } -#endif /*!MODEST_HILDON_VERSION_0*/ - - static TnyStream* create_stream_for_uri (const gchar* uri) @@ -2458,7 +2465,7 @@ on_attach_file_response (GtkDialog *dialog, modest_msg_edit_window_attach_file_one (window, uri, allowed_size); if (total_size > allowed_size) { - g_warning ("%s: total size: %u", + g_debug ("%s: total size: %u", __FUNCTION__, (unsigned int)total_size); break; } @@ -2487,14 +2494,19 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *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")); - conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL); + conf_folder = modest_conf_get_string (modest_runtime_get_conf (), + MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL); if (conf_folder && conf_folder[0] != '\0') { gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), conf_folder); } else { gchar *docs_folder; - /* Set the default folder to images folder */ - docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV), - ".documents", NULL); + /* Set the default folder to documents folder */ + docs_folder = (gchar *) g_strdup(g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS)); + if (!docs_folder) { + /* fallback */ + docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV), + ".documents", NULL); + } gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), docs_folder); g_free (docs_folder); } @@ -2562,13 +2574,13 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) { size = info->size; if (size > allowed_size) { - modest_platform_information_banner (NULL, NULL, - _FM("sfil_ib_opening_not_allowed")); + modest_platform_information_banner (NULL, NULL, + _("mail_ib_error_attachment_size")); g_free (filename); return 0; } } else - g_warning ("%s: could not get attachment size", __FUNCTION__); + g_debug ("%s: could not get attachment size", __FUNCTION__); stream = create_stream_for_uri (uri); @@ -2625,13 +2637,12 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, g_object_unref (att_list); return; } - } else { g_object_ref (att_list); } if (tny_list_get_length (att_list) == 0) { - hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove")); + modest_platform_system_banner (NULL, NULL, _("TODO: no attachments selected to remove")); } else { gboolean dialog_response; gchar *message = NULL; @@ -2696,7 +2707,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, g_object_unref (att_list); /* if the last attachment has been removed, focus the Subject: field */ - if (!modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view))) + if (!modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view))) gtk_widget_grab_focus (priv->subject_field); } @@ -2705,21 +2716,15 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, gpointer userdata) { ModestMsgEditWindowPrivate *priv; - GdkColor *new_color; + GdkColor new_color; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - -#ifdef MODEST_HAVE_HILDON0_WIDGETS - new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button)); -#else - GdkColor col; - hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col); - new_color = &col; -#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/ - - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color); - - gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body); + hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &new_color); + + wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) &new_color); + + gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body); } static void @@ -2887,7 +2892,7 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); if (editor == NULL) { - GtkWidget *view_focus; + GtkWidget *view_focus, *parent; view_focus = gtk_window_get_focus (GTK_WINDOW (window)); /* This code should be kept in sync with ModestRecptEditor. The @@ -2896,24 +2901,15 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, hbox recpt editor inherits from, we'll need to go up in the hierarchy to know if the text view is part of the recpt editor or if it's a different text entry */ - - if (gtk_widget_get_parent (view_focus)) { - GtkWidget *first_parent; - - first_parent = gtk_widget_get_parent (view_focus); - if (gtk_widget_get_parent (first_parent) && - MODEST_IS_RECPT_EDITOR (gtk_widget_get_parent (first_parent))) { - editor = MODEST_RECPT_EDITOR (gtk_widget_get_parent (first_parent)); - } - } + parent = gtk_widget_get_parent (view_focus); + if (parent && MODEST_IS_RECPT_EDITOR (parent)) + editor = MODEST_RECPT_EDITOR (parent); if (editor == NULL) editor = MODEST_RECPT_EDITOR (priv->to_field); - } - modest_address_book_select_addresses (editor); - + modest_address_book_select_addresses (editor, GTK_WINDOW (window)); } void @@ -2929,17 +2925,27 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self, gboolean show_toolbar) { ModestWindowPrivate *parent_priv; + ModestMsgEditWindowPrivate *priv; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); /* We can not just use the code of modest_msg_edit_window_setup_toolbar because it has a mixture of both initialization and creation code. */ - if (show_toolbar) - gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); - else + if (show_toolbar) { + gint current_format; + current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)) + ? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT; + if (current_format == MODEST_FILE_FORMAT_PLAIN_TEXT) { + gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); + } else { + gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); + } + } else { gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); + } } void @@ -3004,11 +3010,15 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)) ? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT; + gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE); + if (current_format != file_format) { switch (file_format) { case MODEST_FILE_FORMAT_FORMATTED_TEXT: wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE); remove_tags (WP_TEXT_BUFFER (priv->text_buffer)); + if (parent_priv->toolbar) + gtk_widget_show (parent_priv->toolbar); break; case MODEST_FILE_FORMAT_PLAIN_TEXT: { @@ -3019,6 +3029,8 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, gtk_widget_destroy (dialog); if (response == GTK_RESPONSE_OK) { wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); + if (parent_priv->toolbar) + gtk_widget_hide (parent_priv->toolbar); } else { GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu")); modest_utils_toggle_action_set_active_block_notify (action, TRUE); @@ -3174,12 +3186,26 @@ void modest_msg_edit_window_undo (ModestMsgEditWindow *window) { ModestMsgEditWindowPrivate *priv; + ModestWindowPrivate *parent_priv; + gboolean was_rich_text, is_rich_text; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - + parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + + was_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)); + wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer)); + is_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)); + + if (parent_priv->toolbar && was_rich_text != is_rich_text) { + if (is_rich_text) + gtk_widget_show (parent_priv->toolbar); + else + gtk_widget_hide (parent_priv->toolbar); + } + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); } @@ -3365,7 +3391,8 @@ gboolean modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook) { ModestMsgEditWindowPrivate *priv = NULL; - + GSList *address_list = NULL; + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); @@ -3378,23 +3405,31 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to return FALSE; } + /* Check names */ g_object_ref (window); - 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) ? &address_list : NULL)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field)); g_object_unref (window); 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) ? &address_list : NULL)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field)); g_object_unref (window); 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) ? &address_list : NULL)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field)); g_object_unref (window); return FALSE; } + /* Add contacts to address book */ + if (add_to_addressbook && address_list) + modest_address_book_add_address_list (address_list); + 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)); @@ -3404,6 +3439,45 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to } +void +modest_msg_edit_window_add_to_contacts (ModestMsgEditWindow *self) +{ + GSList *recipients = NULL; + ModestMsgEditWindowPrivate *priv; + gchar *joined, *after_remove, *to, *cc, *bcc; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + /* First of all check names */ + if (!modest_msg_edit_window_check_names (self, FALSE)) + return; + + if (!modest_msg_edit_window_has_pending_addresses (self)) + return; + + /* Don't add the from obviously */ + to = g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->to_field)); + cc = g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->cc_field)); + bcc = g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->bcc_field)); + + joined = modest_text_utils_join_addresses (NULL, to, cc, bcc); + g_free (to); + g_free (cc); + g_free (bcc); + + after_remove = modest_text_utils_remove_duplicate_addresses (joined); + g_free (joined); + + recipients = modest_text_utils_split_addresses_list (after_remove); + g_free (after_remove); + + if (recipients) { + /* Offer the user to add recipients to the address book */ + modest_address_book_add_address_list_with_selector (recipients, (GtkWindow *) self); + g_slist_foreach (recipients, (GFunc) g_free, NULL); g_slist_free (recipients); + } +} + static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button, ModestMsgEditWindow *window) @@ -3498,7 +3572,7 @@ update_window_title (ModestMsgEditWindow *window) if (subject == NULL || subject[0] == '\0') subject = _("mail_va_new_email"); - gtk_window_set_title (GTK_WINDOW (window), subject); + modest_window_set_title (MODEST_WINDOW (window), subject); } @@ -3512,30 +3586,57 @@ body_insert_text (GtkTextBuffer *buffer, { GtkTextIter end_iter; gint offset; + glong utf8_len; + gint line; + gchar *text_offset; + gint text_lines; + + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end_iter); offset = gtk_text_iter_get_offset (&end_iter); + line = gtk_text_iter_get_line (&end_iter); + + text_offset = text; + text_lines = 0; + while (text_offset < text + len) { + if (*text_offset == '\n') + text_lines++; + if (text_lines + line >= MAX_BODY_LINES) { + len = text_offset - text; + break; + } + text_offset++; + } + + utf8_len = g_utf8_strlen (text, len); - if (offset + len > MAX_BODY_LENGTH) { + if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) { g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text"); - if (offset < MAX_BODY_LENGTH) + if (line <= MAX_BODY_LINES && offset < MAX_BODY_LENGTH) { gchar *result; + gchar *utf8_end; + + utf8_end = g_utf8_offset_to_pointer (text, MAX_BODY_LENGTH - offset); /* Prevent endless recursion */ - result = g_strndup (text, MAX_BODY_LENGTH - offset); + result = g_strndup (text, utf8_end - text); g_signal_handlers_block_by_func (G_OBJECT (buffer), G_CALLBACK (body_insert_text), window); g_signal_emit_by_name (G_OBJECT (buffer), "insert-text", location, - (gpointer) result, (gpointer) MAX_BODY_LENGTH - offset, + (gpointer) result, (gpointer) (utf8_end - text), (gpointer) window); g_signal_handlers_unblock_by_func (G_OBJECT (buffer), G_CALLBACK (body_insert_text), window); } } - if (offset + len > MAX_BODY_LENGTH) { - hildon_banner_show_information (GTK_WIDGET (window), NULL, - _CS("ckdg_ib_maximum_characters_reached")); + if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) { + if (priv->max_chars_banner == NULL) { + priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL, + _CS("ckdg_ib_maximum_characters_reached")); + g_object_weak_ref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, window); + } } } @@ -3591,28 +3692,28 @@ subject_field_insert_text (GtkEditable *editable, } if (result_len + old_length > 1000) { - hildon_banner_show_information (GTK_WIDGET (window), NULL, + modest_platform_system_banner (GTK_WIDGET (window), NULL, _CS("ckdg_ib_maximum_characters_reached")); } g_string_free (result, TRUE); } void -modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, - gboolean show) +modest_msg_edit_window_toggle_isearch_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); + gtk_widget_set_no_show_all (priv->isearch_toolbar, FALSE); if (show) { - gtk_widget_show_all (priv->find_toolbar); - hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE); + gtk_widget_show_all (priv->isearch_toolbar); + modest_isearch_toolbar_highlight_entry (MODEST_ISEARCH_TOOLBAR (priv->isearch_toolbar), TRUE); } else { - gtk_widget_hide_all (priv->find_toolbar); + gtk_widget_hide_all (priv->isearch_toolbar); gtk_widget_grab_focus (priv->msg_body); } } @@ -3660,7 +3761,7 @@ gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, result = TRUE; if (!gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY, match_start, match_end, NULL)) { - g_warning ("Matched string with collate, but not matched in model"); + g_debug ("Matched string with collate, but not matched in model"); } g_free (found_text); } @@ -3677,10 +3778,10 @@ gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, static void -modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, - ModestMsgEditWindow *window) +modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget, + ModestMsgEditWindow *window) { - gchar *current_search = NULL; + const gchar *current_search = NULL; ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); gboolean result; GtkTextIter selection_start, selection_end; @@ -3690,17 +3791,16 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, if (message_is_empty (window)) { g_free (priv->last_search); priv->last_search = NULL; - hildon_banner_show_information (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find")); + modest_platform_system_banner (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find")); return; } - g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL); + current_search = modest_isearch_toolbar_get_search (MODEST_ISEARCH_TOOLBAR (widget)); 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, _CS("ecdg_ib_find_rep_enter_text")); + modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text")); return; } @@ -3716,14 +3816,14 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete")); + modest_platform_system_banner (NULL, NULL, _HL("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_insensitive (&buffer_start, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches")); + modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches")); } /* Mark as selected the string found in search */ @@ -3735,7 +3835,6 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, g_free (priv->last_search); priv->last_search = NULL; } - g_free (current_search); } gboolean @@ -3758,10 +3857,10 @@ modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, } static void -modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, - ModestMsgEditWindow *window) +modest_msg_edit_window_isearch_toolbar_close (GtkWidget *widget, + ModestMsgEditWindow *window) { - modest_msg_edit_window_toggle_find_toolbar (window, FALSE); + modest_msg_edit_window_toggle_isearch_toolbar (window, FALSE); } void @@ -3897,17 +3996,16 @@ on_account_removed (TnyAccountStore *account_store, } } -static void update_signature (ModestMsgEditWindow *self, - const gchar *old_account, - const gchar *new_account) +static void +update_signature (ModestMsgEditWindow *self, + const gchar *old_account, + const gchar *new_account) { ModestMsgEditWindowPrivate *priv; gboolean has_old_signature, has_new_signature; GtkTextIter iter; - GtkTextIter match_start, match_end; ModestAccountMgr *mgr; gchar *signature; - gchar *full_signature; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); @@ -3920,15 +4018,23 @@ static void update_signature (ModestMsgEditWindow *self, if (old_account) { signature = modest_account_mgr_get_signature_from_recipient (mgr, old_account, &has_old_signature); if (has_old_signature) { - full_signature = g_strconcat ("\n--\n", signature, NULL); - if (gtk_text_iter_forward_search (&iter, full_signature, 0, &match_start, &match_end, NULL)) { + GtkTextIter match_start, match_end; + /* We cannot use + MODEST_TEXT_UTILS_SIGNATURE_MARKER as it + seems that the search has some problems + with the blank space at the end */ + if (gtk_text_iter_forward_search (&iter, "--", + GTK_TEXT_SEARCH_TEXT_ONLY, + &match_start, NULL, NULL)) { + gtk_text_buffer_get_end_iter (priv->text_buffer ,&match_end); gtk_text_buffer_delete (priv->text_buffer, &match_start, &match_end); iter = match_start; } else if (gtk_text_iter_forward_search (&iter, _("mcen_ia_editor_original_message"), 0, &match_start, &match_end, NULL)) { iter = match_start; } - g_free (full_signature); + } else { + gtk_text_buffer_get_end_iter (priv->text_buffer, &iter); } g_free (signature); } @@ -3936,7 +4042,10 @@ static void update_signature (ModestMsgEditWindow *self, priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature); if (has_new_signature) { - full_signature = g_strconcat ("\n--\n", signature, NULL); + + gchar *full_signature = g_strconcat ((gtk_text_iter_starts_line (&iter)) ? "" : "\n", + MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", + signature, NULL); gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1); g_free (full_signature); } @@ -3944,6 +4053,42 @@ static void update_signature (ModestMsgEditWindow *self, gtk_text_buffer_end_user_action (priv->text_buffer); } +static void update_branding (ModestMsgEditWindow *self, + const gchar *new_account) +{ + ModestMsgEditWindowPrivate *priv; + ModestAccountMgr *mgr; + const GdkPixbuf *new_icon = NULL; + gchar *new_label = NULL; + gboolean show = FALSE; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + mgr = modest_runtime_get_account_mgr (); + + modest_account_mgr_get_branding_from_recipient (mgr, new_account, &new_label, &new_icon, MODEST_ICON_SIZE_SMALL); + if (new_icon) { + gtk_image_set_from_pixbuf (GTK_IMAGE (priv->brand_icon), (GdkPixbuf *) new_icon); + gtk_widget_show (priv->brand_icon); + show = TRUE; + } else { + gtk_widget_hide (priv->brand_icon); + } + if (new_label) { + gtk_label_set_text (GTK_LABEL (priv->brand_label), new_label); + gtk_widget_show (priv->brand_label); + g_free (new_label); + show = TRUE; + } else { + gtk_widget_hide (priv->brand_label); + } + + if (show) + gtk_widget_show (priv->brand_container); + else + gtk_widget_hide (priv->brand_container); +} + static void from_field_changed (HildonPickerButton *button, ModestMsgEditWindow *self) @@ -3954,10 +4099,21 @@ from_field_changed (HildonPickerButton *button, priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); old_account = priv->last_from_account; - priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); - new_account = priv->last_from_account; + new_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field)); + + if (!new_account) { + g_warning ("%s, could not get the new account", __FUNCTION__); + return; + } + + /* If the From is the same do nothing */ + if (old_account && new_account && !strcmp (old_account, new_account)) + return; + + priv->last_from_account = new_account; update_signature (self, old_account, new_account); + update_branding (self, new_account); } @@ -4153,6 +4309,9 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) g_signal_connect (G_OBJECT (html_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper); g_signal_connect (G_OBJECT (text_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), GTK_WINDOW (window)); + /* Save settings if the user clicked on done */ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { TnyHeaderFlags flags; @@ -4184,23 +4343,23 @@ on_message_settings (GtkAction *action, } static void -on_cc_button_toggled (HildonCheckButton *button, +on_cc_button_toggled (GtkWidget *button, ModestMsgEditWindow *window) { g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); modest_msg_edit_window_show_cc (MODEST_MSG_EDIT_WINDOW (window), - hildon_check_button_get_active (button)); + modest_togglable_get_active (button)); } static void -on_bcc_button_toggled (HildonCheckButton *button, +on_bcc_button_toggled (GtkWidget *button, ModestMsgEditWindow *window) { g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window), - hildon_check_button_get_active (button)); + modest_togglable_get_active (button)); } static void @@ -4213,47 +4372,55 @@ setup_menu (ModestMsgEditWindow *self) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); /* Settings menu buttons */ - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_checknames"), NULL, - APP_MENU_CALLBACK (modest_ui_actions_on_check_names), - NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "z", - APP_MENU_CALLBACK (modest_ui_actions_on_undo), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo)); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names), + NULL); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts)); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_undo"), "z", + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo)); priv->cc_button = hildon_check_button_new (0); gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc")); hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), FALSE); - modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->cc_button), - NULL); + modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->cc_button, NULL); g_signal_connect (G_OBJECT (priv->cc_button), "toggled", G_CALLBACK (on_cc_button_toggled), (gpointer) self); - gtk_button_set_alignment (GTK_BUTTON (priv->cc_button), 0.5, 0.5); - gtk_button_set_alignment (GTK_BUTTON (priv->cc_button), 0.5, 0.5); - priv->bcc_button = hildon_check_button_new (0); - gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc")); - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), - FALSE); - modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->bcc_button), - NULL); + priv->bcc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (), + _("mcen_me_editor_showbcc")); + modest_togglable_set_active (priv->bcc_button, + FALSE); + modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->bcc_button, + NULL); g_signal_connect (G_OBJECT (priv->bcc_button), "toggled", G_CALLBACK (on_bcc_button_toggled), (gpointer) self); - gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5); - gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5); - - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL, - APP_MENU_CALLBACK (modest_ui_actions_on_insert_image), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL, - APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL, - APP_MENU_CALLBACK (on_message_settings), - NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "f", - APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page), - NULL); + + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_insert_image), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style)); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_add_attachment"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_msg_edit_window_add_attachment_clicked), + NULL); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL, + MODEST_WINDOW_MENU_CALLBACK (on_message_settings), + NULL); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), "f", + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page), + NULL); +} + +static void +emit_open_addressbook (GtkButton *button, + ModestRecptEditor *editor) +{ + g_signal_emit_by_name (G_OBJECT (editor), "open-addressbook"); } static GtkWidget * @@ -4263,22 +4430,103 @@ _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_siz GtkWidget *abook_button; GtkWidget *align; GtkWidget *box; + GtkWidget *label_widget; box = gtk_hbox_new (FALSE, 0); - align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT); abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); - gtk_button_set_label (GTK_BUTTON (abook_button), label); + label_widget = gtk_label_new (label); + gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); + gtk_container_add (GTK_CONTAINER (abook_button), label_widget); gtk_container_add (GTK_CONTAINER (align), abook_button); + gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1); gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0); if (title_size_group) - gtk_size_group_add_widget (title_size_group, abook_button); + gtk_size_group_add_widget (title_size_group, label_widget); if (value_size_group) gtk_size_group_add_widget (value_size_group, control); + + g_signal_connect (G_OBJECT (abook_button), "clicked", + G_CALLBACK (emit_open_addressbook), control); return box; } + +static void +max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref) +{ + ModestMsgEditWindowPrivate *priv = NULL; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self)); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + priv->max_chars_banner = NULL; +} + +static gboolean +has_pending_addresses (ModestRecptEditor *recpt_editor) +{ + const gchar *recipients = NULL; + GSList *start_indexes = NULL, *end_indexes = NULL; + GSList *current_start, *current_end; + GtkTextBuffer *buffer; + gint offset_delta = 0; + gint last_length; + gboolean has_recipients_to_add = FALSE; + + recipients = modest_recpt_editor_get_recipients (recpt_editor); + last_length = g_utf8_strlen (recipients, -1); + modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes); + + if (!start_indexes) + return FALSE; + + current_start = start_indexes; + current_end = end_indexes; + buffer = modest_recpt_editor_get_buffer (recpt_editor); + + while (current_start && !has_recipients_to_add) { + gchar *address; + gchar *start_ptr, *end_ptr; + gint start_pos, end_pos; + + start_pos = (*((gint*) current_start->data)) + offset_delta; + end_pos = (*((gint*) current_end->data)) + offset_delta; + + start_ptr = g_utf8_offset_to_pointer (recipients, start_pos); + end_ptr = g_utf8_offset_to_pointer (recipients, end_pos); + + address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr)); + + if (modest_text_utils_validate_recipient (address, NULL)) { + if (!modest_address_book_has_address (address)) { + has_recipients_to_add = TRUE; + } + } + current_start = g_slist_next (current_start); + current_end = g_slist_next (current_end); + } + return has_recipients_to_add; +} + +gboolean +modest_msg_edit_window_has_pending_addresses (ModestMsgEditWindow *self) +{ + ModestMsgEditWindowPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self), FALSE); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + if (!has_pending_addresses ((ModestRecptEditor *) priv->to_field) && + !has_pending_addresses ((ModestRecptEditor *) priv->cc_field) && + !has_pending_addresses ((ModestRecptEditor *) priv->bcc_field)) + return FALSE; + else + return TRUE; +}