X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=3f4e51409bfeb53ddf74619dfdb820a4ed4fa11a;hb=2130b41c3722f14f8bda39544aff1c93c50ae8b4;hp=368a1d671a061ee176c2b5ae7aadb49ecde12327;hpb=890cdf6655a56ebb2a860c01bedbe15a59e7d9dd;p=modest diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 368a1d6..3f4e514 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -87,13 +87,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; @@ -187,13 +188,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 +224,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 } @@ -322,6 +326,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), \ @@ -445,6 +455,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; @@ -707,6 +718,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; @@ -748,6 +769,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); @@ -806,6 +829,7 @@ init_window (ModestMsgEditWindow *obj) 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); @@ -928,16 +952,36 @@ init_window (ModestMsgEditWindow *obj) g_object_unref (title_size_group); g_object_unref (value_size_group); + 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 (); @@ -1018,7 +1062,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)); @@ -1070,8 +1119,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); @@ -1214,9 +1261,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; @@ -1226,7 +1273,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 { @@ -1312,12 +1359,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)) { @@ -1329,7 +1381,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)) { @@ -1614,6 +1668,7 @@ 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), @@ -2469,7 +2524,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; } @@ -2498,14 +2553,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); } @@ -2573,13 +2633,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); @@ -2897,7 +2957,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 @@ -2906,20 +2966,12 @@ 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, GTK_WINDOW (window)); @@ -3025,19 +3077,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: { @@ -3048,7 +3094,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); @@ -3204,12 +3251,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)); } @@ -3395,7 +3456,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); @@ -3408,23 +3470,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)); @@ -3542,30 +3609,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++; + } - if (offset + len > MAX_BODY_LENGTH) { + utf8_len = g_utf8_strlen (text, len); + + 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); + } } } @@ -3690,7 +3784,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); } @@ -3927,17 +4021,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); @@ -3950,15 +4043,21 @@ 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); } g_free (signature); } @@ -3966,7 +4065,8 @@ 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 (MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", + signature, NULL); gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1); g_free (full_signature); } @@ -3974,6 +4074,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) @@ -3984,10 +4120,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); } @@ -4278,7 +4425,7 @@ setup_menu (ModestMsgEditWindow *self) 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), _("TODO: add attachment"), NULL, + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_add_attachment"), NULL, APP_MENU_CALLBACK (modest_msg_edit_window_add_attachment_clicked), NULL); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL, @@ -4310,7 +4457,7 @@ _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_siz 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); @@ -4332,3 +4479,14 @@ _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_siz 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; +}