X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=9d5d00f7d674f1c23ece9929a3cc37f1bec642c2;hp=1a7816b3c09153d8c12bd3fb7228dbb8e89c2adb;hb=50b51970503ea36ea4d74e3c83c2748ba9de7f11;hpb=4b690d574fc0ee33ee4204fc9dd07af280aaae4e diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 1a7816b..9d5d00f 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" @@ -156,10 +156,6 @@ static void on_account_removed (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data); -static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); -static void set_zoom_do_nothing (ModestWindow *window, gdouble zoom); -static gdouble get_zoom_do_nothing (ModestWindow *window); - static void init_window (ModestMsgEditWindow *obj); gboolean scroll_drag_timeout (gpointer userdata); @@ -171,8 +167,9 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, ModestMsgEditWindow *userdata); -static void vadj_changed (GtkAdjustment *adj, - ModestMsgEditWindow *window); +static void on_message_settings (GtkAction *action, + ModestMsgEditWindow *window); +static void setup_menu (ModestMsgEditWindow *self); static void DEBUG_BUFFER (WPTextBuffer *buffer) { @@ -213,6 +210,10 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer) #endif } +static const GtkActionEntry hildon2_msg_edit_action_entries [] = { + { "MessageSettings", NULL, N_("mcen_me_message_settings"), NULL, NULL, G_CALLBACK (on_message_settings)}, +}; + /* static gboolean */ /* on_key_pressed (GtkWidget *self, */ @@ -254,17 +255,19 @@ 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; GtkWidget *size_tool_button_label; - + GtkWidget *find_toolbar; gchar *last_search; GtkWidget *font_dialog; - GtkWidget *scroll; + GtkWidget *pannable; + guint correct_scroll_idle; guint scroll_drag_timeout_id; gdouble last_upper; @@ -275,7 +278,7 @@ struct _ModestMsgEditWindowPrivate { gint images_count; TnyHeaderFlags priority_flags; - + gboolean can_undo, can_redo; gulong clipboard_change_handler_id; gulong default_clipboard_change_handler_id; @@ -288,6 +291,10 @@ struct _ModestMsgEditWindowPrivate { gchar *msg_uid; gboolean sent; + + GtkWidget *app_menu; + GtkWidget *cc_button; + GtkWidget *bcc_button; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -316,7 +323,7 @@ modest_msg_edit_window_get_type (void) (GInstanceInitFunc) modest_msg_edit_window_init, NULL }; - my_type = g_type_register_static (MODEST_TYPE_WINDOW, + my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW, "ModestMsgEditWindow", &my_info, 0); @@ -364,10 +371,6 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_msg_edit_window_finalize; - modest_window_class->set_zoom_func = set_zoom_do_nothing; - modest_window_class->get_zoom_func = get_zoom_do_nothing; - modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented; - modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented; modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar; modest_window_class->save_state_func = save_state; modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals; @@ -417,12 +420,11 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->sent = FALSE; priv->scroll_drag_timeout_id = 0; + priv->correct_scroll_idle = 0; priv->last_upper = 0.0; priv->font_dialog = NULL; - - modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), - GTK_WINDOW(obj),"applications_email_editor"); + priv->app_menu = NULL; if (!is_wp_text_buffer_started) { is_wp_text_buffer_started = TRUE; @@ -493,58 +495,49 @@ scroll_drag_timeout (gpointer userdata) return FALSE; } -static void -correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused) +static gboolean +correct_scroll_without_drag_check_idle (gpointer userdata) { + ModestMsgEditWindow *w = (ModestMsgEditWindow *) userdata; ModestMsgEditWindowPrivate *priv; - GtkTextMark *insert; GtkTextIter iter; GdkRectangle rectangle; - GtkAdjustment *vadj; gdouble new_value; gint offset; - GdkWindow *window; + GtkTextMark *insert; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); - - if (only_if_focused && !gtk_widget_is_focus (priv->msg_body)) - return; - + insert = gtk_text_buffer_get_insert (priv->text_buffer); 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); + + priv->correct_scroll_idle = 0; + return FALSE; +} + +static void +correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); + + if (only_if_focused && !gtk_widget_is_focus (priv->msg_body)) + return; + + if (priv->correct_scroll_idle > 0) { + return; } + priv->correct_scroll_idle = g_idle_add ((GSourceFunc) correct_scroll_without_drag_check_idle, + (gpointer) w); } static void @@ -606,20 +599,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) @@ -676,14 +655,9 @@ connect_signals (ModestMsgEditWindow *obj) g_signal_connect_after (G_OBJECT (priv->subject_field), "move-cursor", G_CALLBACK (subject_field_move_cursor), obj); g_signal_connect (G_OBJECT (priv->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), 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); - + g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), 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); @@ -697,6 +671,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; @@ -728,6 +713,10 @@ init_window (ModestMsgEditWindow *obj) modest_msg_edit_action_entries, G_N_ELEMENTS (modest_msg_edit_action_entries), obj); + gtk_action_group_add_actions (action_group, + hildon2_msg_edit_action_entries, + G_N_ELEMENTS (hildon2_msg_edit_action_entries), + obj); gtk_action_group_add_toggle_actions (action_group, modest_msg_edit_toggle_action_entries, G_N_ELEMENTS (modest_msg_edit_toggle_action_entries), @@ -796,24 +785,33 @@ 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); - to_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, - _("mail_va_to"), priv->to_field); - priv->cc_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, - _("mail_va_cc"), priv->cc_field); - priv->bcc_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, - _("mail_va_hotfix1"), priv->bcc_field); + to_caption = modest_maemo_utils_create_captioned_with_size_type + (title_size_group, value_size_group, + _("mail_va_to"), FALSE, 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"), FALSE, 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"), FALSE, 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 (title_size_group, value_size_group, - _("mail_va_attachment"), - priv->attachments_view); + _("mail_va_subject"), FALSE, subject_box); + priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, + _("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); */ @@ -828,8 +826,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); @@ -848,25 +849,23 @@ 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_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), + hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable))); + 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); @@ -937,6 +936,10 @@ modest_msg_edit_window_finalize (GObject *obj) g_object_unref (priv->outbox_msg); priv->outbox_msg = NULL; } + if (priv->correct_scroll_idle > 0) { + g_source_remove (priv->correct_scroll_idle); + priv->correct_scroll_idle = 0; + } if (priv->scroll_drag_timeout_id > 0) { g_source_remove (priv->scroll_drag_timeout_id); priv->scroll_drag_timeout_id = 0; @@ -1135,15 +1138,18 @@ 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; + 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); @@ -1154,6 +1160,8 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) if (to) modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to); + + 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); @@ -1161,7 +1169,11 @@ 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; } + hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), field_view_set); + + 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); @@ -1169,7 +1181,11 @@ 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; + } + hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), 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), @@ -1326,14 +1342,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_toolitem, 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), @@ -1456,7 +1472,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre GObject *obj; ModestWindowPrivate *parent_priv; ModestMsgEditWindowPrivate *priv; - ModestDimmingRulesGroup *menu_rules_group = NULL; ModestDimmingRulesGroup *toolbar_rules_group = NULL; ModestDimmingRulesGroup *clipboard_rules_group = NULL; ModestWindowMgr *mgr = NULL; @@ -1472,8 +1487,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); /* Menubar. Update the state of some toggles */ - parent_priv->menubar = modest_maemo_utils_get_manager_menubar_as_menu (parent_priv->ui_manager, "/MenuBar"); - hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar)); priv->from_field_protos = get_transports (); modest_selector_picker_set_pair_list (MODEST_SELECTOR_PICKER (priv->from_field), priv->from_field_protos); modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name); @@ -1494,20 +1507,14 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre priv->original_account_name = (account_name) ? g_strdup (account_name) : NULL; - parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new (); - menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE); clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE); /* Add common dimming rules */ - modest_dimming_rules_group_add_rules (menu_rules_group, - modest_msg_edit_window_menu_dimming_entries, - G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries), - MODEST_WINDOW (obj)); modest_dimming_rules_group_add_rules (toolbar_rules_group, 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, @@ -1517,11 +1524,13 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre G_CALLBACK (modest_ui_dimming_rules_on_set_style), 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); modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group); + + /* Setup app menu */ + setup_menu (MODEST_MSG_EDIT_WINDOW (obj)); + /* Checks the dimming rules */ - g_object_unref (menu_rules_group); g_object_unref (toolbar_rules_group); g_object_unref (clipboard_rules_group); set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich); @@ -2192,31 +2201,32 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) mime_part = tny_platform_factory_new_mime_part (modest_runtime_get_platform_factory ()); - + TnyStream *stream = create_stream_for_uri (uri); if (stream == NULL) { - modest_platform_information_banner (NULL, NULL, dgettext("hildon-fm", "sfil_ib_opening_not_allowed")); - + modest_platform_information_banner (NULL, NULL, + _FM("sfil_ib_opening_not_allowed")); + g_object_unref (mime_part); gnome_vfs_file_info_unref (info); continue; } tny_mime_part_construct (mime_part, stream, mime_type, "base64"); - + content_id = g_strdup_printf ("%d", priv->next_cid); tny_mime_part_set_content_id (mime_part, content_id); g_free (content_id); priv->next_cid++; - + basename = g_path_get_basename (filename); tny_mime_part_set_filename (mime_part, basename); g_free (basename); pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size); - + if (pixbuf != NULL) { priv->images_size += stream_size; priv->images_count ++; @@ -2238,66 +2248,80 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) } -void -modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) -{ - GtkWidget *dialog = NULL; - gint response = 0; +static void +on_attach_file_response (GtkDialog *dialog, + gint arg1, + gpointer user_data) +{ GSList *uris = NULL; GSList *uri_node; GnomeVFSFileSize total_size, allowed_size; + ModestMsgEditWindow *window; ModestMsgEditWindowPrivate *priv; gint att_num; guint64 att_size; - g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window)); - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - - if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) - return; - - 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")); - gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (window)); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - switch (response) { + switch (arg1) { case GTK_RESPONSE_OK: uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog)); break; default: break; } - gtk_widget_destroy (dialog); + + window = MODEST_MSG_EDIT_WINDOW (user_data); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); /* allowed size is the maximum size - what's already there */ - modest_attachments_view_get_sizes ( - MODEST_ATTACHMENTS_VIEW (priv->attachments_view), - &att_num, &att_size); + modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), + &att_num, &att_size); allowed_size = MODEST_MAX_ATTACHMENT_SIZE - att_size; total_size = 0; for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) { const gchar *uri = (const gchar *) uri_node->data; - - total_size += modest_msg_edit_window_attach_file_one - (window, uri, allowed_size); - + + total_size += + modest_msg_edit_window_attach_file_one (window, uri, allowed_size); + if (total_size > allowed_size) { g_warning ("%s: total size: %u", __FUNCTION__, (unsigned int)total_size); break; } - allowed_size -= total_size; - - } g_slist_foreach (uris, (GFunc) g_free, NULL); g_slist_free (uris); + + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +void +modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) +{ + GtkWidget *dialog = NULL; + ModestMsgEditWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window)); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) + return; + + 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")); + gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), GTK_WINDOW (window)); + + /* Connect to response & show */ + g_signal_connect (dialog, "response", + G_CALLBACK (on_attach_file_response), window); + gtk_widget_show (dialog); } @@ -2313,9 +2337,9 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, GnomeVFSFileSize size = 0; g_return_val_if_fail (window, 0); g_return_val_if_fail (uri, 0); - + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); if (result == GNOME_VFS_OK) { TnyMimePart *mime_part; @@ -2354,7 +2378,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, size = info->size; if (size > allowed_size) { modest_platform_information_banner (NULL, NULL, - dgettext("hildon-fm", "sfil_ib_opening_not_allowed")); + _FM("sfil_ib_opening_not_allowed")); return 0; } } else @@ -2364,7 +2388,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, if (stream == NULL) { - modest_platform_information_banner (NULL, NULL, dgettext("hildon-fm", "sfil_ib_opening_not_allowed")); + modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); g_object_unref (mime_part); gnome_vfs_file_info_unref (info); @@ -2442,19 +2466,20 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, } else { filename = g_strdup (""); } - message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments", + message = g_strdup_printf (ngettext("emev_nc_delete_attachment", + "emev_nc_delete_attachments", tny_list_get_length (att_list)), filename); g_free (filename); - dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), message); + dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), + message); g_free (message); if (dialog_response != GTK_RESPONSE_OK) { g_object_unref (att_list); return; } - hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment")); - + for (iter = tny_list_create_iterator (att_list); !tny_iterator_is_done (iter); tny_iterator_next (iter)) { @@ -2708,20 +2733,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), MODEST_HEADER_ICON_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), "MODEST_HEADER_ICON_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; } @@ -3284,10 +3313,8 @@ subject_field_insert_text (GtkEditable *editable, if (result_len + old_length > 1000) { hildon_banner_show_information (GTK_WIDGET (window), NULL, - dgettext("hildon-common-strings", - "ckdg_ib_maximum_characters_reached")); + _CS("ckdg_ib_maximum_characters_reached")); } - g_string_free (result, TRUE); } @@ -3309,7 +3336,6 @@ modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, gtk_widget_hide_all (priv->find_toolbar); gtk_widget_grab_focus (priv->msg_body); } - } static gboolean @@ -3393,7 +3419,7 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, g_free (priv->last_search); priv->last_search = NULL; /* Information banner about empty search */ - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text")); + hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text")); return; } @@ -3409,14 +3435,14 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete")); + hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_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) - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches")); + hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches")); } /* Mark as selected the string found in search */ @@ -3431,18 +3457,6 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, g_free (current_search); } -static void -modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, - ModestMsgEditWindow *window) -{ - GtkToggleAction *toggle; - ModestWindowPrivate *parent_priv; - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - - toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu")); - gtk_toggle_action_set_active (toggle, FALSE); -} - gboolean modest_msg_edit_window_get_sent (ModestMsgEditWindow *window) { @@ -3462,8 +3476,14 @@ modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, priv->sent = sent; } +static void +modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, + ModestMsgEditWindow *window) +{ + modest_msg_edit_window_toggle_find_toolbar (window, FALSE); +} -void +void modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, TnyMsg *draft) { @@ -3603,25 +3623,277 @@ on_account_removed (TnyAccountStore *account_store, } } -static gboolean -on_zoom_minus_plus_not_implemented (ModestWindow *window) +typedef struct _MessageSettingsHelper { + ModestMsgEditWindow *window; + GSList *priority_group; + GSList *format_group; +} MessageSettingsHelper; + +static void +on_priority_toggle (GtkToggleButton *button, + MessageSettingsHelper *helper) { - g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); + GSList *node; + ModestMsgEditWindowPrivate *priv; - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); - return FALSE; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window); + if (gtk_toggle_button_get_active (button)) { + + for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) { + GtkToggleButton *node_button = (GtkToggleButton *) node->data; + if ((node_button != button) && + gtk_toggle_button_get_active (node_button)) { + gtk_toggle_button_set_active (node_button, FALSE); + } + } + if (priv->priority_flags != (TnyHeaderFlags) g_object_get_data (G_OBJECT (button), "priority")) + modest_msg_edit_window_set_priority_flags (helper->window, + (TnyHeaderFlags) + g_object_get_data (G_OBJECT (button), + "priority")); + + } else { + gboolean found = FALSE; + /* If no one is active, activate it again */ + for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) { + GtkToggleButton *node_button = (GtkToggleButton *) node->data; + if (gtk_toggle_button_get_active (node_button)) { + found = TRUE; + break; + } + } + if (!found) { + gtk_toggle_button_set_active (button, TRUE); + } + } +} + +static void +on_format_toggle (GtkToggleButton *button, + MessageSettingsHelper *helper) +{ + GSList *node; + ModestMsgEditWindowPrivate *priv; + ModestMsgEditFormat old_format; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window); + old_format = modest_msg_edit_window_get_format (helper->window); + if (gtk_toggle_button_get_active (button)) { + + for (node = helper->format_group; node != NULL; node = g_slist_next (node)) { + GtkToggleButton *node_button = (GtkToggleButton *) node->data; + if ((node_button != button) && + gtk_toggle_button_get_active (node_button)) { + gtk_toggle_button_set_active (node_button, FALSE); + } + } + if (old_format != (ModestMsgEditFormat) g_object_get_data (G_OBJECT (button), "format")) { + modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (helper->window), + GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "file-format"))); + } + + } else { + gboolean found = FALSE; + /* If no one is active, activate it again */ + for (node = helper->format_group; node != NULL; node = g_slist_next (node)) { + GtkToggleButton *node_button = (GtkToggleButton *) node->data; + if (gtk_toggle_button_get_active (node_button)) { + found = TRUE; + break; + } + } + if (!found) { + gtk_toggle_button_set_active (button, TRUE); + } + } } static void -set_zoom_do_nothing (ModestWindow *window, - gdouble zoom) +modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) { + GtkWidget *dialog; + GtkWidget *vbox; + GtkWidget *priority_hbox; + GtkWidget *high_toggle, *medium_toggle, *low_toggle; + GtkWidget *captioned; + GtkSizeGroup *title_sizegroup, *value_sizegroup; + GtkWidget *format_hbox; + GtkWidget *html_toggle, *text_toggle; + ModestMsgEditWindowPrivate *priv; + MessageSettingsHelper helper = {0,}; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + helper.window = window; + helper.priority_group = NULL; + + title_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + value_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + 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); + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_widget_show (vbox); + + /* Priority toggles */ + priority_hbox = gtk_hbox_new (TRUE, 0); + high_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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)); + medium_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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)); + low_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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)); + gtk_box_pack_start (GTK_BOX (priority_hbox), low_toggle, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (priority_hbox), medium_toggle, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (priority_hbox), high_toggle, TRUE, TRUE, 0); + gtk_widget_show_all (priority_hbox); + captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, + _("mcen_me_editor_message_priority"), FALSE, priority_hbox); + gtk_widget_show (captioned); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); + + /* format toggles */ + format_hbox = gtk_hbox_new (TRUE, 0); + html_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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)); + text_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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)); + g_object_set_data (G_OBJECT (text_toggle), "file-format", GINT_TO_POINTER (MODEST_FILE_FORMAT_PLAIN_TEXT)); + gtk_box_pack_start (GTK_BOX (format_hbox), html_toggle, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (format_hbox), text_toggle, TRUE, TRUE, 0); + gtk_widget_show_all (format_hbox); + captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, + _("mcen_me_editor_format"), FALSE, format_hbox); + gtk_widget_show (captioned); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); + + + g_object_unref (title_sizegroup); + g_object_unref (value_sizegroup); + + /* Set current values */ + switch (priv->priority_flags) { + case TNY_HEADER_FLAG_HIGH_PRIORITY: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (high_toggle), TRUE); + break; + case TNY_HEADER_FLAG_LOW_PRIORITY: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (low_toggle), TRUE); + break; + default: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (medium_toggle), TRUE); + break; + } + + switch (modest_msg_edit_window_get_format (window)) { + case MODEST_MSG_EDIT_FORMAT_TEXT: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (text_toggle), TRUE); + break; + case MODEST_MSG_EDIT_FORMAT_HTML: + default: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (html_toggle), TRUE); + break; + } + + /* Signal connects */ + g_signal_connect (G_OBJECT (high_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper); + g_signal_connect (G_OBJECT (medium_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper); + g_signal_connect (G_OBJECT (low_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper); + 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); + + /* Show */ + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + g_slist_free (helper.priority_group); +} + +static void +on_message_settings (GtkAction *action, + ModestMsgEditWindow *window) +{ + modest_msg_edit_window_show_msg_settings_dialog (window); +} + +static void +on_cc_button_toggled (HildonCheckButton *button, + ModestMsgEditWindow *window) +{ + g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); + + modest_msg_edit_window_show_cc (MODEST_MSG_EDIT_WINDOW (window), + hildon_check_button_get_active (button)); +} + +static void +on_bcc_button_toggled (HildonCheckButton *button, + ModestMsgEditWindow *window) +{ + g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); + + modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window), + hildon_check_button_get_active (button)); } -static gdouble -get_zoom_do_nothing (ModestWindow *window) +static void +setup_menu (ModestMsgEditWindow *self) { - return 1.0; + ModestMsgEditWindowPrivate *priv = NULL; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self)); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); + + /* Settings menu buttons */ + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_checknames"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_check_names), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "z", + APP_MENU_CALLBACK (modest_ui_actions_on_undo), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo)); + + 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); + modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->cc_button), + NULL); + g_signal_connect (G_OBJECT (priv->cc_button), "toggled", + G_CALLBACK (on_cc_button_toggled), (gpointer) self); + priv->bcc_button = hildon_check_button_new (0); + gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc")); + hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), + FALSE); + modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->bcc_button), + NULL); + g_signal_connect (G_OBJECT (priv->bcc_button), "toggled", + G_CALLBACK (on_bcc_button_toggled), (gpointer) 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_inbox_remove_attachments"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL, + APP_MENU_CALLBACK (on_message_settings), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "f", + APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page), + NULL); }