PATCH: bug 76293 and bug 48317

[Dave Bordoley <bordoley msu edu>]

Final UI and HIG fixes, and one internationalization fix

Summary:
1. Changed accelerators for back and forward to ctl+right and ctl-left
respectively. The old Ctl+[ and Ctl+] did not internationalize well and
made it virtually impossible to press with a swedish keyboard map. Also
these are the same shortcuts used in both netscape and explorer. (bug
48317)

2. Changed short cut key for home cntrl+home cuz calum said so. Kind of
makes sense too.(bug 76293)

3. changed add bookmark shortcut to ctl+d and edit bookmark shortcut to
ctl+b as specified in the hig. 

4. Changed the label of nautilus help to "_Help Contents as specified in
the hig. Added F1 accelerator, changed the tip a little bit and added a
stock icon.

5. Remove Nautilus Quick Reference Manual since it will not be used in
Nautilus2.  

6. Added stock delet icon for move to trash


This basically fixes all menu hig issues. (At least that i know of)

dave



Index: nautilus/src//nautilus-shell-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-shell-ui.xml,v
retrieving revision 1.87
diff -u -p -r1.87 nautilus-shell-ui.xml
--- nautilus/src//nautilus-shell-ui.xml	26 Apr 2002 23:54:46 -0000	1.87
+++ nautilus/src//nautilus-shell-ui.xml	28 Apr 2002 14:22:49 -0000
@@ -8,9 +8,9 @@
 	 than one item (usually 1 menuitem and 1 toolitem.
 	-->
 	 
-	<cmd name="Back" accel="*Control*bracketleft"
+	<cmd name="Back" accel="*Control*Left"
 	 _tip="Go to the previous visited location"/>
-	<cmd name="Forward" accel="*Control*bracketright"
+	<cmd name="Forward" accel="*Control*Right"
 	 _tip="Go to the next visited location"/>
 	<cmd name="Find" accel="*Control*f"
 	 _tip="Search this computer for files"/>
@@ -29,7 +29,7 @@
         <cmd name="Copy" accel="*Control*c" sensitive="0"/>
         <cmd name="Paste" accel="*Control*v" sensitive="0"/>
         <cmd name="Clear" sensitive="0"/>
-	<cmd name="Up"
+	<cmd name="Up" accel="*Control*u"
 	 _tip="Go up to the location that contains the displayed location"/>
 	<cmd name="Reload"
 	 _tip="Display the latest contents of the current location"/>
@@ -206,12 +209,11 @@
 			  verb="Forward"/>
 		<menuitem name="Up" 
 			  _label="_Up a Level" 
-			  accel="*Control*u"
 			  pixtype="stock" pixname="gtk-go-up"
 			  verb="Up"/>
 		<menuitem name="Home" 
 			  _label="_Home" 
-			  accel="*Control*h"
+			  accel="*Control*Home"
 			  pixtype="stock" pixname="gtk-home"
 			  verb="Home"/>
 		<menuitem name="Start Here" 
@@ -237,12 +239,13 @@
 		<menuitem name="Add Bookmark" 
 			  _label="_Add Bookmark" 
 			  _tip="Add a bookmark for the current location to this menu"
-			  accel="*Control*b"
+			  accel="*Control*d"
 			  pixtype="stock" pixname="gtk-add"
 			  verb="Add Bookmark"/>
 		<menuitem name="Edit Bookmarks" 
 			  _label="_Edit Bookmarks..." 
 			  _tip="Display a window that allows editing the bookmarks in this menu"
+			  accel="*Control*b"
 			  verb="Edit Bookmarks"/>
 
 		<placeholder name="Built-in Bookmarks Placeholder" delimit="top"/>
@@ -272,16 +275,13 @@
 
 	<submenu name="Help" _label="_Help">
 		<menuitem name="Nautilus Manual"
-			  _label="Nautilus User _Manual"
-			  _tip="Display on-line help for Nautilus"
+			  _label="_Help Contents"
+			  _tip="Open Nautilus help"
+			  accel="F1"
+ 			  pixtype="stock" pixname="gtk-help"
 			  verb="Nautilus Manual"/>
-		<menuitem name="Nautilus Quick Reference" 
-			  _label="Nautilus Quick _Reference" 
-			  _tip="Display quick reference pages for Nautilus"
-			  verb="Nautilus Quick Reference"/>
-		<separator/>
 		<menuitem name="About Nautilus"
-			  _label="_About Nautilus..."
+			  _label="_About..."
 			  _tip="Display credits for the creators of Nautilus"
 			  pixtype="stock" pixname="about"
 			  verb="About Nautilus"/>
Index: nautilus/src//nautilus-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-menus.c,v
retrieving revision 1.237
diff -u -p -r1.237 nautilus-window-menus.c
--- nautilus/src//nautilus-window-menus.c	26 Apr 2002 22:26:27 -0000	1.237
+++ nautilus/src//nautilus-window-menus.c	28 Apr 2002 14:22:49 -0000
@@ -92,7 +92,6 @@
 #define COMMAND_PATH_CLOSE_WINDOW			"/commands/Close"
 
 #define USER_MANUAL_URI		"help:nautilus-user-manual"
-#define QUICK_REFERENCE_URI	"help:nautilus-quick-reference"
 #define CUSTOMER_FEEDBACK_URI	"http://www.eazel.com/feedback.html";
 #define START_HERE_URI          "start-here:"
 
@@ -638,14 +637,6 @@ help_menu_nautilus_manual_callback (Bono
 }
 
 static void
-help_menu_nautilus_quick_reference_callback (BonoboUIComponent *component, 
-			              	     gpointer user_data, 
-			              	     const char *verb)
-{
-	nautilus_window_go_to (NAUTILUS_WINDOW (user_data), QUICK_REFERENCE_URI);
-}
-
-static void
 help_menu_nautilus_feedback_callback (BonoboUIComponent *component, 
 			              gpointer user_data, 
 			              const char *verb)
@@ -1118,7 +1109,6 @@ nautilus_window_initialize_menus_part_1 
 
 		BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
 		BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
-		BONOBO_UI_VERB ("Nautilus Quick Reference", help_menu_nautilus_quick_reference_callback),
 		BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
 		BONOBO_UI_VERB ("User Level Customization", user_level_customize_callback),
 		BONOBO_UI_VERB ("Stop", stop_button_callback),

Index: nautilus/src//file-manager/nautilus-directory-view-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/nautilus-directory-view-ui.xml,v
retrieving revision 1.37
diff -u -p -r1.37 nautilus-directory-view-ui.xml
--- nautilus/src//file-manager/nautilus-directory-view-ui.xml	26 Apr 2002 22:26:31 -0000	1.37
+++ nautilus/src//file-manager/nautilus-directory-view-ui.xml	28 Apr 2002 14:22:49 -0000
@@ -136,6 +136,7 @@
 			<menuitem name="Trash"
 				  _label="Move to _Trash"
 				  accel="*Control*t"
+				  pixtype="stock" pixname="gtk-delete"
 				  verb="Trash"/>
 			<menuitem name="Delete"
 				  _label="De_lete"
@@ -258,7 +259,9 @@
 			<menuitem name="Rename" verb="Rename"/>
 		</placeholder>
 		<placeholder name="Dangerous File Actions" delimit="top">
-			<menuitem name="Trash" verb="Trash"/>
+			<menuitem name="Trash" 
+			 pixtype="stock" pixname="gtk-delete"
+			 verb="Trash"/>
 			<menuitem name="Delete" verb="Delete"/>
 		</placeholder>
 		<placeholder name="File Clipboard Actions" delimit="top">
[root localhost cvs]#