X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-msg-edit-window.c;h=0a2b46b655a80a986b18fb9f56ef95639fbd60c7;hp=035d5ba3f4627ebee456ec27d365d97a20bee7eb;hb=HEAD;hpb=e31d9e7cc8643bc34ae4e31ebdfce07634337fca diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c index 035d5ba..0a2b46b 100644 --- a/src/widgets/modest-msg-edit-window.c +++ b/src/widgets/modest-msg-edit-window.c @@ -83,13 +83,20 @@ #include "modest-color-button.h" #endif -#define DEFAULT_FONT_SIZE 3 -#define DEFAULT_FONT 2 -#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans" #define DEFAULT_MAIN_VBOX_SPACING 0 #define SUBJECT_MAX_LENGTH 1000 #define IMAGE_MAX_WIDTH 560 +#ifdef MODEST_TOOLKIT_HILDON2 +#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans" #define DEFAULT_FONT_SCALE 1.5 +#define DEFAULT_FONT_SIZE 3 +#define DEFAULT_FONT 2 +#else +#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans" +#define DEFAULT_FONT_SCALE 1.0 +#define DEFAULT_FONT_SIZE 2 +#define DEFAULT_FONT 2 +#endif #define ATTACHMENT_BUTTON_WIDTH 118 #define MAX_FROM_VALUE 36 #define MAX_BODY_LENGTH 128*1024 @@ -125,6 +132,13 @@ static void subject_field_insert_text (GtkEditable *editable, ModestMsgEditWindow *window); static void modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, gpointer userdata); +#ifdef MODEST_TOOLKIT_HILDON2 +static void font_face_clicked (GtkToolButton *button, + ModestMsgEditWindow *window); +#else +static void modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item, + gpointer userdata); +#endif static void modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window); static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, @@ -174,6 +188,8 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, ModestMsgEditWindow *userdata); +static void on_show_toolbar_button_toggled (GtkWidget *button, + ModestMsgEditWindow *window); static void on_message_settings (GtkAction *action, ModestMsgEditWindow *window); static void setup_menu (ModestMsgEditWindow *self); @@ -182,8 +198,6 @@ static void from_field_changed (GtkWidget *button, ModestMsgEditWindow *self); static void font_size_clicked (GtkToolButton *button, ModestMsgEditWindow *window); -static void font_face_clicked (GtkToolButton *button, - ModestMsgEditWindow *window); static void update_signature (ModestMsgEditWindow *self, const gchar *old_account, const gchar *new_account); @@ -325,19 +339,22 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *app_menu; GtkWidget *cc_button; GtkWidget *bcc_button; + GtkWidget *show_toolbar_button; GtkWidget *max_chars_banner; GtkWidget *brand_icon; GtkWidget *brand_label; GtkWidget *brand_container; + + TnyList *custom_header_pairs; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_MSG_EDIT_WINDOW, \ ModestMsgEditWindowPrivate)) /* globals */ -static GtkWindowClass *parent_class = NULL; +static ModestWindowParentClass *parent_class = NULL; /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ @@ -460,6 +477,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->references = NULL; priv->in_reply_to = NULL; priv->max_chars_banner = NULL; + priv->custom_header_pairs = TNY_LIST (tny_simple_list_new ()); if (!is_wp_text_buffer_started) { is_wp_text_buffer_started = TRUE; @@ -781,7 +799,9 @@ connect_signals (ModestMsgEditWindow *obj) 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); + if (GTK_IS_WINDOW (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); g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))), @@ -901,7 +921,7 @@ init_window (ModestMsgEditWindow *obj) * that uses it, because the ModestSelectorPicker uses the ID opaquely, * so it can't know how to manage its memory. */ priv->from_field = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (), - NULL, g_str_equal); + NULL, g_str_equal, FALSE); modest_selector_set_value_max_chars (priv->from_field, MAX_FROM_VALUE); if (GTK_IS_COMBO_BOX (priv->from_field)) { from_caption = modest_toolkit_utils_create_captioned (title_size_group, NULL, @@ -1040,15 +1060,14 @@ init_window (ModestMsgEditWindow *obj) NULL); gtk_widget_set_no_show_all (priv->isearch_toolbar, TRUE); -/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */ - priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); 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); - gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT); + gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), MODEST_MARGIN_HALF, 0, + MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT); gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0); @@ -1056,14 +1075,14 @@ init_window (ModestMsgEditWindow *obj) 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->scrollable, TRUE, TRUE, 0); } - + static void modest_msg_edit_window_disconnect_signals (ModestWindow *window) { @@ -1092,6 +1111,8 @@ modest_msg_edit_window_finalize (GObject *obj) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj); + g_object_unref (priv->custom_header_pairs); + 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; @@ -1146,6 +1167,7 @@ modest_msg_edit_window_finalize (GObject *obj) g_free (priv->original_mailbox); g_free (priv->msg_uid); g_free (priv->last_search); + g_slist_free (priv->font_items_group); g_free (priv->references); g_free (priv->in_reply_to); g_object_unref (priv->attachments); @@ -1374,6 +1396,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) TnyFolder *msg_folder; gboolean is_html = FALSE; gboolean field_view_set; + TnyList *orig_header_pairs; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); g_return_if_fail (TNY_IS_MSG (msg)); @@ -1509,12 +1532,58 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) g_object_unref (msg_folder); } + orig_header_pairs = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_header_pairs (TNY_MIME_PART (msg), orig_header_pairs); + modest_msg_edit_window_set_custom_header_pairs (self, orig_header_pairs); + g_object_unref (orig_header_pairs); + g_free (to); g_free (subject); g_free (cc); g_free (bcc); } +#ifndef MODEST_TOOLKIT_HILDON2 +static void +menu_tool_button_clicked_popup (GtkMenuToolButton *item, + gpointer data) +{ + GList *item_children, *node; + GtkWidget *bin_child; + + bin_child = gtk_bin_get_child (GTK_BIN(item)); + + item_children = gtk_container_get_children (GTK_CONTAINER (bin_child)); + + for (node = item_children; node != NULL; node = g_list_next (node)) { + if (GTK_IS_TOGGLE_BUTTON (node->data)) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (node->data), TRUE); + } + } + g_list_free (item_children); +} + +static void +menu_tool_button_dont_expand (GtkMenuToolButton *item) +{ + GtkWidget *box; + GList *item_children, *node; + + box = gtk_bin_get_child (GTK_BIN (item)); + gtk_box_set_homogeneous (GTK_BOX (box), TRUE); + item_children = gtk_container_get_children (GTK_CONTAINER (box)); + + for (node = item_children; node != NULL; node = g_list_next (node)) { + gtk_box_set_child_packing (GTK_BOX (box), GTK_WIDGET (node->data), TRUE, TRUE, 0, GTK_PACK_START); + if (GTK_IS_TOGGLE_BUTTON (node->data)) + gtk_button_set_alignment (GTK_BUTTON (node->data), 0.0, 0.5); + else if (GTK_IS_BUTTON (node->data)) + gtk_button_set_alignment (GTK_BUTTON (node->data), 1.0, 0.5); + } + g_list_free (item_children); +} +#endif + static void modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) { @@ -1527,10 +1596,13 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gint size_index; gint font_index; GtkWidget *sizes_menu; - GtkWidget *fonts_menu; gchar *markup; GtkWidget *arrow; GtkWidget *hbox; +#ifndef MODEST_TOOLKIT_HILDON2 + GSList *radio_group, *node; + GtkWidget *fonts_menu; +#endif /* Toolbar */ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); @@ -1571,7 +1643,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) 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)); /* font_size */ - tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, "")); priv->size_tool_button_label = gtk_label_new (NULL); snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]); markup = g_strconcat ("", @@ -1612,16 +1684,15 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); priv->font_size_toolitem = tool_item; +#ifdef MODEST_TOOLKIT_HILDON2 /* font face */ - tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, "")); priv->font_tool_button_label = gtk_label_new (NULL); markup = g_strconcat ("Tt", NULL); gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); gtk_misc_set_alignment (GTK_MISC (priv->font_tool_button_label), 1.0, 0.5); g_free(markup); -#ifdef MODEST_TOOLKIT_HILDON2 hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont"); -#endif hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE); gtk_box_pack_start (GTK_BOX (hbox), priv->font_tool_button_label, TRUE, TRUE, 0); arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); @@ -1629,7 +1700,20 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0); gtk_widget_set_sensitive (arrow, FALSE); gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox); +#else + tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL)); + priv->font_tool_button_label = gtk_label_new (NULL); + markup = g_strconcat ("Tt", NULL); + gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); + g_free(markup); + gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); + gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label); + gtk_widget_show (priv->font_tool_button_label); + gtk_widget_show (GTK_WIDGET (tool_item)); fonts_menu = gtk_menu_new (); +#endif + +#ifdef MODEST_TOOLKIT_HILDON2 priv->faces_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING)); for (font_index = 0; font_index < wp_get_font_count (); font_index++) { GtkTreeIter iter; @@ -1648,6 +1732,41 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); priv->font_face_toolitem = tool_item; +#else + priv->font_items_group = NULL; + radio_group = NULL; + for (font_index = 0; font_index < wp_get_font_count (); font_index++) { + GtkWidget *font_menu_item; + GtkWidget *child_label; + + font_menu_item = gtk_radio_menu_item_new_with_label (radio_group, ""); + child_label = gtk_bin_get_child (GTK_BIN (font_menu_item)); + markup = g_strconcat ("", + wp_get_font_name (font_index), "", NULL); + gtk_label_set_markup (GTK_LABEL (child_label), markup); + g_free (markup); + + radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (font_menu_item)); + gtk_menu_shell_append (GTK_MENU_SHELL (fonts_menu), font_menu_item); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (font_menu_item), (font_index == DEFAULT_FONT)); + gtk_widget_show (font_menu_item); + + priv->font_items_group = g_slist_prepend (priv->font_items_group, font_menu_item); + + } + for (node = radio_group; node != NULL; node = g_slist_next (node)) { + GtkWidget *item = (GtkWidget *) node->data; + g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change), + window); + } + priv->font_items_group = g_slist_reverse (priv->font_items_group); + gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), fonts_menu); + g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); + menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item)); + priv->font_face_toolitem = tool_item; +#endif /* Set expand and homogeneous for remaining items */ tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold"); @@ -1656,6 +1775,9 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics"); 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/ActionsInsertImage"); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); /* Explicitelly show all the toolbar (a normal gtk_widget_show will not show the tool items added to the placeholders) */ @@ -1663,7 +1785,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) /* Set the no show all *after* showing all items. We do not want the toolbar to be shown with a show all because it - could go agains the gconf setting regarding showing or not + could go against the gconf setting regarding showing or not the toolbar of the editor window */ gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); } @@ -1918,6 +2040,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) g_object_unref (att_iter); data->priority_flags = priv->priority_flags; + data->custom_header_pairs = tny_list_copy (priv->custom_header_pairs); return data; } @@ -1950,6 +2073,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, g_free (data->account_name); g_free (data->references); g_free (data->in_reply_to); + + g_object_unref (data->custom_header_pairs); if (data->draft_msg != NULL) { g_object_unref (data->draft_msg); @@ -2011,11 +2136,16 @@ modest_msg_edit_window_set_format (ModestMsgEditWindow *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); + update_signature (self, priv->last_from_account, priv->last_from_account); + if (parent_priv->toolbar) + on_show_toolbar_button_toggled (priv->show_toolbar_button, + MODEST_MSG_EDIT_WINDOW (self)); 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); + if (parent_priv->toolbar) + on_show_toolbar_button_toggled (priv->show_toolbar_button, + MODEST_MSG_EDIT_WINDOW (self)); break; default: g_return_if_reached (); @@ -2226,6 +2356,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo gtk_tree_path_free (path); } +#ifdef MODEST_TOOLKIT_HILDON2 if (priv->current_face_index != buffer_format->font) { GtkTreeIter iter; GtkTreePath *path; @@ -2244,6 +2375,27 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo } } +#else + GtkWidget *new_font_menuitem; + new_font_menuitem = GTK_WIDGET ((g_slist_nth (priv->font_items_group, + buffer_format->font))->data); + if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_font_menuitem))) { + GtkWidget *label; + gchar *markup; + + label = gtk_bin_get_child (GTK_BIN (new_font_menuitem)); + markup = g_strconcat ("Tt", NULL); + gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); + g_free (markup); + g_signal_handlers_block_by_func (G_OBJECT (new_font_menuitem), + G_CALLBACK (modest_msg_edit_window_font_change), + window); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_font_menuitem), TRUE); + g_signal_handlers_unblock_by_func (G_OBJECT (new_font_menuitem), + G_CALLBACK (modest_msg_edit_window_font_change), + window); + } +#endif g_free (buffer_format); @@ -2420,7 +2572,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) if (stream == NULL) { modest_platform_information_banner (NULL, NULL, - _FM("sfil_ib_opening_not_allowed")); + _FM_OPENING_NOT_ALLOWED); g_free (filename); g_object_unref (mime_part); gnome_vfs_file_info_unref (info); @@ -2642,7 +2794,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, if (stream == NULL) { - modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); + modest_platform_information_banner (NULL, NULL, _FM_OPENING_NOT_ALLOWED); g_object_unref (mime_part); g_free (filename); @@ -2783,6 +2935,39 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body); } +#ifndef MODEST_TOOLKIT_HILDON2 +static void +modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item, + gpointer userdata) +{ + ModestMsgEditWindowPrivate *priv; + gint new_font_index; + ModestMsgEditWindow *window; + GtkWidget *label; + + window = MODEST_MSG_EDIT_WINDOW (userdata); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body)); + + if (gtk_check_menu_item_get_active (menu_item)) { + gchar *markup; + + label = gtk_bin_get_child (GTK_BIN (menu_item)); + + new_font_index = wp_get_font_index (gtk_label_get_text (GTK_LABEL (label)), DEFAULT_FONT); + + if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, + GINT_TO_POINTER(new_font_index))) + wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); + + text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window)); + markup = g_strconcat ("Tt", NULL); + gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); + g_free (markup); + } +} +#endif + static void font_size_clicked (GtkToolButton *button, ModestMsgEditWindow *window) @@ -2837,11 +3022,11 @@ font_size_clicked (GtkToolButton *button, #endif } +#ifdef MODEST_TOOLKIT_HILDON2 static void font_face_clicked (GtkToolButton *button, ModestMsgEditWindow *window) { -#ifdef MODEST_TOOLKIT_HILDON2 ModestMsgEditWindowPrivate *priv; GtkWidget *selector, *dialog; GtkCellRenderer *renderer; @@ -2889,8 +3074,8 @@ font_face_clicked (GtkToolButton *button, gtk_widget_destroy (dialog); gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body)); -#endif } +#endif void modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, @@ -3004,6 +3189,10 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self, } else { gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); } + modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, show_toolbar, NULL); + if (modest_togglable_get_active (priv->show_toolbar_button) != show_toolbar) { + modest_togglable_set_active (priv->show_toolbar_button, show_toolbar); + } } void @@ -3085,8 +3274,10 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, 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)); + update_signature (window, priv->last_from_account, priv->last_from_account); if (parent_priv->toolbar) - gtk_widget_show (parent_priv->toolbar); + on_show_toolbar_button_toggled (priv->show_toolbar_button, + MODEST_MSG_EDIT_WINDOW (window)); break; case MODEST_FILE_FORMAT_PLAIN_TEXT: { @@ -3095,7 +3286,8 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, 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); + on_show_toolbar_button_toggled (priv->show_toolbar_button, + MODEST_MSG_EDIT_WINDOW (window)); } 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); @@ -3267,10 +3459,8 @@ modest_msg_edit_window_undo (ModestMsgEditWindow *window) 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); + on_show_toolbar_button_toggled (priv->show_toolbar_button, + MODEST_MSG_EDIT_WINDOW (window)); } modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); @@ -3459,14 +3649,18 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to { ModestMsgEditWindowPrivate *priv = NULL; GSList *address_list = NULL; + gboolean no_to, no_cc, no_bcc; g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); /* check if there's no recipient added */ - if ((gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))) == 0) && - (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))) == 0) && - (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))) == 0)) { + no_to = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))); + no_cc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))); + no_bcc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))); + + + if (no_to && no_cc && no_bcc) { /* no recipient contents, then select contacts */ modest_msg_edit_window_open_addressbook (window, NULL); return FALSE; @@ -3474,19 +3668,19 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to /* Check names */ g_object_ref (window); - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), + if (!no_to && !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), + if (!no_cc && !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), + if (!no_bcc && !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); @@ -3702,7 +3896,7 @@ body_insert_text (GtkTextBuffer *buffer, if (priv->max_chars_banner == NULL) { #ifdef MODEST_TOOLKIT_HILDON2 priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL, - _CS("ckdg_ib_maximum_characters_reached")); + _CS_MAXIMUM_CHARACTERS_REACHED); g_object_weak_ref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, window); #endif } @@ -3762,7 +3956,7 @@ subject_field_insert_text (GtkEditable *editable, if (result_len + old_length > 1000) { modest_platform_system_banner (GTK_WIDGET (window), NULL, - _CS("ckdg_ib_maximum_characters_reached")); + _CS_MAXIMUM_CHARACTERS_REACHED); } g_string_free (result, TRUE); } @@ -3869,7 +4063,7 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget, g_free (priv->last_search); priv->last_search = NULL; /* Information banner about empty search */ - modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text")); + modest_platform_system_banner (NULL, NULL, _CS_FIND_REP_ENTER_TEXT); return; } @@ -3885,14 +4079,14 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget, result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, &match_start, &match_end); if (!result) - modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_search_complete")); + modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_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) - modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches")); + modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_NO_MATCHES); } /* Mark as selected the string found in search */ @@ -4111,12 +4305,29 @@ update_signature (ModestMsgEditWindow *self, priv->last_from_account = modest_selector_get_active_id (priv->from_field); signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature); if (has_new_signature) { + gboolean is_rich; 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); + is_rich = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)); + if (is_rich) { + WPTextBufferFormat *fmt; + GdkColor style_color; + if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) { + gdk_color_parse ("grey", &style_color); + } + fmt = g_new0 (WPTextBufferFormat, 1); + fmt->color = style_color; + fmt->cs.color = 0x1; + wp_text_buffer_insert_with_attribute (WP_TEXT_BUFFER (priv->text_buffer), &iter, + full_signature, -1, + fmt, TRUE); + g_free (fmt); + g_free (full_signature); + } else { + gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1); + } } g_free (signature); gtk_text_buffer_end_user_action (priv->text_buffer); @@ -4194,7 +4405,6 @@ typedef struct _MessageSettingsHelper { GtkToggleButton *current_format; } MessageSettingsHelper; -#ifdef MODEST_TOOLKIT_HILDON2 static void on_priority_toggle (GtkToggleButton *button, MessageSettingsHelper *helper) @@ -4263,12 +4473,10 @@ on_format_toggle (GtkToggleButton *button, } } -#endif static void modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) { -#ifdef MODEST_TOOLKIT_HILDON2 GtkWidget *dialog; GtkWidget *align; GtkWidget *vbox; @@ -4292,7 +4500,7 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) dialog = gtk_dialog_new_with_buttons (_("mcen_me_message_settings"), NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL); + _HL_DONE, GTK_RESPONSE_ACCEPT, NULL); vbox = gtk_vbox_new (FALSE, 0); align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0); @@ -4303,15 +4511,27 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) /* Priority toggles */ priority_hbox = gtk_hbox_new (TRUE, 0); +#ifdef MODEST_TOOLKIT_HILDON2 high_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); +#else + high_toggle = gtk_toggle_button_new (); +#endif gtk_button_set_label (GTK_BUTTON (high_toggle), _("mcen_me_editor_priority_high")); helper.priority_group = g_slist_prepend (helper.priority_group, high_toggle); g_object_set_data (G_OBJECT (high_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_HIGH_PRIORITY)); +#ifdef MODEST_TOOLKIT_HILDON2 medium_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); +#else + medium_toggle = gtk_toggle_button_new (); +#endif gtk_button_set_label (GTK_BUTTON (medium_toggle), _("mcen_me_editor_priority_normal")); helper.priority_group = g_slist_prepend (helper.priority_group, medium_toggle); g_object_set_data (G_OBJECT (medium_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_NORMAL_PRIORITY)); +#ifdef MODEST_TOOLKIT_HILDON2 low_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); +#else + low_toggle = gtk_toggle_button_new (); +#endif gtk_button_set_label (GTK_BUTTON (low_toggle), _("mcen_me_editor_priority_low")); helper.priority_group = g_slist_prepend (helper.priority_group, low_toggle); g_object_set_data (G_OBJECT (low_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_LOW_PRIORITY)); @@ -4326,12 +4546,20 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) /* format toggles */ format_hbox = gtk_hbox_new (TRUE, 0); +#ifdef MODEST_TOOLKIT_HILDON2 html_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); +#else + html_toggle = gtk_toggle_button_new (); +#endif gtk_button_set_label (GTK_BUTTON (html_toggle), _("mcen_me_editor_formatted_text")); helper.format_group = g_slist_prepend (helper.format_group, html_toggle); g_object_set_data (G_OBJECT (html_toggle), "format", GINT_TO_POINTER (MODEST_MSG_EDIT_FORMAT_HTML)); g_object_set_data (G_OBJECT (html_toggle), "file-format", GINT_TO_POINTER (MODEST_FILE_FORMAT_FORMATTED_TEXT)); +#ifdef MODEST_TOOLKIT_HILDON2 text_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); +#else + text_toggle = gtk_toggle_button_new (); +#endif gtk_button_set_label (GTK_BUTTON (text_toggle), _("mcen_me_editor_plain_text")); helper.format_group = g_slist_prepend (helper.format_group, text_toggle); g_object_set_data (G_OBJECT (text_toggle), "format", GINT_TO_POINTER (MODEST_MSG_EDIT_FORMAT_TEXT)); @@ -4405,7 +4633,6 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) gtk_widget_destroy (dialog); g_slist_free (helper.priority_group); -#endif } static void @@ -4415,7 +4642,16 @@ on_message_settings (GtkAction *action, modest_msg_edit_window_show_msg_settings_dialog (window); } -#ifdef MODEST_TOOLKIT_HILDON2 +static void +on_show_toolbar_button_toggled (GtkWidget *button, + ModestMsgEditWindow *window) +{ + g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); + + modest_msg_edit_window_show_toolbar (MODEST_WINDOW (window), + modest_togglable_get_active (button)); +} + static void on_cc_button_toggled (GtkWidget *button, ModestMsgEditWindow *window) @@ -4435,7 +4671,6 @@ on_bcc_button_toggled (GtkWidget *button, modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window), modest_togglable_get_active (button)); } -#endif static void setup_menu (ModestMsgEditWindow *self) @@ -4447,35 +4682,41 @@ setup_menu (ModestMsgEditWindow *self) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); /* Settings menu buttons */ - modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL, - MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names), - NULL); - modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL, - MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts)); - modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_undo"), "z", - MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo)); - -#ifdef MODEST_TOOLKIT_HILDON2 - priv->cc_button = hildon_check_button_new (0); - gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc")); - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), - FALSE); + priv->cc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (), + _("mcen_me_editor_showcc")); + modest_togglable_set_active (priv->cc_button, + FALSE); modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->cc_button, NULL); + gtk_widget_show (priv->cc_button); g_signal_connect (G_OBJECT (priv->cc_button), "toggled", G_CALLBACK (on_cc_button_toggled), (gpointer) self); priv->bcc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (), _("mcen_me_editor_showbcc")); + gtk_widget_show (priv->bcc_button); modest_togglable_set_active (priv->bcc_button, FALSE); modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->bcc_button, NULL); g_signal_connect (G_OBJECT (priv->bcc_button), "toggled", G_CALLBACK (on_bcc_button_toggled), (gpointer) self); -#endif + priv->show_toolbar_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (), + _("mcen_bd_show_toolbar")); + modest_togglable_set_active (priv->show_toolbar_button, + FALSE); + modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->show_toolbar_button, + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_show_toolbar)); + gtk_widget_show (priv->show_toolbar_button); + g_signal_connect (G_OBJECT (priv->show_toolbar_button), "toggled", + G_CALLBACK (on_show_toolbar_button_toggled), (gpointer) self); + + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL, + MODEST_WINDOW_MENU_CALLBACK (on_message_settings), + NULL); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names), + NULL); modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL, MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_insert_image), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style)); @@ -4485,12 +4726,14 @@ setup_menu (ModestMsgEditWindow *self) modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL, MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); - modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL, - MODEST_WINDOW_MENU_CALLBACK (on_message_settings), - NULL); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts)); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), "f", MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page), NULL); + } static void @@ -4501,41 +4744,54 @@ emit_open_addressbook (GtkButton *button, } static GtkWidget * -_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group, - const gchar *label, GtkWidget *control) +_create_addressbook_box (GtkSizeGroup *title_size_group, + GtkSizeGroup *value_size_group, + const gchar *label, + GtkWidget *control) { GtkWidget *abook_button; GtkWidget *align; GtkWidget *box; - GtkWidget *label_widget; + GtkWidget *label_widget; box = gtk_hbox_new (FALSE, 0); - align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0); + align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); +#ifndef MODEST_TOOLKIT_HILDON2 + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE); +#else gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT); +#endif #ifdef MODEST_TOOLKIT_HILDON2 - abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); + abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); #else - abook_button = gtk_button_new (); + abook_button = gtk_button_new (); #endif 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_container_add (GTK_CONTAINER (abook_button), label_widget); + + gtk_container_add (GTK_CONTAINER (align), abook_button); +#ifdef MODEST_TOOLKIT_HILDON2 + gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1); +#endif 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) +#ifdef MODEST_TOOLKIT_HILDON2 gtk_size_group_add_widget (title_size_group, label_widget); +#else + gtk_size_group_add_widget (title_size_group, abook_button); +#endif 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; + g_signal_connect (G_OBJECT (abook_button), "clicked", + G_CALLBACK (emit_open_addressbook), control); + + return box; } static void @@ -4611,3 +4867,17 @@ modest_msg_edit_window_has_pending_addresses (ModestMsgEditWindow *self) else return TRUE; } + +void +modest_msg_edit_window_set_custom_header_pairs (ModestMsgEditWindow *self, + TnyList *header_pairs) +{ + ModestMsgEditWindowPrivate *priv = NULL; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); + g_return_if_fail (TNY_IS_LIST (header_pairs)); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + g_object_unref (priv->custom_header_pairs); + priv->custom_header_pairs = tny_list_copy (header_pairs); +}