X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=66fb0a4665001284f5dbdb9638bff79e55b8ad47;hb=2d7c6a08252ee2887f49166b8a9e9c6e7c1382aa;hp=71ca3b27f66639f2cb233515e9ea4f76bb1575dc;hpb=afa6ecf77ada7b00594a0960872620c72bdb323c;p=modest diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 71ca3b2..66fb0a4 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, Nokia Corporation +/1* Copyright (c) 2006, Nokia Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,7 +92,7 @@ #define IMAGE_MAX_WIDTH 560 #define DEFAULT_FONT_SCALE 1.5 #define ATTACHMENT_BUTTON_WIDTH 118 -#define MAX_FROM_VALUE 48 +#define MAX_FROM_VALUE 36 #define MAX_BODY_LENGTH 4096 static gboolean is_wp_text_buffer_started = FALSE; @@ -187,13 +187,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 +223,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 +270,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; @@ -322,6 +325,11 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *app_menu; GtkWidget *cc_button; GtkWidget *bcc_button; + + GtkWidget *max_chars_banner; + + GtkWidget *brand_icon; + GtkWidget *brand_label; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -445,6 +453,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; @@ -738,8 +747,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); @@ -789,7 +799,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 +807,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,13 +882,18 @@ 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); @@ -886,16 +903,6 @@ init_window (ModestMsgEditWindow *obj) 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 +920,47 @@ 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); + 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_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); + + + 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), branding_box, FALSE, FALSE, 0); gtk_widget_set_no_show_all (priv->attachments_caption, TRUE); init_wp_text_view_style (); @@ -1011,7 +1041,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 +1098,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); @@ -1545,9 +1578,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,6 +1640,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), @@ -1644,6 +1675,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 +1926,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 (); @@ -2458,7 +2496,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; } @@ -2562,13 +2600,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,7 +2663,6 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, g_object_unref (att_list); return; } - } else { g_object_ref (att_list); } @@ -2696,7 +2733,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); } @@ -2887,7 +2924,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 +2933,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 +2957,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,6 +3042,16 @@ 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 (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: @@ -3019,6 +3067,7 @@ 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); @@ -3512,30 +3561,40 @@ body_insert_text (GtkTextBuffer *buffer, { GtkTextIter end_iter; gint offset; + glong utf8_len; + + 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); + utf8_len = g_utf8_strlen (text, len); - if (offset + len > MAX_BODY_LENGTH) { + if (offset + utf8_len > MAX_BODY_LENGTH) { g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text"); if (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 (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); + } } } @@ -3660,7 +3719,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); } @@ -3944,6 +4003,34 @@ 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; + + 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); + } 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); + } else { + gtk_widget_hide (priv->brand_label); + } +} + static void from_field_changed (HildonPickerButton *button, ModestMsgEditWindow *self) @@ -3958,6 +4045,7 @@ from_field_changed (HildonPickerButton *button, new_account = priv->last_from_account; update_signature (self, old_account, new_account); + update_branding (self, new_account); } @@ -4153,6 +4241,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; @@ -4245,6 +4336,9 @@ 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), _("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, APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); @@ -4256,6 +4350,13 @@ setup_menu (ModestMsgEditWindow *self) NULL); } +static void +emit_open_addressbook (GtkButton *button, + ModestRecptEditor *editor) +{ + g_signal_emit_by_name (G_OBJECT (editor), "open-addressbook"); +} + static GtkWidget * _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group, const gchar *label, GtkWidget *control) @@ -4263,22 +4364,40 @@ _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; +}