diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-11-15 22:31:07 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-11-15 22:31:07 +0000 |
| commit | b1aaa02b863f89f7ffcf4b95080380038a26e72a (patch) | |
| tree | 8c067efd20b7d368a09cc8a8de5599147fac6db0 /libnautilus/nautilus-bonobo-ui.h | |
| parent | 259c95fa589d3d267c0937afb55cb395979bacf9 (diff) | |
| download | nautilus-b1aaa02b863f89f7ffcf4b95080380038a26e72a.tar.gz | |
Fixed a couple of cases where context menus appeared on
the desktop that should have been hidden. This leaves
behind a new (Bonobo) bug where there are two adjacent
separators in the desktop background context menu, which
I will write up.
reviewed by: Maciej Stachowiak <mjs@eazel.com>
* libnautilus/nautilus-bonobo-ui.h:
Add popup zooming commands here that need to be manipulated
by directory view.
* src/file-manager/fm-directory-view.c: (real_merge_menus):
Hide the zooming items in the popup if the directory view
does not support zooming (e.g., desktop)
* src/file-manager/fm-icon-view.c: (fm_icon_view_merge_menus):
Hide the Lay Out submenu in the popup if the icon view
does not support auto-layout (e.g., desktop)
* src/nautilus-shell-ui.xml: Make zooming items in popup use
different commands than zooming items in normal menu, so they
can be hidden independently.
* src/nautilus-window-menus.c: (nautilus_window_initialize_menus):
Attach callbacks to new popup zooming items.
Diffstat (limited to 'libnautilus/nautilus-bonobo-ui.h')
| -rw-r--r-- | libnautilus/nautilus-bonobo-ui.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libnautilus/nautilus-bonobo-ui.h b/libnautilus/nautilus-bonobo-ui.h index 0055c2b10..ec27d17e3 100644 --- a/libnautilus/nautilus-bonobo-ui.h +++ b/libnautilus/nautilus-bonobo-ui.h @@ -62,6 +62,10 @@ #define NAUTILUS_COMMAND_CLEAR "/commands/Clear" #define NAUTILUS_COMMAND_SELECT_ALL "/commands/Select All" +#define NAUTILUS_COMMAND_ZOOM_IN_FROM_POPUP "/commands/Zoom In Popup" +#define NAUTILUS_COMMAND_ZOOM_OUT_FROM_POPUP "/commands/Zoom Out Popup" +#define NAUTILUS_COMMAND_ZOOM_NORMAL_FROM_POPUP "/commands/Zoom Normal Popup" + /** * Components can use these placeholder paths with BonoboUIContainer calls to * insert new items in well-defined positions. @@ -115,7 +119,6 @@ /* Use the "extra help items" placeholder to add help-related items */ #define NAUTILUS_MENU_PATH_EXTRA_HELP_ITEMS_PLACEHOLDER "/menu/Help/Extra Help Items" - /* Components can use these paths with BonoboUIHandler calls to * locate toolbars and toolbar items for the purpose of merging. * Note: Not all Nautilus toolbars or toolbar items are necessarily published |