PATCH: remove favorites .desktop file, add stock trash icon make help correct

[Dave Bordoley <bordoley msu edu>]

A couple patches here:

1. Removes the favorites .desktop file, cuz it doesn't work. In the
future it would be nice to have mac os style favorites, but for now we
should punt it and just remove the .desktop file from the build.

2. Add gtk stock delete icon to "more to trash" in the popups and menus

3. Removes nautilus quick references, changes "nautilus user manual" to
"Contents" add's the F1 shortcut and changes the tooltip a bit.

dave


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5258
diff -u -p -r1.5258 ChangeLog
--- ChangeLog	2002/04/30 22:21:37	1.5258
+++ ChangeLog	2002/05/01 15:44:03
@@ -1,3 +1,20 @@
+2002-05-01 David Bordoley <bordoley msu edu>
+
+	* data/Makefile.sm
+	Remove favorites .desktop file
+
+	* src/file-manager/nautilus-directory-view-ui.xml
+	Added stock icon for move to trash
+
+	* src/nautilus-shell-ui.xml
+	Removed nautilus quick references
+	Changed "Nautilus User Manual" to "Contents"
+	Added stock help icon
+	Added F1 shortcut key for help
+
+	* src/nautilus-windows-menus.c
+	Removed	nautilus quick references
+
 2002-04-30  Alex Larsson  <alexl redhat com>
 
 	* components/Makefile.am:

Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/data/Makefile.am,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.am
--- data/Makefile.am	2001/12/14 13:40:34	1.18
+++ data/Makefile.am	2002/05/01 15:44:04
@@ -3,8 +3,7 @@ NULL=
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_DIRECTORY_RULE@
 
-DESKTOP_IN_FILES=	favorites.desktop.in		\
-			applications.desktop.in		\
+DESKTOP_IN_FILES=	applications.desktop.in		\
 			starthere.desktop.in		\
 			sysconfig.desktop.in		\
 			preferences.desktop.in		\
@@ -21,8 +20,7 @@ DESKTOP_FILES=$(DESKTOP_IN_FILES:.deskto
 DIRECTORY_FILES=$(DIRECTORY_IN_FILES:.directory.in=.directory)
 
 startheredir= $(sysconfdir)/X11/starthere
-starthere_DATA= 	favorites.desktop	\
-			applications.desktop	\
+starthere_DATA= 	applications.desktop	\
 			sysconfig.desktop	\
 			preferences.desktop	\
 			serverconfig.desktop	\

Index: src/nautilus-shell-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-shell-ui.xml,v
retrieving revision 1.89
diff -u -p -r1.89 nautilus-shell-ui.xml
--- src/nautilus-shell-ui.xml	2002/04/30 22:12:31	1.89
+++ src/nautilus-shell-ui.xml	2002/05/01 15:44:05
@@ -271,14 +271,11 @@
 
 	<submenu name="Help" _label="_Help">
 		<menuitem name="Nautilus Manual"
-			  _label="Nautilus User _Manual"
-			  _tip="Display on-line help for Nautilus"
+			  _label="_Contents"
+			  _tip="Display 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"
 			  _tip="Display credits for the creators of Nautilus"
Index: 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
--- src/nautilus-window-menus.c	2002/04/26 22:26:27	1.237
+++ src/nautilus-window-menus.c	2002/05/01 15:44:06
@@ -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: 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.39
diff -u -p -r1.39 nautilus-directory-view-ui.xml
--- src/file-manager/nautilus-directory-view-ui.xml	2002/04/30 22:12:33	1.39
+++ src/file-manager/nautilus-directory-view-ui.xml	2002/05/01 15:44:06
@@ -137,6 +137,7 @@
 			<menuitem name="Trash"
 				  _label="Move to _Trash"
 				  accel="*Control*t"
+				  pixtype="stock" pixname="gtk-delete"
 				  verb="Trash"/>
 			<menuitem name="Delete"
 				  _label="De_lete"
@@ -257,7 +258,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">