diff options
| -rw-r--r-- | widgets/misc/ChangeLog | 8 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 4 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.h | 9 |
3 files changed, 15 insertions, 6 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 2fd2e399c0..f005836c2b 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,5 +1,13 @@ 2002-05-20 Ettore Perazzoli <ettore@ximian.com> + * e-filter-bar.c (build_items): Prepend the advanced menu with a + separator. + + * e-filter-bar.h: Add E_FILTERBAR_SEPARATOR. Rename the "Advanced + Search..." menu item into "Advanced...". + +2002-05-20 Ettore Perazzoli <ettore@ximian.com> + * e-search-bar.c (activate_by_subitems): Strip underscores from the menu item labels. diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 91fb195779..bad430817e 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -339,8 +339,8 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA /* always add on the advanced menu */ if (type == 1) { - ESearchBarItem advanced_item = E_FILTERBAR_ADVANCED; - g_array_append_vals (menu, &advanced_item, 1); + ESearchBarItem items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED }; + g_array_append_vals (menu, &items, 2); } item.id = -1; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 5f6163a6e4..15663c41d4 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -88,15 +88,16 @@ enum { E_FILTERBAR_ADVANCED_ID = -4, }; -#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 } +#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..."), E_FILTERBAR_ADVANCED_ID, NULL } +#define E_FILTERBAR_SEPARATOR { NULL, 0, NULL } #ifdef JUST_FOR_TRANSLATORS const char * strings[] = { N_("_Save Search..."), N_("_Edit Saved Searches..."), - N_("_Advanced search...") + N_("_Advanced...") }; #endif |