X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=e38b965b517ff7a53f4a69fb53462b55f6fb412a;hb=934fe4397499daa64353002077a447457afb505c;hp=a7dabeeefc5394eb6adfe679c6c4e22126318d38;hpb=8e642dd6eca57c2b126c8cfcc1b74335de9e98e2;p=modest diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index a7dabee..e38b965 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -64,21 +64,14 @@ #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 +80,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 36 -#define MAX_BODY_LENGTH 4096 +#define MAX_BODY_LENGTH 128*1024 +#define MAX_BODY_LINES 2048 static gboolean is_wp_text_buffer_started = FALSE; @@ -296,7 +290,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *font_dialog; - GtkWidget *pannable; + GtkWidget *scrollable; guint correct_scroll_idle; guint scroll_drag_timeout_id; gdouble last_upper; @@ -330,6 +324,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *brand_icon; GtkWidget *brand_label; + GtkWidget *brand_container; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -615,7 +610,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); @@ -716,6 +711,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; @@ -757,6 +762,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); @@ -900,6 +907,7 @@ init_window (ModestMsgEditWindow *obj) priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE); 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); + hildon_entry_set_placeholder ((HildonEntry *) 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); @@ -941,6 +949,7 @@ init_window (ModestMsgEditWindow *obj) 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); @@ -950,8 +959,14 @@ init_window (ModestMsgEditWindow *obj) 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); - gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_label, TRUE, TRUE, 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); @@ -960,7 +975,7 @@ init_window (ModestMsgEditWindow *obj) 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), branding_box, 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 (); @@ -986,9 +1001,9 @@ init_window (ModestMsgEditWindow *obj) /* 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); @@ -998,13 +1013,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); @@ -1240,9 +1255,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; @@ -1252,7 +1267,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 { @@ -1338,12 +1353,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)) { @@ -1355,7 +1375,9 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) 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)) { @@ -1478,7 +1500,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"); @@ -1647,7 +1669,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar 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->find_toolbar)); /* Init window */ connect_signals (MODEST_MSG_EDIT_WINDOW(obj)); @@ -2169,62 +2191,8 @@ 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) { @@ -2271,9 +2239,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) @@ -2525,14 +2490,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); } @@ -2668,7 +2638,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, } 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; @@ -2744,19 +2714,12 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, ModestMsgEditWindowPrivate *priv; 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*/ + + 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); + gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body); } static void @@ -3044,19 +3007,13 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE); - if (parent_priv->toolbar) { - if (file_format == MODEST_FILE_FORMAT_PLAIN_TEXT) { - gtk_widget_hide (parent_priv->toolbar); - } else { - gtk_widget_show (parent_priv->toolbar); - } - } - 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: { @@ -3067,7 +3024,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); + 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); @@ -3223,12 +3181,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)); } @@ -3414,7 +3386,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); @@ -3427,23 +3400,28 @@ 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), &address_list)) { 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), &address_list)) { 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), &address_list)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field)); g_object_unref (window); return FALSE; } + /* Add contacts to address book */ + if (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)); @@ -3562,17 +3540,34 @@ 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 + utf8_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; @@ -3589,7 +3584,7 @@ body_insert_text (GtkTextBuffer *buffer, } } - if (offset + utf8_len > MAX_BODY_LENGTH) { + 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")); @@ -3650,7 +3645,7 @@ 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); @@ -3749,7 +3744,7 @@ 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; } @@ -3759,7 +3754,7 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, 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; } @@ -3775,14 +3770,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 */ @@ -3956,17 +3951,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); @@ -3979,15 +3973,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); } @@ -3995,7 +3997,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); } @@ -4010,6 +4015,7 @@ static void update_branding (ModestMsgEditWindow *self, ModestAccountMgr *mgr; const GdkPixbuf *new_icon = NULL; gchar *new_label = NULL; + gboolean show = FALSE; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); @@ -4019,6 +4025,7 @@ static void update_branding (ModestMsgEditWindow *self, 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); } @@ -4026,9 +4033,15 @@ static void update_branding (ModestMsgEditWindow *self, 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 @@ -4041,8 +4054,18 @@ 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);