X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=5ac30d8b240af0e583cf0067c297c1e3d6200a30;hb=645ae86da233c18cde7691fc0315ec1cf4be467b;hp=e3e6b756c7225452d7f978ba0d0b4110a6f4aa46;hpb=df72437a09bc1b1c4d4c7767787b18b4e04be959;p=modest diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index e3e6b75..5ac30d8 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -70,30 +70,27 @@ #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 +#ifdef MODEST_USE_CALENDAR_WIDGETS +#include +#endif #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; @@ -330,6 +327,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), \ @@ -716,6 +714,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 +765,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 +910,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 +952,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 +962,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 +978,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 (); @@ -1098,8 +1116,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); @@ -1242,9 +1258,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; @@ -1254,7 +1270,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 { @@ -1340,12 +1356,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)) { @@ -1357,7 +1378,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)) { @@ -1458,6 +1481,23 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) g_free (bcc); } +#ifdef MODEST_USE_CALENDAR_WIDGETS +static void +color_button_clicked (GtkButton *button) +{ + static PipCalendarColor color = PipCalendarColorInvalid; + + /* Show ColorPicker dialog */ + color = pip_color_picker_select_color(color, PipColorPickerText); + + /* Check if some color is selected rather than dialog is dismissed */ + if (color != PipCalendarColorInvalid) { + GdkColor *gdk_color = (GdkColor *) pip_calendar_color_get_gdkcolor (color); + if (gdk_color) + hildon_color_button_set_color ((HildonColorButton *) button, gdk_color); + } +} +#endif static void modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) @@ -1501,6 +1541,13 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) G_CALLBACK (modest_msg_edit_window_color_button_change), window); + /* Yes I know this is a horrible hack, but it works for the + moment while we don't create a ModestColorButton */ +#ifdef MODEST_USE_CALENDAR_WIDGETS + GtkButtonClass *button_class = GTK_BUTTON_CLASS (HILDON_COLOR_BUTTON_GET_CLASS (priv->font_color_button)); + button_class->clicked = color_button_clicked; +#endif + /* Font size and face placeholder */ placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontAttributes"); insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder)); @@ -2171,72 +2218,17 @@ 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) { - WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); ModestMsgEditWindowPrivate *priv; GtkWidget *dialog = 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_chooser_new (); hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color)); g_free (buffer_format); @@ -2254,7 +2246,6 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window) void modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) { - ModestMsgEditWindowPrivate *priv; GtkWidget *dialog = NULL; GdkColor *old_color = NULL; @@ -2273,9 +2264,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) @@ -2527,14 +2515,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); } @@ -2602,8 +2595,8 @@ 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; } @@ -2744,21 +2737,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 @@ -3046,19 +3033,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: { @@ -3069,7 +3050,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); @@ -3225,12 +3207,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)); } @@ -3416,7 +3412,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); @@ -3429,23 +3426,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)); @@ -3455,6 +3460,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) @@ -3564,17 +3608,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; @@ -3591,7 +3652,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")); @@ -3958,17 +4019,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); @@ -3981,15 +4041,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); } @@ -3997,7 +4065,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); } @@ -4012,6 +4083,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); @@ -4021,6 +4093,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); } @@ -4028,9 +4101,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 @@ -4043,8 +4122,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); @@ -4309,6 +4398,9 @@ setup_menu (ModestMsgEditWindow *self) 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_viewer_addtocontacts"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts)); 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)); @@ -4403,3 +4495,66 @@ max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref) 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; +}