diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2001-04-05 21:04:12 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-04-05 21:04:12 +0000 |
| commit | 2ee05d88c741622933582efc0563a08f21f9e566 (patch) | |
| tree | 17b679b04e6ac9f9d05142855a21c9289e06e73b | |
| parent | a4fea8531bc6d8c04d68bec52990e0061dc0622f (diff) | |
| download | nautilus-2ee05d88c741622933582efc0563a08f21f9e566.tar.gz | |
Fixed bug 7985 (Separately group "Move to Trash" and
"Delete" menu items to avoid accidental selection)
* src/file-manager/nautilus-directory-view-ui.xml:
Moved Move to Trash and Delete into their own
menu section (surrounded by separators).
* src/file-manager/fm-directory-view.c: Updated menu
paths that have now changed.
* src/nautilus-shell-ui.xml: Added placeholder used by
Move to Trash and Delete to get ordering right.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 4 | ||||
| -rw-r--r-- | src/file-manager/nautilus-directory-view-ui.xml | 22 | ||||
| -rw-r--r-- | src/nautilus-shell-ui.xml | 1 |
4 files changed, 29 insertions, 11 deletions
@@ -1,3 +1,16 @@ +2001-04-05 John Sullivan <sullivan@eazel.com> + + Fixed bug 7985 (Separately group "Move to Trash" and + "Delete" menu items to avoid accidental selection) + + * src/file-manager/nautilus-directory-view-ui.xml: + Moved Move to Trash and Delete into their own + menu section (surrounded by separators). + * src/file-manager/fm-directory-view.c: Updated menu + paths that have now changed. + * src/nautilus-shell-ui.xml: Added placeholder used by + Move to Trash and Delete to get ordering right. + 2001-04-05 Arlo Rose <arlo@eazel.com> * icons/Makefile.am: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 21b751dea..e27bd1def 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -106,8 +106,8 @@ #define FM_DIRECTORY_VIEW_MENU_PATH_OPEN_ALTERNATE "/menu/File/Open Placeholder/OpenAlternate" #define FM_DIRECTORY_VIEW_MENU_PATH_OPEN_WITH "/menu/File/Open Placeholder/Open With" #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS "/menu/File/Open Placeholder/Scripts" -#define FM_DIRECTORY_VIEW_MENU_PATH_TRASH "/menu/File/File Items Placeholder/Trash" -#define FM_DIRECTORY_VIEW_MENU_PATH_DELETE "/menu/File/File Items Placeholder/Delete" +#define FM_DIRECTORY_VIEW_MENU_PATH_TRASH "/menu/File/Dangerous File Items Placeholder/Trash" +#define FM_DIRECTORY_VIEW_MENU_PATH_DELETE "/menu/File/Dangerous File Items Placeholder/Delete" #define FM_DIRECTORY_VIEW_MENU_PATH_EMPTY_TRASH "/menu/File/Global File Items Placeholder/Empty Trash" #define FM_DIRECTORY_VIEW_MENU_PATH_CREATE_LINK "/menu/File/File Items Placeholder/Create Link" #define FM_DIRECTORY_VIEW_MENU_PATH_REMOVE_CUSTOM_ICONS "/menu/Edit/Edit Items Placeholder/Remove Custom Icons" diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml index b5adb98bb..8993cf83c 100644 --- a/src/file-manager/nautilus-directory-view-ui.xml +++ b/src/file-manager/nautilus-directory-view-ui.xml @@ -105,13 +105,6 @@ _label="Show _Properties" accel="*Control*i" verb="Show Properties"/> - <menuitem name="Trash" - _label="Move to _Trash" - accel="*Control*t" - verb="Trash"/> - <menuitem name="Delete" - _label="De_lete" - verb="Delete"/> <menuitem name="Duplicate" _label="_Duplicate" accel="*Control*d" @@ -121,6 +114,15 @@ accel="*Control*m" verb="Create Link"/> </placeholder> + <placeholder name="Dangerous File Items Placeholder"> + <menuitem name="Trash" + _label="Move to _Trash" + accel="*Control*t" + verb="Trash"/> + <menuitem name="Delete" + _label="De_lete" + verb="Delete"/> + </placeholder> <placeholder name="Global File Items Placeholder"> <menuitem name="Show Trash" @@ -204,11 +206,13 @@ </placeholder> <placeholder name="File Actions" delimit="top"> <menuitem name="Show Properties" verb="Show Properties"/> - <menuitem name="Trash" verb="Trash"/> - <menuitem name="Delete" verb="Delete"/> <menuitem name="Duplicate" verb="Duplicate"/> <menuitem name="Create Link" verb="Create Link"/> </placeholder> + <placeholder name="Dangerous File Actions" delimit="top"> + <menuitem name="Trash" verb="Trash"/> + <menuitem name="Delete" verb="Delete"/> + </placeholder> <placeholder name="File Clipboard Actions" delimit="top"> <menuitem name="Cut Files" verb="Cut Files"/> <menuitem name="Copy Files" verb="Copy Files"/> diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml index 3355a4495..978d3ce5a 100644 --- a/src/nautilus-shell-ui.xml +++ b/src/nautilus-shell-ui.xml @@ -60,6 +60,7 @@ <placeholder name="General Status Placeholder" delimit="top"/> <placeholder name="File Items Placeholder" delimit="top"/> + <placeholder name="Dangerous File Items Placeholder" delimit="top"/> <separator/> |