diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-08-22 21:53:09 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-08-22 21:53:09 +0000 |
| commit | c23deec6488db98bb786195881c85bcb9ada841a (patch) | |
| tree | a45e952a3775cf558b389afa74cdc32c77bf8c96 /src/nautilus-window-toolbars.c | |
| parent | 9d34987c72864b32c09358f92dd61d5d87879a16 (diff) | |
| download | nautilus-c23deec6488db98bb786195881c85bcb9ada841a.tar.gz | |
More work on bug 1653 (new menu layout)
Fixed bug 1995 (No way to enter/leave search mode from keyboard)
Fixed bug 1999 (No way to reload from keyboard)
* libnautilus/nautilus-bonobo-ui.h: Added more placeholders.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_real_merge_menus): Position "Empty Trash"
menu item and separator using placeholder.
* src/file-manager/fm-icon-view.c: (compute_menu_item_info):
Fixed bug where "Restore Icon's Original Size" was using the
wrong plurality.
(insert_bonobo_menu_item): Renamed this from append_ and gave
it a position parameter.
(fm_icon_view_merge_menus): Used placeholders to put the menu
items in the order specified by bug 1653.
* src/nautilus-switchable-navigation-bar.h:
* src/nautilus-switchable-navigation-bar.c:
(nautilus_switchable_navigation_bar_get_mode): New function;
formerly there was a public setter but no public getter.
* src/nautilus-window-menus.c:
(file_menu_close_window_callback): Removed redundant assert.
(file_menu_toggle_find_mode_callback): New function, toggles
whether we're in search mode.
(go_menu_reload_callback): New function, reloads.
(nautilus_window_initialize_menus): Tweaked hint for "Close All Windows",
added Find/Browse menu item; Changed "Up" to "Up a Level" to
match bug 1653; added "Reload" to Go menu.
(nautilus_window_update_find_menu_item): New function, sets the
label of the Find/Browse menu item based on search mode's state.
* src/nautilus-window-private.h: added #define for
NAUTILUS_MENU_PATH_RELOAD_ITEM; added prototype for
nautilus_window_update_find_menu_item.
* src/nautilus-window-toolbars.c: Changed "Search" to "Find"
to match menu item (and Arlo's design).
* src/nautilus-window.h,
* src/nautilus-window.c:
(navigation_bar_mode_changed_callback): Update Find menu item.
(nautilus_window_get_search_mode): New function; formerly there
was a public setter but no public getter.
(nautilus_window_allow_reload): Update menu item sensitivity.
Diffstat (limited to 'src/nautilus-window-toolbars.c')
| -rw-r--r-- | src/nautilus-window-toolbars.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index d180516c2..d07122b95 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -137,7 +137,7 @@ static GnomeUIInfo toolbar_info[] = { NAUTILUS_PIXMAPDIR "/eazel/Home.png"), NAUTILUS_GNOMEUIINFO_TOGGLEITEM_STOCK - (N_("Search"), N_("Search this computer for files"), + (N_("Find"), N_("Search this computer for files"), toolbar_search_local_callback, NAUTILUS_PIXMAPDIR "/eazel/Search.png"), |