X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=862c7874887fc642dd97a83deea47f6d16bf31c1;hp=35e2c1e6875f254592f9140b504335df682e5d0c;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=cc379b2109f5c1b1a70419454d1a0e53c26559e6 diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 35e2c1e..862c787 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -63,7 +63,7 @@ #include #include #include -#include "modest-scroll-area.h" +#include #include "modest-msg-edit-window-ui-dimming.h" #include "modest-hildon-includes.h" @@ -119,9 +119,7 @@ static void modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, static void modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item, gpointer userdata); static void modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window); -static gboolean modest_msg_edit_window_window_state_event (GtkWidget *widget, - GdkEventWindowState *event, - gpointer userdata); + static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, ModestRecptEditor *editor); static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button, @@ -173,8 +171,6 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, ModestMsgEditWindow *userdata); -static void vadj_changed (GtkAdjustment *adj, - ModestMsgEditWindow *window); static void DEBUG_BUFFER (WPTextBuffer *buffer) { @@ -256,6 +252,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *font_size_toolitem; GtkWidget *font_face_toolitem; GtkWidget *font_color_button; + GtkWidget *font_color_toolitem; GSList *font_items_group; GtkWidget *font_tool_button_label; GSList *size_items_group; @@ -266,7 +263,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *font_dialog; - GtkWidget *scroll; + GtkWidget *pannable; guint scroll_drag_timeout_id; gdouble last_upper; @@ -342,22 +339,6 @@ restore_settings (ModestMsgEditWindow *self) ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self); conf = modest_runtime_get_conf (); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, - "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarNormalScreenMenu"); - modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), - modest_conf_get_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL)); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, - "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarFullScreenMenu"); - modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), - modest_conf_get_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)); - - /* set initial state of cc and bcc */ - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu"); - modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), - modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)); - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu"); - modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), - modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)); /* Dim at start clipboard actions */ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu"); @@ -367,8 +348,7 @@ restore_settings (ModestMsgEditWindow *self) action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu"); gtk_action_set_sensitive (action, FALSE); - modest_widget_memory_restore (conf, - G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY); + modest_widget_memory_restore (conf, G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY); } @@ -440,9 +420,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->font_dialog = NULL; - modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), - GTK_WINDOW(obj),"applications_email_editor"); - if (!is_wp_text_buffer_started) { is_wp_text_buffer_started = TRUE; wp_text_buffer_library_init (); @@ -455,8 +432,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) } -/* FIXME: this is a dup from the one in gtk/ */ - /** * @result: A ModestPairList, which must be freed with modest_pair_list_free(). */ @@ -521,10 +496,8 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu GtkTextMark *insert; GtkTextIter iter; GdkRectangle rectangle; - GtkAdjustment *vadj; gdouble new_value; gint offset; - GdkWindow *window; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); @@ -535,37 +508,11 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert); gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &iter, &rectangle); - vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)); offset = priv->msg_body->allocation.y; - new_value = vadj->value; - - if ((offset + rectangle.y + rectangle.height) > - ((gint) (vadj->value +vadj->page_size))) { - new_value = (offset + rectangle.y) - vadj->page_size * 0.25; - if (new_value > vadj->upper - vadj->page_size) - new_value = vadj->upper - vadj->page_size; - } else if ((offset + rectangle.y) < ((gint) vadj->value)) { - new_value = (offset + rectangle.y - vadj->page_size * 0.75); - if (((gint) (new_value + vadj->page_size)) < (offset + rectangle.y + rectangle.height)) - new_value = offset + rectangle.y + rectangle.height - (gint) vadj->page_size; - if (new_value < 0.0) - new_value = 0.0; - if (new_value > vadj->value) - new_value = vadj->value; - } - - if (vadj->value != new_value) { - g_signal_emit_by_name (GTK_TEXT_VIEW(priv->msg_body)->layout, - "invalidated"); - vadj->value = new_value; - gtk_adjustment_value_changed (vadj); - /* invalidate body */ - window = gtk_widget_get_parent_window (priv->msg_body); - if (window) - gdk_window_invalidate_rect (window, NULL, TRUE); - } + new_value = (offset + rectangle.y); + hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->pannable), -1, new_value); } static void @@ -627,20 +574,6 @@ copy_clipboard_check (GtkTextView *text_view, } } -static void -vadj_changed (GtkAdjustment *adj, - ModestMsgEditWindow *window) -{ - ModestMsgEditWindowPrivate *priv; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - - if (priv->last_upper != adj->upper) { - priv->last_upper = adj->upper; - correct_scroll (window); - } -} - static void attachment_deleted (ModestAttachmentsView *attachments_view, gpointer user_data) @@ -666,9 +599,6 @@ connect_signals (ModestMsgEditWindow *obj) G_CALLBACK (body_changed), obj); g_signal_connect (G_OBJECT (priv->text_buffer), "modified-changed", G_CALLBACK (body_changed), obj); - g_signal_connect (G_OBJECT (obj), "window-state-event", - G_CALLBACK (modest_msg_edit_window_window_state_event), - NULL); g_signal_connect (G_OBJECT (priv->text_buffer), "end-user-action", G_CALLBACK (text_buffer_end_user_action), obj); g_signal_connect (G_OBJECT (priv->text_buffer), "mark-set", @@ -703,11 +633,6 @@ connect_signals (ModestMsgEditWindow *obj) g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj); g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj); - g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))), - "changed", - G_CALLBACK (vadj_changed), - obj); - priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj); @@ -721,6 +646,17 @@ connect_signals (ModestMsgEditWindow *obj) } static void +init_wp_text_view_style () +{ + static gboolean initialized = FALSE; + + if (!initialized) { + gtk_rc_parse_string ("class \"WPTextView\" style \"fremantle-textview\""); + initialized = TRUE; + } +} + +static void init_window (ModestMsgEditWindow *obj) { GtkWidget *to_caption, *subject_caption; @@ -731,7 +667,8 @@ init_window (ModestMsgEditWindow *obj) GdkPixbuf *window_icon = NULL; GError *error = NULL; - GtkSizeGroup *size_group; + GtkSizeGroup *title_size_group; + GtkSizeGroup *value_size_group; GtkWidget *subject_box; GtkWidget *attachment_icon; GtkWidget *window_box; @@ -790,17 +727,17 @@ init_window (ModestMsgEditWindow *obj) parent_priv->menubar = NULL; - size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + value_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); /* Note: This ModestPairList* must exist for as long as the picker * that uses it, because the ModestSelectorPicker uses the ID opaquely, * so it can't know how to manage its memory. */ priv->from_field = modest_selector_picker_new (MODEST_EDITABLE_SIZE, - MODEST_EDITABLE_ARRANGEMENT, + HILDON_BUTTON_ARRANGEMENT_HORIZONTAL, NULL, g_str_equal); - hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 0.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), 0.0, 0.5); + modest_maemo_utils_set_hbutton_layout (title_size_group, value_size_group, + _("mail_va_from"), priv->from_field); priv->to_field = modest_recpt_editor_new (); priv->cc_field = modest_recpt_editor_new (); @@ -819,29 +756,37 @@ init_window (ModestMsgEditWindow *obj) gtk_button_set_relief (GTK_BUTTON (priv->add_attachment_button), GTK_RELIEF_NONE); gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE); gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 0.5); - attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, GTK_ICON_SIZE_BUTTON); + attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER); gtk_container_add (GTK_CONTAINER (priv->add_attachment_button), attachment_icon); gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0); priv->attachments_view = modest_attachments_view_new (NULL); priv->header_box = gtk_vbox_new (FALSE, 0); - hildon_button_add_title_size_group (HILDON_BUTTON (priv->from_field), size_group); - to_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_to"), priv->to_field); - priv->cc_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_cc"), priv->cc_field); - priv->bcc_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_hotfix1"), priv->bcc_field); - subject_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_subject"), subject_box); - priv->attachments_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_attachment"), priv->attachments_view); - g_object_unref (size_group); - - size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - hildon_button_add_value_size_group (HILDON_BUTTON (priv->from_field), size_group); - modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), size_group); - modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), size_group); - modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), size_group); - gtk_size_group_add_widget (size_group, priv->subject_field); - gtk_size_group_add_widget (size_group, priv->attachments_view); - g_object_unref (size_group); + to_caption = modest_maemo_utils_create_captioned_with_size_type + (title_size_group, value_size_group, + _("mail_va_to"), priv->to_field, + HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + priv->cc_caption = modest_maemo_utils_create_captioned_with_size_type + (title_size_group, value_size_group, + _("mail_va_cc"), priv->cc_field, + HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + priv->bcc_caption = modest_maemo_utils_create_captioned_with_size_type + (title_size_group, value_size_group, + _("mail_va_hotfix1"), priv->bcc_field, + HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, + _("mail_va_subject"), subject_box); + priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, + _("mail_va_attachment"), + 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); */ + 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); gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0); @@ -851,8 +796,11 @@ init_window (ModestMsgEditWindow *obj) gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0); gtk_widget_set_no_show_all (priv->attachments_caption, TRUE); + init_wp_text_view_style (); priv->msg_body = wp_text_view_new (); + + gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->msg_body), GTK_WRAP_WORD_CHAR); priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); g_object_set (priv->text_buffer, "font_scale", DEFAULT_FONT_SCALE, NULL); @@ -871,25 +819,21 @@ init_window (ModestMsgEditWindow *obj) /* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */ - priv->scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SHADOW_NONE); - modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->scroll), TRUE); - + priv->pannable = hildon_pannable_area_new (); + main_vbox = gtk_vbox_new (FALSE, DEFAULT_MAIN_VBOX_SPACING); gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0); priv->frame = gtk_frame_new (NULL); gtk_box_pack_start (GTK_BOX(main_vbox), priv->frame, TRUE, TRUE, 0); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->scroll), main_vbox); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))); - gtk_widget_show_all (GTK_WIDGET(priv->scroll)); + hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), main_vbox); + gtk_widget_show_all (GTK_WIDGET(priv->pannable)); window_box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER(obj), window_box); - gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (priv->frame), priv->msg_body); @@ -1008,6 +952,8 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_s readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128); size += readed; if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &error)) { + if (error) + g_error_free (error); break; } } @@ -1156,15 +1102,19 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) gchar *to, *cc, *bcc, *subject; gchar *body; ModestMsgEditWindowPrivate *priv; + ModestWindowPrivate *parent_priv; GtkTextIter iter; TnyHeaderFlags priority_flags; TnyFolder *msg_folder; gboolean is_html = FALSE; + GtkAction *action; + gboolean field_view_set; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); g_return_if_fail (TNY_IS_MSG (msg)); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + parent_priv = MODEST_WINDOW_GET_PRIVATE (self); header = tny_msg_get_header (msg); to = tny_header_dup_to (header); @@ -1175,6 +1125,9 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) if (to) modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to); + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu"); + field_view_set = TRUE; if (cc) { modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), cc); gtk_widget_set_no_show_all (priv->cc_caption, FALSE); @@ -1182,7 +1135,13 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) { gtk_widget_set_no_show_all (priv->cc_caption, TRUE); gtk_widget_hide (priv->cc_caption); + field_view_set = FALSE; } + if (action) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), field_view_set); + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu"); + field_view_set = TRUE; if (bcc) { modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc); gtk_widget_set_no_show_all (priv->bcc_caption, FALSE); @@ -1190,7 +1149,12 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) { gtk_widget_set_no_show_all (priv->bcc_caption, TRUE); gtk_widget_hide (priv->bcc_caption); - } + field_view_set = FALSE; + } + if (action) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), field_view_set); + + if (subject) gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject); modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self), @@ -1347,14 +1311,14 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder)); /* font color */ - tool_item = GTK_WIDGET (gtk_tool_item_new ()); + priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ()); priv->font_color_button = hildon_color_button_new (); GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS); - gtk_container_add (GTK_CONTAINER (tool_item), priv->font_color_button); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); + gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->font_color_toolitem), insert_index); g_signal_connect_swapped (G_OBJECT (priv->font_color_button), "notify::color", G_CALLBACK (modest_msg_edit_window_color_button_change), @@ -1528,7 +1492,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre modest_msg_edit_window_toolbar_dimming_entries, G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries), MODEST_WINDOW (obj)); - modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_button, + modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_toolitem, G_CALLBACK (modest_ui_dimming_rules_on_set_style), MODEST_WINDOW (obj)); modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_size_toolitem, @@ -1537,10 +1501,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre 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_rules (clipboard_rules_group, - modest_msg_edit_window_clipboard_dimming_entries, - G_N_ELEMENTS (modest_msg_edit_window_clipboard_dimming_entries), - MODEST_WINDOW (obj)); /* Insert dimming rules group for this window */ modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); @@ -1902,6 +1862,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self, text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), self); + g_free (buffer_format); g_free (current_format); /* Check dimming rules */ @@ -1923,11 +1884,11 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) { - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu"); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"); if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE); } else { - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatPlainTextMenu"); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatPlainTextMenu"); if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE); } @@ -2247,6 +2208,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer)); gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark); wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf); + g_object_unref (pixbuf); } tny_list_prepend (priv->images, (GObject *) mime_part); @@ -2476,7 +2438,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, g_object_unref (att_list); return; } - hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment")); + hildon_banner_show_information (NULL, NULL, _("mcen_me_inbox_remove_attachments")); for (iter = tny_list_create_iterator (att_list); !tny_iterator_is_done (iter); @@ -2599,31 +2561,6 @@ modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item, } } -static gboolean -modest_msg_edit_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata) -{ - if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) { - ModestWindowPrivate *parent_priv; - ModestWindowMgr *mgr; - gboolean is_fullscreen; - GtkAction *fs_toggle_action; - gboolean active; - - mgr = modest_runtime_get_window_mgr (); - is_fullscreen = (modest_window_mgr_get_fullscreen_mode (mgr))?1:0; - - parent_priv = MODEST_WINDOW_GET_PRIVATE (widget); - - fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu"); - active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0; - if (is_fullscreen != active) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen); - } - - return FALSE; - -} - void modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, gboolean show) @@ -2724,9 +2661,7 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self, gboolean show_toolbar) { ModestWindowPrivate *parent_priv; - const gchar *action_name; - GtkAction *action; - + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self)); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); @@ -2737,21 +2672,6 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self, gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); else gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); - - /* Update also the actions (to update the toggles in the - menus), we have to do it manually because some other window - of the same time could have changed it (remember that the - toolbar fullscreen mode is shared by all the windows of the - same type */ - if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ())) - action_name = "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarFullScreenMenu"; - else - action_name = "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarNormalScreenMenu"; - - action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name); - modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), - show_toolbar); - } void @@ -2773,20 +2693,24 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window, switch (priority_flags) { case TNY_HEADER_FLAG_HIGH_PRIORITY: - gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_high", GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), + MODEST_HEADER_ICON_HIGH, + HILDON_ICON_SIZE_XSMALL); gtk_widget_show (priv->priority_icon); - priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, + priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityHighMenu"); break; case TNY_HEADER_FLAG_LOW_PRIORITY: - gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_low", GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), + MODEST_HEADER_ICON_LOW, + HILDON_ICON_SIZE_XSMALL); gtk_widget_show (priv->priority_icon); - priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, + priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityLowMenu"); break; default: gtk_widget_hide (priv->priority_icon); - priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, + priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityNormalMenu"); break; } @@ -2827,7 +2751,7 @@ 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); } else { - GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu")); + 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); } } @@ -3553,8 +3477,12 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, priv->msg_uid = NULL; } priv->msg_uid = modest_tny_folder_get_header_unique_id (header); - if (GTK_WIDGET_REALIZED (window)) - modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL); + if (GTK_WIDGET_REALIZED (window)) { + if (!modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL)) { + gtk_widget_destroy (GTK_WIDGET (window)); + return; + } + } } priv->draft_msg = draft; @@ -3569,7 +3497,7 @@ text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (userdata); gchar *tag_name; - if (tag == NULL+13) return; + if (tag == NULL) return; g_object_get (G_OBJECT (tag), "name", &tag_name, NULL); if ((tag_name != NULL) && (g_str_has_prefix (tag_name, "image-tag-replace-"))) { replace_with_images (window, priv->images);