summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog37
-rw-r--r--libnautilus-extensions/nautilus-bonobo-extensions.c25
-rw-r--r--libnautilus-extensions/nautilus-bonobo-extensions.h6
-rw-r--r--libnautilus-private/nautilus-bonobo-extensions.c25
-rw-r--r--libnautilus-private/nautilus-bonobo-extensions.h6
-rw-r--r--libnautilus/nautilus-bonobo-ui.h7
-rw-r--r--src/file-manager/fm-directory-view.c82
-rw-r--r--src/file-manager/fm-icon-view.c141
-rw-r--r--src/nautilus-navigation-window-menus.c6
-rw-r--r--src/nautilus-shell-ui.xml12
-rw-r--r--src/nautilus-window-menus.c6
11 files changed, 162 insertions, 191 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c70e60c2..15bb90533 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2000-11-16 John Sullivan <sullivan@eazel.com>
+
+ reviewed by: Darin Adler <darin@eazel.com>
+
+ Final changes to kill off the legendary bug 3579
+ (Convert directory view context menus to use Bonobo)
+
+ * libnautilus/nautilus-bonobo-ui.h:
+ #define for zoom items placeholder in popup. Remove
+ #defines for popup-specific zooming commands, since now
+ we don't need distinct popup-specific ones.
+
+ * libnautilus-extensions/nautilus-bonobo-extensions.h:
+ * libnautilus-extensions/nautilus-bonobo-extensions.c:
+ (nautilus_bonobo_set_label_for_menu_item_and_command):
+ Moved this here and commented; it had been a private
+ function in fm-directory-view.c.
+
+ * src/file-manager/fm-directory-view.c:
+ (real_merge_menus): Just hide the placeholder for the zoom items,
+ which is now sufficient due to a Bonobo fix Darin made.
+ (real_update_menus): Update for API name change.
+ (set_label_for_menu_and_command): Moved this to another file
+ and renamed it.
+ * src/file-manager/fm-icon-view.c:
+ (fm_icon_view_update_menus): Update the dynamic menu items
+ in-line here, as was done with fm-directory-view.c in an earlier
+ checkin.
+ (compute_menu_item_info), (update_one_menu_item): Removed these
+ obsolete functions.
+ * src/nautilus-shell-ui.xml: Eliminated special pop-up versions of
+ zoom commands. They existed only to allow hiding without affecting
+ the menu-bar versions, but now that placeholders can be hidden
+ these aren't necessary.
+ * src/nautilus-window-menus.c: (nautilus_window_initialize_menus):
+ Removed verb installation for pop-up versions of zoom commands.
+
2000-11-16 Rebecca Schulman <rebecka@eazel.com>
* check-FIXME.pl:
diff --git a/libnautilus-extensions/nautilus-bonobo-extensions.c b/libnautilus-extensions/nautilus-bonobo-extensions.c
index 1b7f93c8e..d40cff35a 100644
--- a/libnautilus-extensions/nautilus-bonobo-extensions.c
+++ b/libnautilus-extensions/nautilus-bonobo-extensions.c
@@ -26,6 +26,7 @@
#include <config.h>
#include "nautilus-bonobo-extensions.h"
+#include "nautilus-string.h"
#include <bonobo/bonobo-ui-util.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -390,6 +391,30 @@ nautilus_bonobo_remove_menu_items_and_commands (BonoboUIComponent *ui,
g_free (remove_wildcard);
}
+/* Call to set the user-visible label of a menu item to a string
+ * containing an underscore accelerator. The underscore is stripped
+ * off before setting the label of the command, because pop-up menu
+ * and tool bar button labels shouldn't have the underscore.
+ */
+void
+nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
+ const char *menu_item_path,
+ const char *command_path,
+ const char *label_with_underscore)
+{
+ char *label_no_underscore;
+
+ label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
+ nautilus_bonobo_set_label (ui,
+ menu_item_path,
+ label_with_underscore);
+ nautilus_bonobo_set_label (ui,
+ command_path,
+ label_no_underscore);
+
+ g_free (label_no_underscore);
+}
+
void
nautilus_bonobo_set_icon (BonoboUIComponent *ui,
const char *path,
diff --git a/libnautilus-extensions/nautilus-bonobo-extensions.h b/libnautilus-extensions/nautilus-bonobo-extensions.h
index 62325ea93..65f8bee38 100644
--- a/libnautilus-extensions/nautilus-bonobo-extensions.h
+++ b/libnautilus-extensions/nautilus-bonobo-extensions.h
@@ -80,7 +80,11 @@ void nautilus_bonobo_add_menu_separator (BonoboUIComponent *ui,
void nautilus_bonobo_remove_menu_items_and_commands
(BonoboUIComponent *ui,
const char *container_path);
-char * nautilus_bonobo_get_menu_item_verb_name (const char *path);
+void nautilus_bonobo_set_label_for_menu_item_and_command
+ (BonoboUIComponent *ui,
+ const char *menu_item_path,
+ const char *command_path,
+ const char *label_with_underscore);
void nautilus_bonobo_set_icon (BonoboUIComponent *ui,
const char *path,
const char *icon_relative_path);
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index 1b7f93c8e..d40cff35a 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -26,6 +26,7 @@
#include <config.h>
#include "nautilus-bonobo-extensions.h"
+#include "nautilus-string.h"
#include <bonobo/bonobo-ui-util.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -390,6 +391,30 @@ nautilus_bonobo_remove_menu_items_and_commands (BonoboUIComponent *ui,
g_free (remove_wildcard);
}
+/* Call to set the user-visible label of a menu item to a string
+ * containing an underscore accelerator. The underscore is stripped
+ * off before setting the label of the command, because pop-up menu
+ * and tool bar button labels shouldn't have the underscore.
+ */
+void
+nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
+ const char *menu_item_path,
+ const char *command_path,
+ const char *label_with_underscore)
+{
+ char *label_no_underscore;
+
+ label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
+ nautilus_bonobo_set_label (ui,
+ menu_item_path,
+ label_with_underscore);
+ nautilus_bonobo_set_label (ui,
+ command_path,
+ label_no_underscore);
+
+ g_free (label_no_underscore);
+}
+
void
nautilus_bonobo_set_icon (BonoboUIComponent *ui,
const char *path,
diff --git a/libnautilus-private/nautilus-bonobo-extensions.h b/libnautilus-private/nautilus-bonobo-extensions.h
index 62325ea93..65f8bee38 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.h
+++ b/libnautilus-private/nautilus-bonobo-extensions.h
@@ -80,7 +80,11 @@ void nautilus_bonobo_add_menu_separator (BonoboUIComponent *ui,
void nautilus_bonobo_remove_menu_items_and_commands
(BonoboUIComponent *ui,
const char *container_path);
-char * nautilus_bonobo_get_menu_item_verb_name (const char *path);
+void nautilus_bonobo_set_label_for_menu_item_and_command
+ (BonoboUIComponent *ui,
+ const char *menu_item_path,
+ const char *command_path,
+ const char *label_with_underscore);
void nautilus_bonobo_set_icon (BonoboUIComponent *ui,
const char *path,
const char *icon_relative_path);
diff --git a/libnautilus/nautilus-bonobo-ui.h b/libnautilus/nautilus-bonobo-ui.h
index ec27d17e3..41fa3747d 100644
--- a/libnautilus/nautilus-bonobo-ui.h
+++ b/libnautilus/nautilus-bonobo-ui.h
@@ -62,10 +62,6 @@
#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.
@@ -119,6 +115,9 @@
/* Use the "extra help items" placeholder to add help-related items */
#define NAUTILUS_MENU_PATH_EXTRA_HELP_ITEMS_PLACEHOLDER "/menu/Help/Extra Help Items"
+/* This holds the zooming-related items in the context menu */
+#define NAUTILUS_POPUP_PATH_ZOOM_ITEMS_PLACEHOLDER "/popups/background/Zoom 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
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 35de8cc01..917982e54 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -2907,34 +2907,11 @@ real_merge_menus (FMDirectoryView *view)
/* Do one-time state changes here; context-dependent ones go in update_menus */
if (!fm_directory_view_supports_zooming (view)) {
nautilus_bonobo_set_hidden
- (view->details->ui, NAUTILUS_COMMAND_ZOOM_IN_FROM_POPUP, TRUE);
- nautilus_bonobo_set_hidden
- (view->details->ui, NAUTILUS_COMMAND_ZOOM_OUT_FROM_POPUP, TRUE);
- nautilus_bonobo_set_hidden
- (view->details->ui, NAUTILUS_COMMAND_ZOOM_NORMAL_FROM_POPUP, TRUE);
+ (view->details->ui, NAUTILUS_POPUP_PATH_ZOOM_ITEMS_PLACEHOLDER, TRUE);
}
}
static void
-set_label_for_menu_and_command (FMDirectoryView *view,
- const char *menu_path,
- const char *command_path,
- const char *label_with_underscore)
-{
- char *label_no_underscore;
-
- label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
- nautilus_bonobo_set_label (view->details->ui,
- menu_path,
- label_with_underscore);
- nautilus_bonobo_set_label (view->details->ui,
- command_path,
- label_no_underscore);
-
- g_free (label_no_underscore);
-}
-
-static void
real_update_menus (FMDirectoryView *view)
{
GList *selection;
@@ -2969,10 +2946,11 @@ real_update_menus (FMDirectoryView *view)
} else {
label_with_underscore = g_strdup_printf (_("Open in %d _New Windows"), selection_count);
}
- set_label_for_menu_and_command (view,
- FM_DIRECTORY_VIEW_MENU_PATH_OPEN_IN_NEW_WINDOW,
- FM_DIRECTORY_VIEW_COMMAND_OPEN_IN_NEW_WINDOW,
- label_with_underscore);
+ nautilus_bonobo_set_label_for_menu_item_and_command
+ (view->details->ui,
+ FM_DIRECTORY_VIEW_MENU_PATH_OPEN_IN_NEW_WINDOW,
+ FM_DIRECTORY_VIEW_COMMAND_OPEN_IN_NEW_WINDOW,
+ label_with_underscore);
g_free (label_with_underscore);
/* If the only selected item is launchable, dim out "Open in New Window"
@@ -3008,10 +2986,11 @@ real_update_menus (FMDirectoryView *view)
"*Control*t");
label_with_underscore = g_strdup (_("Move to _Trash"));
}
- set_label_for_menu_and_command (view,
- FM_DIRECTORY_VIEW_MENU_PATH_TRASH,
- FM_DIRECTORY_VIEW_COMMAND_TRASH,
- label_with_underscore);
+ nautilus_bonobo_set_label_for_menu_item_and_command
+ (view->details->ui,
+ FM_DIRECTORY_VIEW_MENU_PATH_TRASH,
+ FM_DIRECTORY_VIEW_COMMAND_TRASH,
+ label_with_underscore);
nautilus_bonobo_set_sensitive (view->details->ui,
FM_DIRECTORY_VIEW_COMMAND_TRASH,
!fm_directory_view_is_read_only (view)
@@ -3024,12 +3003,13 @@ real_update_menus (FMDirectoryView *view)
&& selection_count != 0
&& !selection_contains_special_link);
- set_label_for_menu_and_command (view,
- FM_DIRECTORY_VIEW_MENU_PATH_CREATE_LINK,
- FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK,
- selection_count > 1
- ? _("Create _Links")
- : _("Create _Link"));
+ nautilus_bonobo_set_label_for_menu_item_and_command
+ (view->details->ui,
+ FM_DIRECTORY_VIEW_MENU_PATH_CREATE_LINK,
+ FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK,
+ selection_count > 1
+ ? _("Create _Links")
+ : _("Create _Link"));
nautilus_bonobo_set_sensitive (view->details->ui,
FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK,
can_create_files
@@ -3042,23 +3022,25 @@ real_update_menus (FMDirectoryView *view)
&& fm_directory_view_supports_properties (view));
- set_label_for_menu_and_command (view,
- FM_DIRECTORY_VIEW_MENU_PATH_EMPTY_TRASH,
- FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH,
- confirm_trash
- ? _("_Empty Trash...")
- : _("_Empty Trash"));
+ nautilus_bonobo_set_label_for_menu_item_and_command
+ (view->details->ui,
+ FM_DIRECTORY_VIEW_MENU_PATH_EMPTY_TRASH,
+ FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH,
+ confirm_trash
+ ? _("_Empty Trash...")
+ : _("_Empty Trash"));
nautilus_bonobo_set_sensitive (view->details->ui,
FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH,
!nautilus_trash_monitor_is_empty ());
- set_label_for_menu_and_command (view,
- FM_DIRECTORY_VIEW_MENU_PATH_REMOVE_CUSTOM_ICONS,
- FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS,
- selection_count > 1
- ? _("R_emove Custom Images")
- : _("R_emove Custom Image"));
+ nautilus_bonobo_set_label_for_menu_item_and_command
+ (view->details->ui,
+ FM_DIRECTORY_VIEW_MENU_PATH_REMOVE_CUSTOM_ICONS,
+ FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS,
+ selection_count > 1
+ ? _("R_emove Custom Images")
+ : _("R_emove Custom Image"));
nautilus_bonobo_set_sensitive (view->details->ui,
FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS,
files_have_any_custom_images (selection));
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 1c2bdd7bf..277c0dd36 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -452,93 +452,6 @@ special_link_in_selection (FMIconView *view)
}
static void
-compute_menu_item_info (FMIconView *view,
- GList *selection,
- const char *menu_path,
- char **return_name_with_underscore,
- char **return_name_no_underscore,
- gboolean *sensitive_return,
- MenuItemType *menu_item_type_return)
-{
- NautilusIconContainer *icon_container;
- char *name_with_underscore;
- gboolean sensitive;
- MenuItemType type;
-
- g_assert (FM_IS_ICON_VIEW (view));
- g_assert (menu_path != NULL);
- g_assert (return_name_with_underscore != NULL || return_name_no_underscore != NULL);
-
- icon_container = get_icon_container (view);
- sensitive = TRUE;
- type = MENU_ITEM_TYPE_STANDARD;
-
- if (strcmp (MENU_PATH_STRETCH_ICON, menu_path) == 0) {
- name_with_underscore = g_strdup (_("_Stretch Icon"));
- /* Current stretching UI only works on one item at a time, so we'll
- * desensitize the menu item if that's not the case.
- */
- sensitive = nautilus_g_list_exactly_one_item (selection)
- && (icon_container != NULL
- && !nautilus_icon_container_has_stretch_handles (icon_container));
- } else if (strcmp (MENU_PATH_UNSTRETCH_ICONS, menu_path) == 0) {
- if (nautilus_g_list_more_than_one_item (selection)) {
- name_with_underscore = g_strdup (_("_Restore Icons' Original Sizes"));
- } else {
- name_with_underscore = g_strdup (_("_Restore Icon's Original Size"));
- }
- sensitive = icon_container != NULL
- && nautilus_icon_container_is_stretched (icon_container);
- } else if (strcmp (MENU_PATH_CUSTOMIZE_ICON_TEXT, menu_path) == 0) {
- name_with_underscore = g_strdup (_("_Icon Captions..."));
- } else if (strcmp (MENU_PATH_RENAME, menu_path) == 0) {
- /* Modify file name. We only allow this on a single file selection. */
- name_with_underscore = g_strdup (_("_Rename"));
- sensitive = nautilus_g_list_exactly_one_item (selection)
- && nautilus_file_can_rename (selection->data)
- && !special_link_in_selection (view);
- } else if (strcmp (MENU_PATH_CLEAN_UP, menu_path) == 0) {
- name_with_underscore = g_strdup (_("_Clean Up by Name"));
- sensitive = !fm_icon_view_using_auto_layout (view);
- } else if (strcmp (MENU_PATH_TIGHTER_LAYOUT, menu_path) == 0) {
- name_with_underscore = g_strdup (_("_Use Tighter Layout"));
- sensitive = fm_icon_view_using_auto_layout (view);
- type = MENU_ITEM_TYPE_CHECK;
- } else if (strcmp (MENU_PATH_SORT_REVERSED, menu_path) == 0) {
- name_with_underscore = g_strdup (_("Re_versed Order"));
- sensitive = fm_icon_view_using_auto_layout (view);
- type = MENU_ITEM_TYPE_CHECK;
- } else if (strcmp (MENU_PATH_LAY_OUT, menu_path) == 0) {
- name_with_underscore = g_strdup (_("_Lay out items"));
- type = MENU_ITEM_TYPE_TREE;
- } else if (strcmp (MENU_PATH_MANUAL_LAYOUT, menu_path) == 0) {
- name_with_underscore = g_strdup (_("_manually"));
- type = MENU_ITEM_TYPE_RADIO;
- } else {
- name_with_underscore = NULL;
- g_message ("Unknown menu path\"%s\" in compute_menu_item_info", menu_path);
- }
-
- if (return_name_no_underscore != NULL) {
- *return_name_no_underscore = nautilus_str_strip_chr (name_with_underscore, '_');
- }
-
- if (return_name_with_underscore != NULL) {
- *return_name_with_underscore = name_with_underscore;
- } else {
- g_free (name_with_underscore);
- }
-
- if (sensitive_return != NULL) {
- *sensitive_return = sensitive;
- }
-
- if (menu_item_type_return != NULL) {
- *menu_item_type_return = type;
- }
-}
-
-static void
handle_radio_item (FMIconView *view,
const char *id)
{
@@ -1251,28 +1164,12 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
}
static void
-update_one_menu_item (FMIconView *view,
- GList *selection,
- const char *menu_path,
- const char *verb_path)
-{
- char *label_with_underscore, *label_no_underscore;
- gboolean sensitive;
-
- compute_menu_item_info (view, selection, menu_path, &label_with_underscore, &label_no_underscore, &sensitive, NULL);
-
- nautilus_bonobo_set_sensitive (view->details->ui, verb_path, sensitive);
- nautilus_bonobo_set_label (view->details->ui, menu_path, label_with_underscore);
- nautilus_bonobo_set_label (view->details->ui, verb_path, label_no_underscore);
- g_free (label_with_underscore);
- g_free (label_no_underscore);
-}
-
-static void
fm_icon_view_update_menus (FMDirectoryView *view)
{
FMIconView *icon_view;
GList *selection;
+ int selection_count;
+ NautilusIconContainer *icon_container;
icon_view = FM_ICON_VIEW (view);
@@ -1284,18 +1181,34 @@ fm_icon_view_update_menus (FMDirectoryView *view)
NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
selection = fm_directory_view_get_selection (view);
+ selection_count = g_list_length (selection);
+ icon_container = get_icon_container (icon_view);
bonobo_ui_component_freeze (icon_view->details->ui, NULL);
- update_one_menu_item (FM_ICON_VIEW (view), selection,
- MENU_PATH_STRETCH_ICON,
- COMMAND_STRETCH_ICON);
- update_one_menu_item (FM_ICON_VIEW (view), selection,
- MENU_PATH_UNSTRETCH_ICONS,
- COMMAND_UNSTRETCH_ICONS);
- update_one_menu_item (FM_ICON_VIEW (view), selection,
- MENU_PATH_RENAME,
- COMMAND_RENAME);
+ nautilus_bonobo_set_sensitive (icon_view->details->ui,
+ COMMAND_STRETCH_ICON,
+ selection_count == 1
+ && icon_container != NULL
+ && !nautilus_icon_container_has_stretch_handles (icon_container));
+
+ nautilus_bonobo_set_label_for_menu_item_and_command
+ (icon_view->details->ui,
+ MENU_PATH_UNSTRETCH_ICONS,
+ COMMAND_UNSTRETCH_ICONS,
+ nautilus_g_list_more_than_one_item (selection)
+ ? _("_Restore Icons' Original Sizes")
+ : _("_Restore Icon's Original Size"));
+ nautilus_bonobo_set_sensitive (icon_view->details->ui,
+ COMMAND_UNSTRETCH_ICONS,
+ icon_container != NULL
+ && nautilus_icon_container_is_stretched (icon_container));
+
+ nautilus_bonobo_set_sensitive (icon_view->details->ui,
+ COMMAND_RENAME,
+ selection_count == 1
+ && nautilus_file_can_rename (selection->data)
+ && !special_link_in_selection (icon_view));
bonobo_ui_component_thaw (icon_view->details->ui, NULL);
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index ae0e04636..262e57f62 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -1237,12 +1237,6 @@ nautilus_window_initialize_menus (NautilusWindow *window)
BONOBO_UI_VERB ("Zoom In", view_menu_zoom_in_callback),
BONOBO_UI_VERB ("Zoom Out", view_menu_zoom_out_callback),
BONOBO_UI_VERB ("Zoom Normal", view_menu_zoom_normal_callback),
- /* Separate verbs for the Zoom items in the context menus so that
- * they can be hidden when the normal ones are merely desensitized.
- */
- BONOBO_UI_VERB ("Zoom In Popup", view_menu_zoom_in_callback),
- BONOBO_UI_VERB ("Zoom Out Popup", view_menu_zoom_out_callback),
- BONOBO_UI_VERB ("Zoom Normal Popup", view_menu_zoom_normal_callback),
BONOBO_UI_VERB ("Add Bookmark", bookmarks_menu_add_bookmark_callback),
BONOBO_UI_VERB ("Edit Bookmarks", bookmarks_menu_edit_bookmarks_callback),
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 868b5957a..ad2d712b4 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -31,12 +31,6 @@
_tip="Show the contents in less detail"/>
<cmd name="Zoom Normal" _label="Normal Size"
_tip="Show the contents at the normal size"/>
- <cmd name="Zoom In Popup" _label="Zoom In"
- _tip="Show the contents in more detail"/>
- <cmd name="Zoom Out Popup" _label="Zoom Out"
- _tip="Show the contents in less detail"/>
- <cmd name="Zoom Normal Popup" _label="Normal Size"
- _tip="Show the contents at the normal size"/>
</commands>
<menu>
@@ -353,9 +347,9 @@
<popup name="background">
<placeholder name="Before Zoom Items"/>
<placeholder name="Zoom Items" delimit="top">
- <menuitem name="Zoom In" verb="Zoom In Popup"/>
- <menuitem name="Zoom Out" verb="Zoom Out Popup"/>
- <menuitem name="Zoom Normal" verb="Zoom Normal Popup"/>
+ <menuitem name="Zoom In" verb="Zoom In"/>
+ <menuitem name="Zoom Out" verb="Zoom Out"/>
+ <menuitem name="Zoom Normal" verb="Zoom Normal"/>
</placeholder>
<placeholder name="After Zoom Items" delimit="top"/>
</popup>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index ae0e04636..262e57f62 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -1237,12 +1237,6 @@ nautilus_window_initialize_menus (NautilusWindow *window)
BONOBO_UI_VERB ("Zoom In", view_menu_zoom_in_callback),
BONOBO_UI_VERB ("Zoom Out", view_menu_zoom_out_callback),
BONOBO_UI_VERB ("Zoom Normal", view_menu_zoom_normal_callback),
- /* Separate verbs for the Zoom items in the context menus so that
- * they can be hidden when the normal ones are merely desensitized.
- */
- BONOBO_UI_VERB ("Zoom In Popup", view_menu_zoom_in_callback),
- BONOBO_UI_VERB ("Zoom Out Popup", view_menu_zoom_out_callback),
- BONOBO_UI_VERB ("Zoom Normal Popup", view_menu_zoom_normal_callback),
BONOBO_UI_VERB ("Add Bookmark", bookmarks_menu_add_bookmark_callback),
BONOBO_UI_VERB ("Edit Bookmarks", bookmarks_menu_edit_bookmarks_callback),
View Lorry Controller Status