Re: Nautilus usability and nit-picks

[Brent Fox <bfox redhat com>]

On Thu, 2002-08-22 at 08:42, Calum Benson wrote:
> On Thu, 2002-08-22 at 13:37, Jeff Waugh wrote:
> 
> > > Lastly, but thats just a nit-pick, it seems odd that the menu reads 'Cut 
> > > File' (or files with multiple selected) instead of just 'Cut'. First of 
> > > all a user might not have a 'file' reference.. its his 'document' right? 
> > > Secondly, it's different from that i'm used to (in windows, etc you 
> > > always 'cut' whatever you selected.. be it text, files or whatever). 
> > > Lastly it gets to be confusing when i select folders and files.. cut 
> > > files.. does that include the folders i selected?! I apreciate the 
> > > 'wordy user friendlyness' attempted, but it has only served to confuse 
> > > me in that case)
> > 
> > It might not always be a document, so perhaps changing these strings would
> > be good (in 2.1.x!).
> 
> The ui-review recommended just having Cut, Copy and Paste rather than
> appending the object type (especially as it was showing the wrong object
> type in at least one place, IIRC)... dunno why that change didn't get
> made.

What's in HEAD still says "Cut File", "Copy File" and "Paste Files". 
I've created a patch to make the Edit menu just say, "Cut", "Copy" and
"Paste".

Cheers,
  Brent

? autom4te-2.53.cache
? edit_menu.patch
? patch
? components/adapter/Nautilus_ComponentAdapterFactory_std.server.in
? components/history/Nautilus_View_history.server.in
? components/loser/content/Nautilus_View_content-loser.server.in
? components/loser/sidebar/Nautilus_View_sidebar-loser.server.in
? components/music/Nautilus_View_music.server.in
? components/notes/Nautilus_View_notes.server.in
? components/sample/Nautilus_View_sample.server.in
? components/text/Nautilus_View_text.server.in
? components/throbber/Nautilus_Control_throbber.server.in
? components/tree/Nautilus_View_tree.server.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5509
diff -u -p -u -r1.5509 ChangeLog
--- ChangeLog	15 Sep 2002 21:12:01 -0000	1.5509
+++ ChangeLog	18 Sep 2002 17:17:21 -0000
@@ -1,3 +1,9 @@
+2002-09-18  Brent Fox  <bfox redhat com>
+	* src/file-manager/fm-directory-view.c: Remove code to change strings in 
+	"Edit" menu.  The strings will no longer change if more than one file is selected
+	* src/file-manager/nautilus-directory-view-ui.xml: Remove "Files" from the strings 
+	so that the "Edit" menu reads, "Cut", "Copy", "Paste" instead of "Cut Files", etc.
+	
 2002-09-15  Dave Camp  <dave ximian com>
 
 	Fixes bug #88596.
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.548
diff -u -p -u -r1.548 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	31 Aug 2002 21:59:31 -0000	1.548
+++ src/file-manager/fm-directory-view.c	18 Sep 2002 17:17:21 -0000
@@ -4372,26 +4372,6 @@ real_update_menus (FMDirectoryView *view
 				       NAUTILUS_COMMAND_SELECT_ALL,
 				       !fm_directory_view_is_empty (view));
 
-	nautilus_bonobo_set_label
-		(view->details->ui,
-		 FM_DIRECTORY_VIEW_COMMAND_CUT_FILES,
-		 selection_count == 1
-		 ? _("Cu_t File")
-		 : _("Cu_t Files"));
-	nautilus_bonobo_set_sensitive (view->details->ui,
-				       FM_DIRECTORY_VIEW_COMMAND_CUT_FILES,
-				       can_delete_files);
-
-	nautilus_bonobo_set_label
-		(view->details->ui,
-		 FM_DIRECTORY_VIEW_COMMAND_COPY_FILES,
-		 selection_count == 1
-		 ? _("_Copy File")
-		 : _("_Copy Files"));
-	nautilus_bonobo_set_sensitive (view->details->ui,
-				       FM_DIRECTORY_VIEW_COMMAND_COPY_FILES,
-				       can_copy_files);
-
 	if (is_read_only) {
 		nautilus_bonobo_set_sensitive (view->details->ui,
 					       FM_DIRECTORY_VIEW_COMMAND_PASTE_FILES,
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.48
diff -u -p -u -r1.48 nautilus-directory-view-ui.xml
--- src/file-manager/nautilus-directory-view-ui.xml	31 Aug 2002 21:59:32 -0000	1.48
+++ src/file-manager/nautilus-directory-view-ui.xml	18 Sep 2002 17:17:21 -0000
@@ -46,13 +46,13 @@
          _label="Use _Default Background"
 	 _tip="Use the default background for this location"/>
 	<cmd name="Cut Files"
-         _label="Cu_t Files"
+         _label="Cu_t"
 	 _tip="Prepare the selected files to be moved with a Paste Files command"/>
 	<cmd name="Copy Files"
-         _label="_Copy Files"
+         _label="_Copy"
 	 _tip="Prepare the selected files to be copied with a Paste Files command"/>
 	<cmd name="Paste Files"
-         _label="_Paste Files"
+         _label="_Paste"
 	 _tip="Move or copy files previously selected by a Cut Files or Copy Files command"/>
 	<cmd name="Select All"
          _label="Select _All Files"