Remove old defines

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

	* src/file-manager/fm-desktop-icon-view.c:
	* src/nautilus-navigation-window.c:
	* src/nautilus-desktop-window.c:
	Remove old defines

	* src/file-manager/fm-directory-view.c:
	* src/file-manager/nautilus-directory-view-ui.xml:
	* src/nautilus-navigation-window-ui.xml:
	* src/nautilus-shell-ui.xml:
	Make the menus look like pre-bonobo-removal

8 files changed, 94 insertions, 105 deletions

diff --git a/ChangeLog b/ChangeLog
index 71cde5f4b..c7162d556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2004-11-17  Alexander Larsson  <alexl@redhat.com>
 
+	* src/file-manager/fm-desktop-icon-view.c:
+	* src/nautilus-navigation-window.c:
+	* src/nautilus-desktop-window.c:
+	Remove old defines
+
+	* src/file-manager/fm-directory-view.c:
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	* src/nautilus-navigation-window-ui.xml:
+	* src/nautilus-shell-ui.xml:
+	Make the menus look like pre-bonobo-removal
+
+2004-11-17  Alexander Larsson  <alexl@redhat.com>
+
 	* src/file-manager/fm-desktop-icon-view.c: (real_merge_menus):
 	Don't have use default background on desktop context menu.
 
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 893468a17..5bf701c90 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -67,15 +67,6 @@
 #include <unistd.h>
 #include <gtk/gtkmessagedialog.h>
 
-#define DESKTOP_COMMAND_EMPTY_TRASH_CONDITIONAL		"/commands/Empty Trash Conditional"
-#define DESKTOP_COMMAND_UNMOUNT_VOLUME_CONDITIONAL	"/commands/Unmount Volume Conditional"
-#define DESKTOP_COMMAND_PROTECT_VOLUME_CONDITIONAL      "/commands/Protect Conditional"
-#define DESKTOP_COMMAND_FORMAT_VOLUME_CONDITIONAL       "/commands/Format Conditional"
-#define DESKTOP_COMMAND_MEDIA_PROPERTIES_VOLUME_CONDITIONAL     "/commands/Media Properties Conditional"
-
-#define DESKTOP_BACKGROUND_POPUP_PATH_DISKS	"/popups/background/Before Zoom Items/Volume Items/Disks"
-#define DESKTOP_BACKGROUND_POPUP_PATH_VOLUME_ITEMS	"/popups/background/Before Zoom Items/Volume Items"
-
 /* Timeout to check the desktop directory for updates */
 #define RESCAN_TIMEOUT 4000
 
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index ee8b5ce7e..bab73da36 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -93,9 +93,6 @@
 /* Number of seconds until cancel dialog shows up */
 #define DELAY_UNTIL_CANCEL_MSECS 5000
 
-#define DISPLAY_TIMEOUT_FIRST_MSECS 1000
-#define DISPLAY_TIMEOUT_INTERVAL_MSECS 10*1000
-
 #define SILENT_WINDOW_OPEN_LIMIT 5
 
 #define DUPLICATE_HORIZONTAL_ICON_OFFSET 70
@@ -105,53 +102,22 @@
 #define RESPONSE_DISPLAY 1001
 #define RESPONSE_RUN_IN_TERMINAL 1002
 
-/* MOD2 is num lock -- I would include MOD3-5 if I was sure they were not lock keys */
-#define ALL_NON_LOCK_MODIFIER_KEYS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
-
-#define FM_DIRECTORY_VIEW_MENU_PATH_OPEN_WITH				"/MenuBar/File/Open Placeholder/Open With"
-#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS			"/MenuBar/File/New Items Placeholder/New Documents"
-#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_NO_TEMPLATES		"/MenuBar/File/New Items Placeholder/New Documents/No Templates"
-#define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS				"/MenuBar/File/Open Placeholder/Scripts"
-#define FM_DIRECTORY_VIEW_MENU_PATH_TRASH                    		"/MenuBar/Edit/Dangerous File Items Placeholder/Trash"
-#define FM_DIRECTORY_VIEW_MENU_PATH_DELETE                    		"/MenuBar/Edit/Dangerous File Items Placeholder/Delete"
-#define FM_DIRECTORY_VIEW_MENU_PATH_EMPTY_TRASH                    	"/MenuBar/File/Global File Items Placeholder/Empty Trash"
-#define FM_DIRECTORY_VIEW_MENU_PATH_CREATE_LINK                	 	"/MenuBar/Edit/File Items Placeholder/Create Link"
-#define FM_DIRECTORY_VIEW_MENU_PATH_APPLICATIONS_SUBMENU_PLACEHOLDER    	"/MenuBar/File/Open Placeholder/Open With/Applications Placeholder"
+#define FM_DIRECTORY_VIEW_MENU_PATH_APPLICATIONS_SUBMENU_PLACEHOLDER   	"/MenuBar/File/Open Placeholder/Open With/Applications Placeholder"
 #define FM_DIRECTORY_VIEW_MENU_PATH_APPLICATIONS_PLACEHOLDER    	"/MenuBar/File/Open Placeholder/Applications Placeholder"
-#define FM_DIRECTORY_VIEW_MENU_PATH_OTHER_APPLICATION_PLACEHOLDER    	"/MenuBar/File/Open Placeholder/OtherApplicationPlaceholder"
-#define FM_DIRECTORY_VIEW_MENU_PATH_OTHER_APPLICATION		    	"/MenuBar/File/Open Placeholder/OtherApplicationPlaceholder/OtherApplication"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER    		"/MenuBar/File/Open Placeholder/Scripts/Scripts Placeholder"
-#define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR    		"/MenuBar/File/Open Placeholder/Scripts/After Scripts"
-#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER  		"/MenuBar/File/New Items Placeholder/New Documents/New Documents Placeholder"
-#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_SEPARATOR    		"/MenuBar/File/New Items Placeholder/New Documents/After New Documents"
-#define FM_DIRECTORY_VIEW_MENU_PATH_CUT_FILES    			"/MenuBar/Edit/Cut"
-#define FM_DIRECTORY_VIEW_MENU_PATH_COPY_FILES		    		"/MenuBar/Edit/Copy"
-#define FM_DIRECTORY_VIEW_MENU_PATH_PASTE_FILES		    		"/MenuBar/Edit/Paste"
 #define FM_DIRECTORY_VIEW_MENU_PATH_EXTENSION_ACTIONS_PLACEHOLDER       "/MenuBar/Edit/Extension Actions"
+#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER  		"/MenuBar/File/New Items Placeholder/New Documents/New Documents Placeholder"
 
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND				"/background"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_SELECTION				"/selection"
-
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS         	"/background/Before Zoom Items/Scripts"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER	"/background/Before Zoom Items/Scripts/Scripts Placeholder"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR	"/background/Before Zoom Items/Scripts/After Scripts"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS         	"/background/Before Zoom Items/New Documents"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_NO_TEMPLATES "/background/Before Zoom Items/New Documents/No Templates"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_PLACEHOLDER "/background/Before Zoom Items/New Documents/New Documents Placeholder"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_SEPARATOR	"/background/Before Zoom Items/New Documents/After New Documents"
-
-#define FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_SUBMENU_PLACEHOLDER    	"/selection/Open Placeholder/Open With/Applications Placeholder"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_SUBMENU_PLACEHOLDER  	"/selection/Open Placeholder/Open With/Applications Placeholder"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_PLACEHOLDER    	"/selection/Open Placeholder/Applications Placeholder"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_OPEN_PLACEHOLDER		    	"/selection/Open Placeholder"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_OTHER_APPLICATION_PLACEHOLDER    	"/selection/Open Placeholder/OtherApplicationPlaceholder"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_OTHER_APPLICATION		    	"/selection/Open Placeholder/OtherApplicationPlaceholder/OtherApplication"
-
 #define FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_PLACEHOLDER    		"/selection/Open Placeholder/Scripts/Scripts Placeholder"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_SEPARATOR    		"/selection/Open Placeholder/Scripts/After Scripts"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_OPEN_WITH				"/selection/Open Placeholder/Open With"
-#define FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS				"/selection/Open Placeholder/Scripts"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_EXTENSION_ACTIONS			"/selection/Extension Actions"
 
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND				"/background"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER	"/background/Before Zoom Items/New Object Items/Scripts/Scripts Placeholder"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_PLACEHOLDER "/background/Before Zoom Items/New Object Items/New Documents/New Documents Placeholder"
+
 #define MAX_MENU_LEVELS 5
 
 enum {
@@ -3940,7 +3906,15 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection)
 				menu_path = FM_DIRECTORY_VIEW_MENU_PATH_APPLICATIONS_PLACEHOLDER;
 				popup_path = FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_PLACEHOLDER;
 			}
-				
+
+			gtk_ui_manager_add_ui (nautilus_window_info_get_ui_manager (view->details->window),
+					       view->details->open_with_merge_id,
+					       menu_path,
+					       "separator",
+					       NULL,
+					       GTK_UI_MANAGER_SEPARATOR,
+					       FALSE);
+					       
 			add_application_to_open_with_menu (view, 
 							   node->data, 
 							   file, 
@@ -6237,8 +6211,8 @@ real_update_menus (FMDirectoryView *view)
 	
 	g_free (label_with_underscore);
 
+	show_open_alternate = file_list_all_are_folders (selection);
 	if (nautilus_window_info_get_window_type (view->details->window) == NAUTILUS_WINDOW_NAVIGATION) {
-		show_open_alternate = TRUE;
 		if (selection_count == 0) {
 			label_with_underscore = g_strdup (_("Open in New Window"));
 		} else {
@@ -6248,7 +6222,6 @@ real_update_menus (FMDirectoryView *view)
 								 selection_count);
 		}
 	} else {
-		show_open_alternate = file_list_all_are_folders (selection);
 		if (selection_count <= 1) {
 			label_with_underscore = g_strdup (_("Browse Folder"));
 		} else {
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index f0deab266..052af83f9 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -141,7 +141,8 @@
 				  action="Open"/>
 			<menuitem name="OpenAlternate"
 				  action="OpenAlternate"/>
-			<placeholder name="Applications Placeholder"/>
+			<placeholder name="Applications Placeholder">
+                        </placeholder>
 			<menu action="Open With">
 				<placeholder name="Applications Placeholder"/>
 				<separator/>
@@ -173,12 +174,14 @@
 	</menu>
 
 	<menu action="Edit">
-		<menuitem name="Cut"
-			  action="Cut Files"/>
-		<menuitem name="Copy"
-			  action="Copy Files"/>
-		<menuitem name="Paste"
-			  action="Paste Files"/>
+		<placeholder name="Clipboard Actions">
+			<menuitem name="Cut"
+			          action="Cut Files"/>
+			<menuitem name="Copy"
+			          action="Copy Files"/>
+			<menuitem name="Paste"
+			          action="Paste Files"/>
+		</placeholder>
 
 		<placeholder name="Select Items">
 		<menuitem name="Select All"
@@ -222,22 +225,24 @@
 			 	  action="New Folder"/>
 			<menuitem name="New Launcher"
 			 	  action="New Launcher"/>
+			<menu action="New Documents">
+		         	<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"/>
+			</menu>
+                	<menu action="Scripts">
+			 	<placeholder name="Scripts Placeholder"/>
+			 	<separator name="After Scripts"/>
+			 	<menuitem name="Open Scripts Folder"
+				          action="Open Scripts Folder"/>
+			</menu>
 		</placeholder>
-		<menu action="New Documents">
-		         <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"/>
-		</menu>
-                <menu action="Scripts">
-			 <placeholder name="Scripts Placeholder"/>
-			 <separator name="After Scripts"/>
-			 <menuitem name="Open Scripts Folder"
-				   action="Open Scripts Folder"/>
-		</menu>
+		<separator/>
 		<placeholder name="View Items"/>
+		<separator/>
 		<placeholder name="File Clipboard Actions">
 			<menuitem name="Paste Files"
 			 	  action="Paste Files"/>
@@ -256,6 +261,7 @@
 		<menuitem name="Open" action="Open"/>
 		<menuitem name="OpenAlternate" 
 		          action="OpenAlternate"/>
+		<separator/>
 		<placeholder name="Applications Placeholder"/>
 		<menu action="Open With">
 			<placeholder name="Applications Placeholder"/>
@@ -276,6 +282,7 @@
 		</menu>
 
 	</placeholder>
+	<separator/>
 	<placeholder name="File Clipboard Actions">
 		<menuitem name="Cut Files" 
 		          action="Cut Files"/>
@@ -284,24 +291,29 @@
 		<menuitem name="Paste Files Into" 
 		          action="Paste Files Into"/>
 	</placeholder>
+	<separator/>
 	<placeholder name="File Actions">
 		<menuitem name="Create Link" action="Create Link"/>
 		<menuitem name="Rename" action="Rename"/>
 	</placeholder>
+	<separator/>
 	<placeholder name="Dangerous File Actions">
 		<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"/>
+	<separator/>
         <placeholder name="Removabel Media Holder">
 		<menuitem name="Mount Volume" action="Mount Volume"/>
                 <menuitem name="Unmount Volume" action="Unmount Volume"/>
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 9799a821e..6c1264c57 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -35,9 +35,6 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 
-#define STATUS_BAR_PATH         "/status"
-#define MENU_BAR_PATH           "/menu"
-
 struct NautilusDesktopWindowDetails {
 	int dummy;
 };
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index 5828dc738..da00abe07 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -58,6 +58,7 @@
 
 			<menuitem name="Clear History" 
 				  action="Clear History"/>
+			<separator/>
 			<placeholder name="History Placeholder"/>
 		</menu>
 
@@ -67,6 +68,7 @@
 			<menuitem name="Edit Bookmark" 
 				  action="Edit Bookmarks"/>
 
+			<separator/>
 			<placeholder name="Bookmarks Placeholder"/>
 		</menu>
         </placeholder>
@@ -76,10 +78,8 @@
 
 	<toolitem name="Back"
 	          action="Back"/>
-<!--	<control name="BackMenu"/> -->
 	<toolitem name="Forward"
 	          action="Forward"/>
-<!--	<control name="ForwardMenu"/> -->
 
 	<toolitem name="Up"
 	          action="Up"/>
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 18551f3e6..b4c1aca23 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -93,11 +93,6 @@
 
 #define MAX_TITLE_LENGTH 180
 
-/* dock items */
-#define LOCATION_BAR_PATH	"/Location Bar"
-#define TOOLBAR_PATH            "/Toolbar"
-#define MENU_BAR_PATH           "/menu"
-
 enum {
 	ARG_0,
 	ARG_APP_ID,
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index f51524d23..c03224d38 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -9,15 +9,18 @@
 <menubar name="MenuBar">
 	<menu action="File">
 
-		<placeholder name="New Items Placeholder">
-		</placeholder>
+		<placeholder name="New Items Placeholder"/>
+		<separator/>
 		<placeholder name="Open Placeholder"/>
+		<separator/>
 		<placeholder name="Location Placeholder"/>
 		<menuitem name="Connect to Server"
 			  action="Connect to Server"/>
-		<placeholder name="General Status Placeholder"/>
+		<separator/>
 		<placeholder name="File Items Placeholder"/>
+		<separator/>
 		<placeholder name="Global File Items Placeholder"/>
+		<separator/>
 		<placeholder name="Extension Actions"/>
 		<separator/>
 
@@ -28,27 +31,28 @@
 	</menu>
 
 	<menu action="Edit">
-<!-- BONOBOTODO: These should be in the dir-view?
-		<menuitem name="Cut" action="Cut"/>
-		<menuitem name="Copy" action ="Copy"/>
-		<menuitem name="Paste" action="Paste"/>
-		<menuitem name="Clear" action="Clear"/>
+		<placeholder name="Clipboard Actions">
+<!-- BONOBOTODO: These should be in the dir-view? or are they text related?
+			<menuitem name="Cut" action="Cut"/>
+			<menuitem name="Copy" action ="Copy"/>
+			<menuitem name="Paste" action="Paste"/>
+			<menuitem name="Clear" action="Clear"/>
 -->
+                </placeholder>
 
 		<separator/>
 
-		<placeholder name="Select Items">
-<!-- BONOBOTODO: This should go in fm-directory-view?
-		<menuitem name="Select All"
-			  action="Select All"/>
--->
-		</placeholder>
+		<placeholder name="Select Items"/>
 				
+		<separator/>
 		<placeholder name="File Items Placeholder"/>
+		<separator/>
 		<placeholder name="Dangerous File Items Placeholder"/>
+		<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"/>
@@ -59,12 +63,14 @@
 		<menuitem name="Stop" action="Stop"/>
 		<menuitem name="Reload" action="Reload"/>
 
-		<placeholder name="Show Hide Placeholder">
-		</placeholder>
+		<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"/>
@@ -74,6 +80,7 @@
 				  action="Zoom Normal"/>
 		</placeholder>
 		<placeholder name="View Choices">
+		        <separator/>
 			<placeholder name="Extra Viewer"/>
 			<separator name="Before Short List"/>
 			<placeholder name="Short List"/>
@@ -92,12 +99,12 @@
 
 <popup name="background">
 	<placeholder name="Before Zoom Items">
-		<placeholder name="New Window Items">
-		</placeholder>
-		<placeholder name="New Object Items">
-		</placeholder>
+		<placeholder name="New Window Items"/>
+		<placeholder name="New Object Items"/>
+		<separator/>
 	       <placeholder name="Extension Actions"/>
 	</placeholder>
+        <separator/>
 	<placeholder name="Zoom Items">
 		<menuitem name="Zoom In" 
 		          action="Zoom In"/>
@@ -106,6 +113,7 @@
 		<menuitem name="Zoom Normal" 
 		          action="Zoom Normal"/>
 	</placeholder>
+        <separator/>
 	<placeholder name="After Zoom Items"/>
 </popup>