From c44bf812efe9b23a25e0cdfbe8d558ba863cea15 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Dapena=20Paz?= <jdapena@igalia.com>
Date: Tue, 16 Feb 2010 18:42:39 +0100
Subject: [PATCH] Reorganize the editor menu following new specs:    * Remove
 undo in menu but keep accelerator    * Remove find in
 editor    * Restructure menu to reduce times the buttons
 change the order      they're shown.

Fix 1/2 for NB#156612
---
 src/widgets/modest-msg-edit-window.c |   43 ++++++++++++++++------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index 984f160..ea6db37 100644
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -4682,16 +4682,6 @@ 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"), "<Ctrl>z",
-				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo),
-				   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
-
 	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,
@@ -4711,6 +4701,22 @@ setup_menu (ModestMsgEditWindow *self)
 	g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
 			  G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
 
+	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));
@@ -4720,23 +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"), "<Ctrl>f",
 				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
 				   NULL);
 
-	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);
-
 }
 
 static void
-- 
1.7.9.5