Add all extra accellerators and clean up ui files.

2004-11-18  Alexander Larsson  <alexl@redhat.com>

	* src/file-manager/fm-actions.h:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
	* src/file-manager/nautilus-directory-view-ui.xml:
	* src/file-manager/nautilus-icon-view-ui.xml:
	* src/file-manager/nautilus-list-view-ui.xml:
	* src/nautilus-actions.h:
	* src/nautilus-navigation-window-ui.xml:
	* src/nautilus-shell-ui.xml:
	* src/nautilus-spatial-window-ui.xml:
	* src/nautilus-spatial-window.c:
	* src/nautilus-window-menus.c:
	* src/nautilus-window.[ch]:
	Add all extra accellerators and clean up ui files.

15 files changed, 231 insertions, 398 deletions

diff --git a/ChangeLog b/ChangeLog
index b5817a2ee..010701773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2004-11-18  Alexander Larsson  <alexl@redhat.com>
 
+	* src/file-manager/fm-actions.h:
+	* src/file-manager/fm-directory-view.c:
+	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	* src/file-manager/nautilus-icon-view-ui.xml:
+	* src/file-manager/nautilus-list-view-ui.xml:
+	* src/nautilus-actions.h:
+	* src/nautilus-navigation-window-ui.xml:
+	* src/nautilus-shell-ui.xml:
+	* src/nautilus-spatial-window-ui.xml:
+	* src/nautilus-spatial-window.c:
+	* src/nautilus-window-menus.c:
+	* src/nautilus-window.[ch]:
+	Add all extra accellerators and clean up ui files.
+
+2004-11-18  Alexander Larsson  <alexl@redhat.com>
+
 	* src/nautilus-window-menus.c:
 	* src/nautilus-window-toolbars.c:
 	* libnautilus-private/nautilus-ui-utilities.[ch]:
diff --git a/src/file-manager/fm-actions.h b/src/file-manager/fm-actions.h
index 0a3b68b7a..83f13b058 100644
--- a/src/file-manager/fm-actions.h
+++ b/src/file-manager/fm-actions.h
@@ -31,6 +31,7 @@
 #define FM_ACTION_OTHER_APPLICATION2 "OtherApplication2"
 #define FM_ACTION_NEW_FOLDER "New Folder"
 #define FM_ACTION_PROPERTIES "Properties"
+#define FM_ACTION_PROPERTIES_ACCEL "PropertiesAccel"
 #define FM_ACTION_NO_TEMPLATES "No Templates"
 #define FM_ACTION_EMPTY_TRASH "Empty Trash"
 #define FM_ACTION_CUT "Cut"
@@ -44,7 +45,11 @@
 #define FM_ACTION_CREATE_LINK "Create Link"
 #define FM_ACTION_SELECT_ALL "Select All"
 #define FM_ACTION_TRASH "Trash"
+#define FM_ACTION_TRASH_ACCEL "TrashAccel"
+#define FM_ACTION_TRASH_ACCEL2 "TrashAccel2"
+#define FM_ACTION_TRASH_ACCEL3 "TrashAccel3"
 #define FM_ACTION_DELETE "Delete"
+#define FM_ACTION_DELETE_ACCEL "DeleteAccel"
 #define FM_ACTION_SHOW_HIDDEN_FILES "Show Hidden Files"
 #define FM_ACTION_RESET_BACKGROUND "Reset Background"
 #define FM_ACTION_CONNECT_TO_SERVER_LINK "Connect To Server Link"
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 57a270449..c5ff00e3d 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -5704,6 +5704,10 @@ static GtkActionEntry directory_view_entries[] = {
     N_("_Properties"), "<alt>Return",                /* label, accelerator */
     N_("View or modify the properties of each selected item"),                   /* tooltip */ 
     G_CALLBACK (action_properties_callback) },
+  { "PropertiesAccel", NULL,                  /* name, stock id */
+    "PropertiesAccel", "<control>I",                /* label, accelerator */
+    NULL,                   /* tooltip */ 
+    G_CALLBACK (action_properties_callback) },
   { "New Folder", NULL,                  /* name, stock id */
     N_("Create _Folder"), "<control><shift>N",                /* label, accelerator */
     N_("Create a new empty folder inside this folder"),                   /* tooltip */ 
@@ -5721,6 +5725,10 @@ static GtkActionEntry directory_view_entries[] = {
     N_("_Open"), "<control>o",                /* label, accelerator */
     N_("Open the selected item in this window"),                   /* tooltip */ 
     G_CALLBACK (action_open_callback) },
+  { "OpenAccel", NULL,                  /* name, stock id */
+    "OpenAccel", "<alt>Down",                /* label, accelerator */
+    NULL,                   /* tooltip */ 
+    G_CALLBACK (action_open_callback) },
   { "OpenAlternate", NULL,                  /* name, stock id */
     N_("Open in Navigation Window"), "<control><shift>o",                /* label, accelerator */
     N_("Open each selected item in a navigation window"),                   /* tooltip */ 
@@ -5787,10 +5795,26 @@ static GtkActionEntry directory_view_entries[] = {
     N_("Mo_ve to Trash"), "<control>T",                /* label, accelerator */
     N_("Move each selected item to the Trash"),                   /* tooltip */ 
     G_CALLBACK (action_trash_callback) },
+  { "TrashAccel", NULL,                  /* name, stock id */
+    "TrashAccel", "Delete",                /* label, accelerator */
+    NULL,                   /* tooltip */ 
+    G_CALLBACK (action_trash_callback) },
+  { "TrashAccel2", NULL,                  /* name, stock id */
+    "TrashAccel2", "KP_Delete",                /* label, accelerator */
+    NULL,                   /* tooltip */ 
+    G_CALLBACK (action_trash_callback) },
+  { "TrashAccel3", NULL,                  /* name, stock id */
+    "TrashAccel3", "<control>BackSpace",                /* label, accelerator */
+    NULL,                   /* tooltip */ 
+    G_CALLBACK (action_trash_callback) },
   { "Delete", NULL,                  /* name, stock id */
     N_("_Delete"), "<shift>Delete",                /* label, accelerator */
     N_("Delete each selected item, without moving to the Trash"),                   /* tooltip */ 
     G_CALLBACK (action_delete_callback) },
+  { "DeleteAccel", NULL,                  /* name, stock id */
+    "DeleteAccel", "<shift>KP_Delete",                /* label, accelerator */
+    NULL,                   /* tooltip */ 
+    G_CALLBACK (action_delete_callback) },
   { "Reset to Defaults", NULL,                  /* name, stock id */
     N_("Reset View to _Defaults"), NULL,                /* label, accelerator */
     N_("Reset sorting order and zoom level to match preferences for this view"),                   /* tooltip */ 
@@ -6242,6 +6266,17 @@ real_update_menus (FMDirectoryView *view)
 		      "tooltip", tip,
 		      NULL);
 	gtk_action_set_sensitive (action, can_delete_files);
+
+	action = gtk_action_group_get_action (view->details->dir_action_group,
+					      FM_ACTION_TRASH_ACCEL);
+	gtk_action_set_sensitive (action, can_delete_files);
+	action = gtk_action_group_get_action (view->details->dir_action_group,
+					      FM_ACTION_TRASH_ACCEL2);
+	gtk_action_set_sensitive (action, can_delete_files);
+	action = gtk_action_group_get_action (view->details->dir_action_group,
+					      FM_ACTION_TRASH_ACCEL3);
+	gtk_action_set_sensitive (action, can_delete_files);
+
 	
 	action = gtk_action_group_get_action (view->details->dir_action_group,
 					      FM_ACTION_DELETE);
@@ -6255,6 +6290,12 @@ real_update_menus (FMDirectoryView *view)
 	}
 
 	action = gtk_action_group_get_action (view->details->dir_action_group,
+					      FM_ACTION_DELETE_ACCEL);
+	gtk_action_set_sensitive (action,
+				  show_separate_delete_command && can_delete_files);
+
+	
+	action = gtk_action_group_get_action (view->details->dir_action_group,
 					      FM_ACTION_DUPLICATE);
 	gtk_action_set_sensitive (action, can_duplicate_files);
 
@@ -6279,6 +6320,11 @@ real_update_menus (FMDirectoryView *view)
 	gtk_action_set_sensitive (action,
 				  selection_count != 0 &&
 				  fm_directory_view_supports_properties (view));
+	action = gtk_action_group_get_action (view->details->dir_action_group,
+					      FM_ACTION_PROPERTIES_ACCEL);
+	gtk_action_set_sensitive (action,
+				  selection_count != 0 &&
+				  fm_directory_view_supports_properties (view));
 
 	action = gtk_action_group_get_action (view->details->dir_action_group,
 					      FM_ACTION_EMPTY_TRASH);
diff --git a/src/file-manager/nautilus-desktop-icon-view-ui.xml b/src/file-manager/nautilus-desktop-icon-view-ui.xml
index 470e5d5b9..c78e21ed1 100644
--- a/src/file-manager/nautilus-desktop-icon-view-ui.xml
+++ b/src/file-manager/nautilus-desktop-icon-view-ui.xml
@@ -14,7 +14,6 @@
                 </placeholder>
         </placeholder>
 </popup>
-
 <popup name="selection">
         <placeholder name="Empty Trash Holder">
                 <menuitem name="Empty Trash" action="Empty Trash Conditional"/>
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index 205a0496f..6cfea27c5 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -1,266 +1,112 @@
 <ui>
-<!--
-<commands>
-	<cmd name="Rename"
-         _label="_Rename..."
-	 _tip="Rename selected item"/>
-	<cmd name="Create Link"
-         _label="Ma_ke Link"
-	 _tip="Create a symbolic link for each selected item"/>
-	<cmd name="Delete"
-         _label="_Delete"
-	 _tip="Delete each selected item, without moving to the Trash"/>
-	<cmd name="Duplicate"
-         _label="D_uplicate"
-	 _tip="Duplicate each selected item"/>
-	<cmd name="Empty Trash"
-         _label="_Empty Trash"
-	 _tip="Delete all items in the Trash"/>
-	<cmd name="New Folder"
-         _label="Create _Folder"
-	 _tip="Create a new empty folder inside this folder"/>
-	<cmd name="New Empty File"
-         _label="_Empty File"
-	 _tip="Create a new empty file inside this folder"/>
-        <cmd name="New Launcher"
-         _label="Create L_auncher"
-         _tip="Create a new launcher"/>
-        <cmd name="Edit Launcher"
-         _label="Edit Launcher"
-         _tip="Edit the launcher information"/>
-	<cmd name="Open"
-         _label="_Open"
-	 _tip="Open the selected item in this window"/>
-	<cmd name="OpenAlternate"
-         _label="Open in Navigation Window"
-	 _tip="Open each selected item in a navigation window"/>
-	<cmd name="Open Scripts Folder"
-         _label="_Open Scripts Folder"
-	 _tip="Show the folder containing the scripts that appear in this menu"/>
-	<cmd name="OtherApplication"
-         _label="Open with Other _Application..."
-	 _tip="Choose another application with which to open the selected item"/>
-	<cmd name="Show Hidden Files"
-         _label="Show _Hidden Files"
-	 _tip="Toggles the display of hidden files in the current window"/>
-	<cmd name="Reset to Defaults"
-         _label="Reset View to _Defaults"
-	 _tip="Reset sorting order and zoom level to match preferences for this view"/>
-	<cmd name="Reset Background"
-         _label="Use _Default Background"
-	 _tip="Use the default background for this location"/>
-	<cmd name="Cut"
-         _label="Cu_t Files"
-	 _tip="Prepare the selected files to be moved with a Paste Files command"/>
-	<cmd name="Copy"
-         _label="_Copy Files"
-	 _tip="Prepare the selected files to be copied with a Paste Files command"/>
-	<cmd name="Paste"
-         _label="_Paste Files"
-	 _tip="Move or copy files previously selected by a Cut Files or Copy Files command"/>
-	<cmd name="Paste Files Into"
-         _label="_Paste Files Into Folder"
-	 _tip="Move or copy files previously selected by a Cut Files or Copy Files command into the selected folder"/>
-	<cmd name="Select All"
-         _label="Select _All Files"
-	 _tip="Select all items in this window"/>
-	<cmd name="Select Pattern"
-         _label="Select _Pattern"
-	 _tip="Select items in this window matching a given pattern"/>
-	<cmd name="Properties"
-         _label="_Properties"
-	 _tip="View or modify the properties of each selected item"/>
-	<cmd name="Trash"
-         _label="Mo_ve to Trash"
-	 _tip="Move each selected item to the Trash"/>
-	<cmd name="Unmount Volume Conditional"
-         _label="_Unmount Volume"
-         _tip="Unmount the selected volume"/>
-	<cmd name="Mount Volume Conditional"
-         _label="_Mount Volume"
-         _tip="Mount the selected volume"/>
-        <cmd name="Format Conditional"
-         _label="_Format"
-         _tip="Format the selected volume"/>
-        <cmd name="Protect Conditional"
-         _label="Prot_ect"
-         _tip="Protect the selected volume"/>
-        <cmd name="Media Properties Conditional"
-         _label="Medi_a Properties"
-         _tip="Show media properties for the selected volume"/>
-        <cmd name="Connect To Server Link Conditional"
-         _label="Connect To This Server"
-         _tip="Make a permanent connection to this server"/>
-</commands>
--->
-<!--
-<keybindings>
-	<accel name="*Control*BackSpace" action="Trash"/>
-	<accel name="*Control*T" action="Trash"/>
-	<accel name="KP_Delete" action="Trash"/>
-	<accel name="Delete" action="Trash"/>
-	<accel name="*Shift*KP_Delete" action="Delete"/>
-	<accel name="*Shift*Delete" action="Delete"/>
-        <accel name="*Alt*Down" action="Open"/>
-        <accel name="*Alt**Shift*Down" action="OpenCloseParent"/>
-	<accel name="*Control*i" action="Properties"/>
-	<accel name="*Shift**Control*n" action="New Folder"/>
-	<accel name="*Control*o" action="Open"/>
-	<accel name="*Control**Shift*o" action="OpenAlternate"/>
-	<accel name="*Alt*Return" action="Properties"/>
-	<accel name="*Control*x" action="Cut"/>
-	<accel name="*Control*c" action="Copy"/>
-	<accel name="*Control*v" action="Paste"/>
-	<accel name="*Control*m" action="Create Link"/>
-	<accel name="F2" action="Rename"/>
-	<accel name="*Control*a" action="Select All"/>
-	<accel name="*Control*s" action="Select Pattern"/>
-</keybindings>
--->
-
+<accelerator action="OpenAccel"/>
 <accelerator action="OpenCloseParent"/>
-
+<accelerator action="PropertiesAccel"/>
+<accelerator action="TrashAccel"/>
+<accelerator action="TrashAccel2"/>
+<accelerator action="TrashAccel3"/>
 <menubar name="MenuBar">
 	<menu action="File">
 		<placeholder name="New Items Placeholder">
-			<menuitem name="New Folder"
-				  action="New Folder"/>
+			<menuitem name="New Folder" action="New Folder"/>
 			<menu action="New Documents">
-			         <menuitem name="No Templates"
-					   action="No Templates"/>
+			         <menuitem name="No Templates" action="No Templates"/>
 				 <placeholder name="New Documents Placeholder"/>
 				 <separator name="After New Documents"/>
-				 <menuitem name="New Empty File" 
-				 	   action="New Empty File"/>
+				 <menuitem name="New Empty File" action="New Empty File"/>
 			</menu>
-			<menuitem name="New Launcher"
-				  action="New Launcher"/>
+			<menuitem name="New Launcher" action="New Launcher"/>
 		</placeholder>
 		<placeholder name="Open Placeholder">
-			<menuitem name="Open"
-				  action="Open"/>
-			<menuitem name="OpenAlternate"
-				  action="OpenAlternate"/>
+			<menuitem name="Open" action="Open"/>
+			<menuitem name="OpenAlternate" action="OpenAlternate"/>
 			<placeholder name="Applications Placeholder">
                         </placeholder>
 			<menu action="Open With">
 				<placeholder name="Applications Placeholder"/>
 				<separator/>
-				<menuitem name="OtherApplication"
-					  action="OtherApplication1"/>
+				<menuitem name="OtherApplication" action="OtherApplication1"/>
 			</menu>
 			<placeholder name="OtherApplicationPlaceholder">
-				<menuitem name="OtherApplication"
-					  action="OtherApplication2"/>
+				<menuitem name="OtherApplication" action="OtherApplication2"/>
 			</placeholder>
 			<menuitem name="Edit Launcher"
 				  action="Edit Launcher"/>
 			<menu action="Scripts">
 				 <placeholder name="Scripts Placeholder"/>
 				 <separator name="After Scripts"/>
-				 <menuitem name="Open Scripts Folder" 
-				 	   action="Open Scripts Folder"/>
+				 <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
 			</menu>
 		</placeholder>
-
 		<placeholder name="File Items Placeholder">
-			<menuitem name="Properties"
-				  action="Properties"/>
+			<menuitem name="Properties" action="Properties"/>
 		</placeholder>
 		<placeholder name="Global File Items Placeholder">
-			<menuitem name="Empty Trash"
-				  action="Empty Trash"/>
+			<menuitem name="Empty Trash" action="Empty Trash"/>
 		</placeholder>
 	</menu>
-
 	<menu action="Edit">
 		<placeholder name="Clipboard Actions">
-			<menuitem name="Cut"
-			          action="Cut"/>
-			<menuitem name="Copy"
-			          action="Copy"/>
-			<menuitem name="Paste"
-			          action="Paste"/>
+			<menuitem name="Cut" action="Cut"/>
+			<menuitem name="Copy" action="Copy"/>
+			<menuitem name="Paste" action="Paste"/>
 		</placeholder>
-
 		<placeholder name="Select Items">
-		<menuitem name="Select All"
-			  action="Select All"/>
-		<menuitem name="Select Pattern"
-			  action="Select Pattern"/>
+		<menuitem name="Select All" action="Select All"/>
+		<menuitem name="Select Pattern" action="Select Pattern"/>
 		</placeholder>
-
 		<placeholder name="File Items Placeholder">
-			<menuitem name="Duplicate"
-				  action="Duplicate"/>
-			<menuitem name="Create Link"
-				  action="Create Link"/>
-			<menuitem name="Rename"
-				  action="Rename"/>
+			<menuitem name="Duplicate" action="Duplicate"/>
+			<menuitem name="Create Link" action="Create Link"/>
+			<menuitem name="Rename"action="Rename"/>
 		</placeholder>
-
 		<placeholder name="Dangerous File Items Placeholder">
-			<menuitem name="Trash"
-				  action="Trash"/>
-			<menuitem name="Delete"
-				  action="Delete"/>
+			<menuitem name="Trash" action="Trash"/>
+			<menuitem name="Delete" action="Delete"/>
 		</placeholder>
-
 		<placeholder name="Extension Actions"/>
 	</menu>
-
 	<menu action="View">
 		<placeholder name="View Preferences Placeholder">
-			<menuitem name="Reset to Defaults"
-				  action="Reset to Defaults"/>
-			<menuitem name="Show Hidden Files"
-				  action="Show Hidden Files"/>
+			<menuitem name="Reset to Defaults" action="Reset to Defaults"/>
+			<menuitem name="Show Hidden Files" action="Show Hidden Files"/>
 		</placeholder>
 	</menu>
 </menubar>
 <popup name="background">
 	<placeholder name="Before Zoom Items">
 		<placeholder name="New Object Items">
-			<menuitem name="New Folder" 
-			 	  action="New Folder"/>
-			<menuitem name="New Launcher"
-			 	  action="New Launcher"/>
+			<menuitem name="New Folder" action="New Folder"/>
+			<menuitem name="New Launcher" action="New Launcher"/>
 			<menu action="New Documents">
-		         	<menuitem name="No Templates"
-			                  action="No Templates"/>
+		         	<menuitem name="No Templates" action="No Templates"/>
 			 	<placeholder name="New Documents Placeholder"/>
 			 	<separator name="After New Documents"/>
-			 	<menuitem name="New Empty File" 
-			 	          action="New Empty File"/>
+			 	<menuitem name="New Empty File" action="New Empty File"/>
 			</menu>
                 	<menu action="Scripts">
 			 	<placeholder name="Scripts Placeholder"/>
 			 	<separator name="After Scripts"/>
-			 	<menuitem name="Open Scripts Folder"
-				          action="Open Scripts Folder"/>
+			 	<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
 			</menu>
 		</placeholder>
 		<separator/>
 		<placeholder name="View Items"/>
 		<separator/>
 		<placeholder name="File Clipboard Actions">
-			<menuitem name="Paste"
-			 	  action="Paste"/>
+			<menuitem name="Paste" action="Paste"/>
 		</placeholder>
 	</placeholder>
 	<placeholder name="After Zoom Items">
 		<placeholder name="Background Items">
-			<menuitem name="Use Default Background"
-			          action="Reset Background"/>
+			<menuitem name="Use Default Background" action="Reset Background"/>
 		</placeholder>
 	</placeholder>
 </popup>
-	
 <popup name="selection">
 	<placeholder name="Open Placeholder">
 		<menuitem name="Open" action="Open"/>
-		<menuitem name="OpenAlternate" 
-		          action="OpenAlternate"/>
+		<menuitem name="OpenAlternate" action="OpenAlternate"/>
 		<separator/>
 		<placeholder name="Applications Placeholder"/>
 		<menu action="Open With">
@@ -269,27 +115,20 @@
 			<menuitem name="OtherApplication" action="OtherApplication1"/>
 		</menu>
 		<placeholder name="OtherApplicationPlaceholder">
-		        <menuitem name="OtherApplication"
-				  action="OtherApplication2"/>
+		        <menuitem name="OtherApplication2" action="OtherApplication2"/>
 		</placeholder>
-		<menuitem name="Edit Launcher"
-			  action="Edit Launcher"/>
+		<menuitem name="Edit Launcher" action="Edit Launcher"/>
 		<menu action="Scripts">
 			 <placeholder name="Scripts Placeholder"/>
 			 <separator name="After Scripts"/>
-			 <menuitem name="Open Scripts Folder"
-				   action="Open Scripts Folder"/>
+			 <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
 		</menu>
-
 	</placeholder>
 	<separator/>
 	<placeholder name="File Clipboard Actions">
-		<menuitem name="Cut" 
-		          action="Cut"/>
-		<menuitem name="Copy" 
-		          action="Copy"/>
-		<menuitem name="Paste Files Into" 
-		          action="Paste Files Into"/>
+		<menuitem name="Cut" action="Cut"/>
+		<menuitem name="Copy" action="Copy"/>
+		<menuitem name="Paste Files Into" action="Paste Files Into"/>
 	</placeholder>
 	<separator/>
 	<placeholder name="File Actions">
@@ -298,21 +137,16 @@
 	</placeholder>
 	<separator/>
 	<placeholder name="Dangerous File Actions">
-		<menuitem name="Trash" 
-		          action="Trash"/>
+		<menuitem name="Trash" action="Trash"/>
 		<menuitem name="Delete" action="Delete"/>
 	</placeholder>
-
 	<separator/>
 	<placeholder name="Icon Appearance Items">
 	</placeholder>
-
 	<separator/>
 	<placeholder name="Extension Actions"/>
         <separator/>
-
-        <menuitem name="Properties"
-                  action="Properties"/>
+        <menuitem name="Properties" action="Properties"/>
 	<separator/>
         <placeholder name="Removabel Media Holder">
 		<menuitem name="Mount Volume" action="Mount Volume"/>
diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/file-manager/nautilus-icon-view-ui.xml
index dde7078c2..82d4f05ab 100644
--- a/src/file-manager/nautilus-icon-view-ui.xml
+++ b/src/file-manager/nautilus-icon-view-ui.xml
@@ -2,40 +2,27 @@
 <menubar name="MenuBar">
 	<menu action="Edit">
 		<placeholder name="Edit Items Placeholder">
-			<menuitem name="Stretch"
-				  action="Stretch"/>
-			<menuitem name="Unstretch"
-				  action="Unstretch"/>
+			<menuitem name="Stretch" action="Stretch"/>
+			<menuitem name="Unstretch" action="Unstretch"/>
 		</placeholder>
-
 	</menu>
 	<menu action="View">
 		<placeholder name="View Items Placeholder">
 			<menu action="Arrange Items">
-				<menuitem name="Manual Layout"
-					  action="Manual Layout"/>
+				<menuitem name="Manual Layout" action="Manual Layout"/>
 				<placeholder name="Auto Layout">
-					<menuitem name="Sort by Name"
-						  action="Sort by Name"/>
-					<menuitem name="Sort by Size"
-						  action="Sort by Size"/>
-					<menuitem name="Sort by Type"
-						  action="Sort by Type"/>
-					<menuitem name="Sort by Modification Date" 
-						  action="Sort by Modification Date"/>
-					<menuitem name="Sort by Emblems"
-						  action="Sort by Emblems"/>
+					<menuitem name="Sort by Name" action="Sort by Name"/>
+					<menuitem name="Sort by Size" action="Sort by Size"/>
+					<menuitem name="Sort by Type" action="Sort by Type"/>
+					<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
+					<menuitem name="Sort by Emblems" action="Sort by Emblems"/>
 				</placeholder>
 				<separator/>
-				<menuitem name="Tighter Layout"
-                                          action="Tighter Layout"/>
-				<menuitem name="Reversed Order"
-                                          action="Reversed Order"/>
+				<menuitem name="Tighter Layout" action="Tighter Layout"/>
+				<menuitem name="Reversed Order" action="Reversed Order"/>
 			</menu>
-			<menuitem name="Clean Up"
-				  action="Clean Up"/>
-			<menuitem name="Keep Aligned" 
-	                          action="Keep Aligned"/>
+			<menuitem name="Clean Up" action="Clean Up"/>
+			<menuitem name="Keep Aligned" action="Keep Aligned"/>
 		</placeholder>
 		
 	</menu>
@@ -44,34 +31,24 @@
 	<placeholder name="Before Zoom Items">
 		<placeholder name="View Items">
 			<menu action="Arrange Items">
-				<menuitem name="Manual Layout"
-					  action="Manual Layout"/>
+				<menuitem name="Manual Layout" action="Manual Layout"/>
 				<placeholder name="Auto Layout">
-					<menuitem name="Sort by Name"
-						  action="Sort by Name"/>
-					<menuitem name="Sort by Size"
-						  action="Sort by Size"/>
-					<menuitem name="Sort by Type"
-						  action="Sort by Type"/>
-					<menuitem name="Sort by Modification Date" 
-						  action="Sort by Modification Date"/>
-					<menuitem name="Sort by Emblems"
-						  action="Sort by Emblems"/>
+					<menuitem name="Sort by Name" action="Sort by Name"/>
+					<menuitem name="Sort by Size" action="Sort by Size"/>
+					<menuitem name="Sort by Type" action="Sort by Type"/>
+					<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
+					<menuitem name="Sort by Emblems" action="Sort by Emblems"/>
 				</placeholder>
 				<separator/>
-				<menuitem name="Tighter Layout" 
-                                          action="Tighter Layout"/>
-				<menuitem name="Reversed Order" 
-                                          action="Reversed Order"/>
+				<menuitem name="Tighter Layout" action="Tighter Layout"/>
+				<menuitem name="Reversed Order" action="Reversed Order"/>
 			</menu>
 			<menuitem name="Clean Up" action="Clean Up"/>
-			<menuitem name="Keep Aligned" 
-                                        action="Keep Aligned"/>
+			<menuitem name="Keep Aligned" action="Keep Aligned"/>
 		</placeholder>
 	</placeholder>
 </popup>
 <popup name="selection">
-	<placeholder name="Icon Appearance Items">
-	</placeholder>
+	<placeholder name="Icon Appearance Items"/>
 </popup>
 </ui>
diff --git a/src/file-manager/nautilus-list-view-ui.xml b/src/file-manager/nautilus-list-view-ui.xml
index b6f847ea6..ad9e6255e 100644
--- a/src/file-manager/nautilus-list-view-ui.xml
+++ b/src/file-manager/nautilus-list-view-ui.xml
@@ -2,10 +2,8 @@
 <menubar name="MenuBar">
 	<menu action="View">
 		<placeholder name="View Items Placeholder">
-			<menuitem name="Visible Columns"
-				  action="Visible Columns"/>
+			<menuitem name="Visible Columns" action="Visible Columns"/>
 		</placeholder>
-		
 	</menu>
 </menubar>
 </ui>
diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
index c27af81dc..78cb1414c 100644
--- a/src/nautilus-actions.h
+++ b/src/nautilus-actions.h
@@ -30,6 +30,10 @@
 #define NAUTILUS_ACTION_RELOAD "Reload"
 #define NAUTILUS_ACTION_BACK "Back"
 #define NAUTILUS_ACTION_UP "Up"
+#define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
+#define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
+#define NAUTILUS_ACTION_UP_CLOSE_ACCEL "UpCloseAccel"
+#define NAUTILUS_ACTION_UP_CLOSE_ACCEL2 "UpCloseAccel2"
 #define NAUTILUS_ACTION_FORWARD "Forward"
 #define NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR "Show Hide Sidebar"
 #define NAUTILUS_ACTION_SHOW_HIDE_STATUSBAR "Show Hide Statusbar"
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index da00abe07..9cbf9099c 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -1,105 +1,61 @@
 <ui>
-
-<!--
-	<cmd name="Back" accel="*Alt*Left"
-	 _tip="Go to the previous visited location"/>
-	<cmd name="Forward" accel="*Alt*Right"
-	 _tip="Go to the next visited location"/>
--->
-
 <menubar name="MenuBar">
 	<menu action="File">
 		<placeholder name="New Items Placeholder">
-			<menuitem name="New Window"
-				  action="New Window"/>
+			<menuitem name="New Window" action="New Window"/>
 		</placeholder>
 		
 		<placeholder name="Close Items Placeholder">
-			<menuitem name="Close All Windows"
-			          action="Close All Windows"/>
+			<menuitem name="Close All Windows" action="Close All Windows"/>
 		</placeholder>
 	</menu>
 	<menu action="View">
 		<placeholder name="Show Hide Placeholder">
-			<menuitem name="Show Hide Sidebar" 
-				  action="Show Hide Sidebar"/>
-			<menuitem name="Show Hide Location Bar" 
-				  action="Show Hide Location Bar"/>
-			<menuitem name="Show Hide Statusbar" 
-				  action="Show Hide Statusbar"/>
+			<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
+			<menuitem name="Show Hide Location Bar" action="Show Hide Location Bar"/>
+			<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
 		</placeholder>
 	</menu>
-
         <placeholder name="Other Menus">
 	        <menu action="Go">
                         <placeholder name="Navigation Items">
-			<menuitem name="Up" 
-			  	action="Up"/>
-			<menuitem name="Back" 
-				  action="Back"/>
-			<menuitem name="Forward" 
-				  action="Forward"/>
+			<menuitem name="Up" action="Up"/>
+			<menuitem name="Back" action="Back"/>
+			<menuitem name="Forward"  action="Forward"/>
 	                </placeholder>
 	                <separator/>
-			<menuitem name="Home" 
-				  action="Home"/>
-			<menuitem name="Computer" 
-				  action="Go to Computer"/>
-			<menuitem name="Go to Templates"
-				  action="Go to Templates"/>
-			<menuitem name="Go to Trash"
-				  action="Go to Trash"/>
-			<menuitem name="Go to Burn CD"
-				  action="Go to Burn CD"/>
-			<menuitem name="Go to Location"
-				  action="Go to Location"/>
-
+			<menuitem name="Home" action="Home"/>
+			<menuitem name="Computer" action="Go to Computer"/>
+			<menuitem name="Go to Templates" action="Go to Templates"/>
+			<menuitem name="Go to Trash" action="Go to Trash"/>
+			<menuitem name="Go to Burn CD" action="Go to Burn CD"/>
+			<menuitem name="Go to Location" action="Go to Location"/>
 			<separator/>
-
-			<menuitem name="Clear History" 
-				  action="Clear History"/>
+			<menuitem name="Clear History" action="Clear History"/>
 			<separator/>
 			<placeholder name="History Placeholder"/>
 		</menu>
-
 		<menu action="Bookmarks">
-			<menuitem name="Add Bookmark" 
-				  action="Add Bookmark"/>
-			<menuitem name="Edit Bookmark" 
-				  action="Edit Bookmarks"/>
-
+			<menuitem name="Add Bookmark" action="Add Bookmark"/>
+			<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
 			<separator/>
 			<placeholder name="Bookmarks Placeholder"/>
 		</menu>
         </placeholder>
 </menubar>
-
 <toolbar name="Toolbar">
+	<toolitem name="Back" action="Back"/>
+	<toolitem name="Forward" action="Forward"/>
 
-	<toolitem name="Back"
-	          action="Back"/>
-	<toolitem name="Forward"
-	          action="Forward"/>
-
-	<toolitem name="Up"
-	          action="Up"/>
-	<toolitem name="Stop"
-	          action="Stop"/>
-	<toolitem name="Reload"
-		  action="Reload"/>
+	<toolitem name="Up" action="Up"/>
+	<toolitem name="Stop" action="Stop"/>
+	<toolitem name="Reload" action="Reload"/>
 	<separator/>
-
-	<toolitem name="Home"
-		  action="Home"/>
-	<toolitem name="Computer"
-		  action="Go to Computer"/>
+	<toolitem name="Home" action="Home"/>
+	<toolitem name="Computer" action="Go to Computer"/>
 
 	<placeholder name="Extra Buttons Placeholder">
 	          <placeholder name="Extension Actions"/>
         </placeholder>
-<!--
-	<control name="SpaceWrapper" behavior="expandable"/>
-	<control name="ThrobberWrapper" behavior="pack-end"/>
--->
 </toolbar>
 </ui>
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 41e8c6371..276efcdcd 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -1,21 +1,13 @@
 <ui>
-<!--
-<accelerator action="Zoom In"/>
-<accelerator action="Zoom In"/>
-<accelerator action="Up"/>
-<accelerator action="Reload"/>
--->
-
+<accelerator action="UpAccel"/>
 <menubar name="MenuBar">
 	<menu action="File">
-
 		<placeholder name="New Items Placeholder"/>
 		<separator/>
 		<placeholder name="Open Placeholder"/>
 		<separator/>
 		<placeholder name="Location Placeholder"/>
-		<menuitem name="Connect to Server"
-			  action="Connect to Server"/>
+		<menuitem name="Connect to Server" action="Connect to Server"/>
 		<separator/>
 		<placeholder name="File Items Placeholder"/>
 		<separator/>
@@ -23,21 +15,14 @@
 		<separator/>
 		<placeholder name="Extension Actions"/>
 		<separator/>
-
                 <placeholder name="Close Items Placeholder"/>
-
-		<menuitem name="Close"
-                          action="Close"/>
+		<menuitem name="Close" action="Close"/>
 	</menu>
-
 	<menu action="Edit">
 		<placeholder name="Clipboard Actions">
                 </placeholder>
-
 		<separator/>
-
 		<placeholder name="Select Items"/>
-				
 		<separator/>
 		<placeholder name="File Items Placeholder"/>
 		<separator/>
@@ -45,33 +30,26 @@
 		<separator/>
 		<placeholder name="Edit Items Placeholder"/>
 		<placeholder name="Global Edit Items Placeholder"/>
-		
 		<separator/>
 		<placeholder name="Extension Actions"/>
 		<separator/>
 		<menuitem name="Backgrounds and Emblems" action="Backgrounds and Emblems"/>
 		<menuitem name="Preferences" action="Preferences"/>
 	</menu>
-
 	<menu action="View">
 		<menuitem name="Stop" action="Stop"/>
 		<menuitem name="Reload" action="Reload"/>
-
 		<separator/>
 		<placeholder name="Show Hide Placeholder"/>
-
 		<separator/>
 		<placeholder name="View Preferences Placeholder"/>
 		<separator/>
 		<placeholder name="View Items Placeholder"/>
 		<separator/>
 		<placeholder name="Zoom Items Placeholder">
-			<menuitem name="Zoom In"
-				  action="Zoom In"/>
-			<menuitem name="Zoom Out"
-				  action="Zoom Out"/>
-			<menuitem name="Zoom Normal"
-				  action="Zoom Normal"/>
+			<menuitem name="Zoom In" action="Zoom In"/>
+			<menuitem name="Zoom Out" action="Zoom Out"/>
+			<menuitem name="Zoom Normal" action="Zoom Normal"/>
 		</placeholder>
 		<placeholder name="View Choices">
 		        <separator/>
@@ -80,17 +58,12 @@
 			<placeholder name="Short List"/>
 		</placeholder>
 	</menu>
-		
 	<placeholder name="Other Menus"/>
-
 	<menu action="Help">
-		<menuitem name="Nautilus Manual"
-			  action="Nautilus Manual"/>
-		<menuitem name="About Nautilus"
-			  action="About Nautilus"/>
+		<menuitem name="Nautilus Manual" action="Nautilus Manual"/>
+		<menuitem name="About Nautilus" action="About Nautilus"/>
 	</menu>
 </menubar>
-
 <popup name="background">
 	<placeholder name="Before Zoom Items">
 		<placeholder name="New Window Items"/>
@@ -100,15 +73,11 @@
 	</placeholder>
         <separator/>
 	<placeholder name="Zoom Items">
-		<menuitem name="Zoom In" 
-		          action="Zoom In"/>
-		<menuitem name="Zoom Out" 
-		          action="Zoom Out"/>
-		<menuitem name="Zoom Normal" 
-		          action="Zoom Normal"/>
+		<menuitem name="Zoom In" action="Zoom In"/>
+		<menuitem name="Zoom Out" action="Zoom Out"/>
+		<menuitem name="Zoom Normal" action="Zoom Normal"/>
 	</placeholder>
         <separator/>
 	<placeholder name="After Zoom Items"/>
 </popup>
-
 </ui>
diff --git a/src/nautilus-spatial-window-ui.xml b/src/nautilus-spatial-window-ui.xml
index 4b003990d..e6b1dfe7e 100644
--- a/src/nautilus-spatial-window-ui.xml
+++ b/src/nautilus-spatial-window-ui.xml
@@ -1,40 +1,25 @@
 <ui>
-
-<accelerator action="Go Up Close"/>
-<!--
-<accelerator action="Home"/>
--->
-
+<accelerator action="UpCloseAccel"/>
+<accelerator action="UpCloseAccel2"/>
 <menubar name="MenuBar">
 	<menu action="File">
 		<placeholder name="Location Placeholder">
-			<menuitem name="Up"
-			  action="Up"/>
-		        <menuitem name="Go to Location"
-			  action="Go to Location"/>
+			<menuitem name="Up" action="Up"/>
+		        <menuitem name="Go to Location"  action="Go to Location"/>
 		</placeholder>
 		<placeholder name="Close Items Placeholder">
-			<menuitem name="Close Parent Folders"
-			  action="Close Parent Folders"/>
-			<menuitem name="Close All Folders"
-			  action="Close All Folders"/>
+			<menuitem name="Close Parent Folders" action="Close Parent Folders"/>
+			<menuitem name="Close All Folders" action="Close All Folders"/>
 		</placeholder>
 	</menu>
-
         <placeholder name="Other Menus">
 	        <menu action="Places">
-		      <menuitem name="Home" 
-			        action="Home"/>
-		      <menuitem name="Go to Computer"
-			        action="Go to Computer"/>
- 		      <menuitem name="Go to Templates"
-			        action="Go to Templates"/>
-		      <menuitem name="Go to Trash"
-			        action="Go to Trash"/>
-		      <menuitem name="Go to Burn CD"
-			        action="Go to Burn CD"/>
+		      <menuitem name="Home" action="Home"/>
+		      <menuitem name="Go to Computer" action="Go to Computer"/>
+ 		      <menuitem name="Go to Templates" action="Go to Templates"/>
+		      <menuitem name="Go to Trash" action="Go to Trash"/>
+		      <menuitem name="Go to Burn CD" action="Go to Burn CD"/>
 	         </menu>
         </placeholder>
 </menubar>
-
 </ui>
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 7bb34a0d4..b34182d8a 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -31,6 +31,7 @@
 #include "nautilus-spatial-window.h"
 #include "nautilus-window-private.h"
 
+#include "nautilus-actions.h"
 #include "nautilus-application.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-bookmarks-window.h"
@@ -367,6 +368,30 @@ real_window_close (NautilusWindow *window)
 	nautilus_spatial_window_save_show_hidden_files_mode (NAUTILUS_SPATIAL_WINDOW (window));
 }
 
+static void
+real_allow_up (NautilusWindow *nautilus_window, gboolean allow)
+{
+	GtkAction *action;
+	NautilusSpatialWindow *window;
+
+	window = NAUTILUS_SPATIAL_WINDOW (nautilus_window);
+	
+	EEL_CALL_PARENT (NAUTILUS_WINDOW_CLASS, allow_up,
+			 (nautilus_window, allow));
+
+	action = gtk_action_group_get_action (window->details->spatial_action_group,
+					      NAUTILUS_ACTION_UP_CLOSE_ACCEL);
+	if (action != NULL) {
+		gtk_action_set_sensitive (action, allow);
+	}
+	action = gtk_action_group_get_action (window->details->spatial_action_group,
+					      NAUTILUS_ACTION_UP_CLOSE_ACCEL2);
+	if (action != NULL) {
+		gtk_action_set_sensitive (action, allow);
+	}
+}
+
+
 static void 
 real_get_default_size (NautilusWindow *window,
 		       guint *default_width, guint *default_height)
@@ -590,9 +615,12 @@ static GtkActionEntry spatial_entries[] = {
   { "Close All Folders", NULL, N_("Clos_e All Folders"), /* name, stock id, label */
     "<control>Q", N_("Close all folder windows"),
     G_CALLBACK (action_close_all_folders_callback) },
-  { "Go Up Close", NULL, N_("Go up and close the current window"), /* name, stock id, label */
+  { "UpCloseAccel", NULL, N_("Go up and close the current window"), /* name, stock id, label */
     "<alt><shift>Up", NULL,
     G_CALLBACK (action_go_up_close_callback) },
+  { "UpCloseAccel2", NULL, N_("Go up and close the current window"), /* name, stock id, label */
+    "<shift>BackSpace", NULL,
+    G_CALLBACK (action_go_up_close_callback) },
 };
 
 static void
@@ -698,6 +726,7 @@ nautilus_spatial_window_class_init (NautilusSpatialWindowClass *class)
 	NAUTILUS_WINDOW_CLASS (class)->close = 
 		real_window_close;
 	NAUTILUS_WINDOW_CLASS(class)->get_default_size = real_get_default_size;
+	NAUTILUS_WINDOW_CLASS(class)->allow_up = real_allow_up;
 
 	NAUTILUS_WINDOW_CLASS(class)->set_throbber_active =
 		real_set_throbber_active;
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index bc5370743..b1bd96ebd 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -591,6 +591,9 @@ static GtkActionEntry main_entries[] = {
   { "Up", GTK_STOCK_GO_UP, N_("Open _Parent"),               /* name, stock id, label */
     "<alt>Up", N_("Open the parent folder"),
     G_CALLBACK (action_up_callback) },
+  { "UpAccel", NULL, "UpAccel",               /* name, stock id, label */
+    "BackSpace", NULL,
+    G_CALLBACK (action_up_callback) },
   { "Stop", GTK_STOCK_STOP,                        /* name, stock id */
     N_("_Stop"), NULL,           /* label, accelerator */
     NULL,                                      /* tooltip */ 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1dc3171cc..63a6e8315 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -287,8 +287,8 @@ nautilus_window_go_up (NautilusWindow *window, gboolean close_behind)
 	eel_g_list_free_deep (selection);
 }
 
-void
-nautilus_window_allow_up (NautilusWindow *window, gboolean allow)
+static void
+real_nautilus_window_allow_up (NautilusWindow *window, gboolean allow)
 {
 	GtkAction *action;
 	
@@ -297,7 +297,16 @@ nautilus_window_allow_up (NautilusWindow *window, gboolean allow)
 	action = gtk_action_group_get_action (window->details->main_action_group,
 					      NAUTILUS_ACTION_UP);
 	gtk_action_set_sensitive (action, allow);
+	action = gtk_action_group_get_action (window->details->main_action_group,
+					      NAUTILUS_ACTION_UP_ACCEL);
+	gtk_action_set_sensitive (action, allow);
+}
 
+void
+nautilus_window_allow_up (NautilusWindow *window, gboolean allow)
+{
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+			 allow_up, (window, allow));
 }
 
 void
@@ -1461,6 +1470,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 	class->set_title = real_set_title;
 	class->set_content_view_widget = real_set_content_view_widget;
 	class->load_view_as_menu = real_load_view_as_menu;
+	class->allow_up = real_nautilus_window_allow_up;
 
 	g_object_class_install_property (G_OBJECT_CLASS (class),
 					 ARG_APP_ID,
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 761fbe503..f4a768490 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -75,6 +75,7 @@ typedef struct {
         void   (* prompt_for_location) (NautilusWindow *window);
         void   (* get_default_size) (NautilusWindow *window, guint *default_width, guint *default_height);
         void   (* close) (NautilusWindow *window);
+        void   (* allow_up) (NautilusWindow *window, gboolean allow);
 } NautilusWindowClass;
 
 typedef enum {