Add accelerators for "Find Now" and "Clear".

* e-search-bar.c (update_bonobo_menus): Add accelerators for "Find
Now" and "Clear".

* e-filter-bar.h: Change search labels as suggested in Anna's
redesign [#16246].

* folder-browser.c: Reorder folder_browser_search_menu_items
according to #16246.

svn path=/trunk/; revision=16219

6 files changed, 28 insertions, 12 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index f1ad4ad158..c52dd827a9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
+
+	* folder-browser.c: Reorder folder_browser_search_menu_items
+	according to #16246.
+
 2002-03-19  Larry Ewing  <lewing@ximian.com>
 
 	* mail-display.c: add missing NULL closure data to popup menu
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 140bcb376d..24f3b12a8c 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1075,10 +1075,13 @@ enum {
 };
 
 static ESearchBarItem folder_browser_search_menu_items[] = {
+	E_FILTERBAR_ADVANCED,
+	{ NULL, 0, NULL },
 	E_FILTERBAR_SAVE,
-	{ N_("Create vFolder from Search"),  ESB_SAVE, NULL  },
 	E_FILTERBAR_EDIT,
-	{ NULL,                           -1, NULL           }
+	{ NULL, 0, NULL },
+	{ N_("Create _Virtual Folder From Search..."), ESB_SAVE, NULL  },
+	{ NULL, -1, NULL }
 };
 
 static void
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 06b2bfaf4a..b32b6ad837 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,5 +1,13 @@
 2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
 
+	* e-search-bar.c (update_bonobo_menus): Add accelerators for "Find
+	Now" and "Clear".
+
+	* e-filter-bar.h: Change search labels as suggested in Anna's
+	redesign [#16246].
+
+2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
+
 	* e-search-bar.c (update_bonobo_menus): Remove all the SearchBar
 	items before setting them up again.
 	(free_menu_items): New.
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index d0a81d3b55..f6d644ba3f 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -88,14 +88,14 @@ enum {
 	E_FILTERBAR_ADVANCED_ID = -4,
 };
 
-#define E_FILTERBAR_SAVE { N_("Add to Saved Searches"), E_FILTERBAR_SAVE_ID, NULL }
-#define E_FILTERBAR_EDIT { N_("Edit..."), E_FILTERBAR_EDIT_ID, NULL }
-#define E_FILTERBAR_ADVANCED { N_("Advanced..."), E_FILTERBAR_ADVANCED_ID, NULL }
+#define E_FILTERBAR_SAVE { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, NULL }
+#define E_FILTERBAR_EDIT { N_("_Edit Saved Searches..."), E_FILTERBAR_EDIT_ID, NULL }
+#define E_FILTERBAR_ADVANCED { N_("_Advanced Search..."), E_FILTERBAR_ADVANCED_ID, NULL }
 
 #ifdef JUST_FOR_TRANSLATORS
 const char * strings[] = {
-	N_("Save As..."),
-	N_("Edit..."),
+	N_("_Save Search..."),
+	N_("_Edit Saved Searches..."),
 	N_("Advanced...")
 };
 #endif
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 901b08a8a1..f0b667d6b1 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -474,8 +474,8 @@ update_bonobo_menus (ESearchBar *esb)
 
 	xml = g_string_new ("<placeholder name=\"SearchBar\">");
 
-	append_xml_menu_item (xml, "FindNow", _("Find Now"), "ESearchBar:FindNow", NULL);
-	append_xml_menu_item (xml, "Clear", _("Clear"), "ESearchBar:Clear", "*Control**Shift*b");
+	append_xml_menu_item (xml, "FindNow", _("_Find Now"), "ESearchBar:FindNow", NULL);
+	append_xml_menu_item (xml, "Clear", _("_Clear"), "ESearchBar:Clear", "*Control**Shift*b");
 
 	for (p = esb->menu_items; p != NULL; p = p->next) {
 		const ESearchBarItem *item;
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index a20f8c4d6a..f50f487b8d 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -40,9 +40,9 @@ extern "C" {
  * text          string         RW              Text in the entry box.
  */
 
-#define E_SEARCH_BAR_TYPE			(e_search_bar_get_type ())
-#define E_SEARCH_BAR(obj)			(GTK_CHECK_CAST ((obj), E_SEARCH_BAR_TYPE, ESearchBar))
-#define E_SEARCH_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SEARCH_BAR_TYPE, ESearchBarClass))
+#define E_SEARCH_BAR_TYPE		(e_search_bar_get_type ())
+#define E_SEARCH_BAR(obj)		(GTK_CHECK_CAST ((obj), E_SEARCH_BAR_TYPE, ESearchBar))
+#define E_SEARCH_BAR_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_SEARCH_BAR_TYPE, ESearchBarClass))
 #define E_IS_SEARCH_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_SEARCH_BAR_TYPE))
 #define E_IS_SEARCH_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SEARCH_BAR_TYPE))