diff options
| author | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2005-12-20 17:47:56 +0800 |
|---|---|---|
| committer | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2005-12-20 17:47:56 +0800 |
| commit | 16059b3941bcc405035aef6f45a4907d4a729db4 (patch) | |
| tree | 3d32cc19edd7537ee411004ebf689874024e764c | |
| parent | 99a74fa6899d4f8062d35bcac01d84c97cf330eb (diff) | |
| download | gsoc2013-evolution-16059b3941bcc405035aef6f45a4907d4a729db4.tar.gz gsoc2013-evolution-16059b3941bcc405035aef6f45a4907d4a729db4.tar.zst gsoc2013-evolution-16059b3941bcc405035aef6f45a4907d4a729db4.zip | |
Fixes #323125, #323126
* gui/cal-search-bar.c: Re-order the search-bar menu items and
make "Summary contains", which is what most people use to search
for an item (be it a calendar/task/memo), as default.
(cal_search_bar_construct): Do not set "Category is" as default
option in search-bar menu.
* gui/cal-search-bar.h: Re-order the bit-values in accordance to
re-ordered search-bar menu items.
svn path=/trunk/; revision=30896
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/cal-search-bar.c | 10 | ||||
| -rw-r--r-- | calendar/gui/cal-search-bar.h | 8 |
3 files changed, 20 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8ead359e95..7d82a2b729 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2005-12-20 Veerapuram Varadhan <vvaradhan@novell.com> + + Fixes #323125, #323126 + * gui/cal-search-bar.c: Re-order the search-bar menu items and + make "Summary contains", which is what most people use to search + for an item (be it a calendar/task/memo), as default. + (cal_search_bar_construct): Do not set "Category is" as default + option in search-bar menu. + + * gui/cal-search-bar.h: Re-order the bit-values in accordance to + re-ordered search-bar menu items. + 2005-12-20 P S Chakravarthi <pchakravarthi@novell.com> Fixes #323955 diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 962b7e5eca..de4ef659c0 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -35,22 +35,22 @@ /* IDs and option items for the ESearchBar */ enum { - SEARCH_ANY_FIELD_CONTAINS, SEARCH_SUMMARY_CONTAINS, SEARCH_DESCRIPTION_CONTAINS, + SEARCH_CATEGORY_IS, SEARCH_COMMENT_CONTAINS, SEARCH_LOCATION_CONTAINS, - SEARCH_CATEGORY_IS + SEARCH_ANY_FIELD_CONTAINS }; /* Comments are disabled because they are kind of useless right now, see bug 33247 */ static ESearchBarItem search_option_items[] = { - { N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL }, { N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, NULL }, { N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, NULL }, + { N_("Category is"), SEARCH_CATEGORY_IS, NULL }, { N_("Comment contains"), SEARCH_COMMENT_CONTAINS, NULL }, { N_("Location contains"), SEARCH_LOCATION_CONTAINS, NULL }, - { N_("Category is"), SEARCH_CATEGORY_IS, NULL }, + { N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL }, }; /* IDs for the categories suboptions */ @@ -417,8 +417,6 @@ cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags) e_search_bar_construct (E_SEARCH_BAR (cal_search), NULL, items); make_suboptions (cal_search); - e_search_bar_set_ids (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, CATEGORIES_ALL); - return cal_search; } diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h index ed39e91d59..d5a50be9e4 100644 --- a/calendar/gui/cal-search-bar.h +++ b/calendar/gui/cal-search-bar.h @@ -38,12 +38,12 @@ G_BEGIN_DECLS typedef struct CalSearchBarPrivate CalSearchBarPrivate; enum { - CAL_SEARCH_ANY_FIELD_CONTAINS = (1 << 0), - CAL_SEARCH_SUMMARY_CONTAINS = (1 << 1), - CAL_SEARCH_DESCRIPTION_CONTAINS = (1 << 2), + CAL_SEARCH_SUMMARY_CONTAINS = (1 << 0), + CAL_SEARCH_DESCRIPTION_CONTAINS = (1 << 1), + CAL_SEARCH_CATEGORY_IS = (1 << 2), CAL_SEARCH_COMMENT_CONTAINS = (1 << 3), CAL_SEARCH_LOCATION_CONTAINS = (1 << 4), - CAL_SEARCH_CATEGORY_IS = (1 << 5) + CAL_SEARCH_ANY_FIELD_CONTAINS = (1 << 5) }; #define CAL_SEARCH_ALL (0xff) |