Bunches o' Bonobo conversion & cleanup. Most of this is

	about the new "command/widget separation" in Bonobo.
	Essentially, changes to sensitivity, state, and hiddenness
	should be made to the command (verb), whereas other changes
	should be made to the widget.

	This should fix the "cmd/widget" warnings at launch, and
	make the tool bar buttons desensitize appropriately again.

	* components/loser/sidebar/nautilus-sidebar-loser-ui.xml:
	* components/mozilla/nautilus-mozilla-ui.xml:
	* components/sample/nautilus-sample-content-view-ui.xml:
	* src/nautilus-shell-ui.xml:
	* src/file-manager/nautilus-directory-view-ui.xml:
	* src/file-manager/nautilus-icon-view-ui.xml:
	* src/file-manager/nautilus-search-list-view-ui.xml:
	Filled in the names of all verbs; we don't want to use
	the default if-verb-name-is-blank-use-item-name feature because
	it causes vast confusion; also, change _descr to _tip everywhere
	(updated name from Bonobo); also explicitly defined <cmd>s for
	the items that have pre-set insensitivity, or that share
	tips between tool bar buttons and menu items.

	* libnautilus/nautilus-bonobo-ui.h: Add #defines for command paths
	as well as menu paths.

	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_create_background_context_menu_items):
	Use command paths instead of menu paths.

	* src/file-manager/fm-directory-view.h: Publicize command paths,
	not menu paths (for use in context menu index-finding. Some day
	we will convert the context menus to use Bonobo and then this
	will get cleaned up further.)

	* src/file-manager/fm-directory-view.c:
	Moved menu path #defines inside here.
	(append_gtk_menu_item), (update_one_menu_item):
	Take both a menu path and a verb path; use the verb path
	for sensitivity.
	(fm_directory_view_insert_context_menu_item): Updated comment.
	(fm_directory_view_real_create_background_context_menu_items),
	(create_open_with_gtk_menu),
	(fm_directory_view_real_create_selection_context_menu_items),
	(reset_bonobo_trash_delete_menu),
	(fm_directory_view_real_update_menus):
	Pass verb paths as well as menu paths.
	(fm_directory_view_get_context_menu_index): Changed variable
	names for clarity.

	* src/file-manager/fm-icon-view.c:
	New #defines for command paths.
	(update_one_menu_item): Take both a menu path and a verb path; use
	the verb path for sensitivity.
	(fm_icon_view_create_selection_context_menu_items),
	(fm_icon_view_create_background_context_menu_items),
	(fm_icon_view_update_menus), (update_layout_menus):
	Pass both a menu path and a verb path.

	* src/file-manager/fm-search-list-view.c:
	#define for COMMAND_REVEAL_IN_NEW_WINDOW
	(real_create_selection_context_menu_items): Use verb path not
	menu path for context menu positioning.
	(update_reveal_item): Use verb path not menu path for sensitivity.

	* src/nautilus-window-private.h: #defines for command paths.
	* src/nautilus-window-manage-views.c: (load_content_view):
	* src/nautilus-window.c: (nautilus_window_allow_back),
	(nautilus_window_allow_forward), (nautilus_window_allow_up),
	(nautilus_window_allow_stop),
	(nautilus_window_zoom_level_changed_callback): Use verb paths
	instead of menu paths for changing sensitivity.

1 files changed, 25 insertions, 25 deletions

diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index b4c39cbc1..2a6df7fdd 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -6,76 +6,76 @@
 			<menuitem name="New Folder"
 				  _label="New Folder"
 			  	  accel="*Control*n"
-				  verb=""/>
+				  verb="New Folder"/>
 		</placeholder>
 		<placeholder name="Open Placeholder">
 			<menuitem name="Open"
 				  _label="_Open"
-				  _descr="Open the selected item in this window"
+				  _tip="Open the selected item in this window"
 				  accel="*Control*o"
-				  verb=""/>
+				  verb="Open"/>
 			<menuitem name="OpenNew"
 				  _label="_Open in New Window"
-				  _descr="Open each selected item in a new window"
-				  verb=""/>
+				  _tip="Open each selected item in a new window"
+				  verb="OpenNew"/>
 			<submenu name="Open With" _label="Open With">
-				<placeholder name="Open With Applications Placeholder"/>
+				<placeholder name="Applications Placeholder"/>
 				<menuitem name="OtherApplication"
 					  _label="Other _Application..."
-					  _descr="Choose another application with which to open the selected item"
-					  verb=""/>
+					  _tip="Choose another application with which to open the selected item"
+					  verb="OtherApplication"/>
 				<menuitem/>
-				<placeholder name="Open With Viewers Placeholder"/>
+				<placeholder name="Viewers Placeholder"/>
 				<menuitem name="OtherViewer"
 					  _label="Other _Viewer..."
-					  _descr="Choose another viewer with which to view the selected item"
-					  verb=""/>
+					  _tip="Choose another viewer with which to view the selected item"
+					  verb="OtherViewer"/>
 			</submenu>
 		</placeholder>
 
 		<placeholder name="File Items Placeholder">
 			<menuitem name="Show Properties"
 				  _label="Show _Properties"
-				  _descr="View or modify the properties of each selected item"
+				  _tip="View or modify the properties of each selected item"
 				  accel="*Control*i"
-				  verb=""/>
+				  verb="Show Properties"/>
 			<menuitem name="Trash"
 				  _label="Move to _Trash"
-				  _descr="Move each selected item to the Trash"
+				  _tip="Move each selected item to the Trash"
 				  accel="*Control*t"
-				  verb=""/>
+				  verb="Trash"/>
 			<menuitem name="Duplicate"
 				  _label="_Duplicate"
-				  _descr="Duplicate each selected item"
+				  _tip="Duplicate each selected item"
 				  accel="*Control*d"
-				  verb=""/>
+				  verb="Duplicate"/>
 			<menuitem name="Create Link"
 				  _label="Create _Link"
-				  _descr="Create a symbolic link for each selected item"
+				  _tip="Create a symbolic link for each selected item"
 				  accel="*Control*l"
-				  verb=""/>
+				  verb="Create Link"/>
 		</placeholder>
 
 		<placeholder name="Global File Items Placeholder">
 			<menuitem name="Empty Trash"
 				  _label="_Empty Trash"
-				  _descr="Delete all items in the trash"
-				  verb=""/>
+				  _tip="Delete all items in the trash"
+				  verb="Empty Trash"/>
 		</placeholder>
 	</submenu>
 
 	<submenu name="Edit" _label="_Edit">
 		<menuitem name="Select All"
 			  _label="_Select All Files" 
-			  _descr="Select all items in this window"
+			  _tip="Select all items in this window"
 			  accel="*Control*a"
-			  verb=""/>
+			  verb="Select All"/>
 		
 		<placeholder name="Edit Items Placeholder">
 			<menuitem name="Remove Custom Icons"
 				  _label="R_emove Custom Images" 
-				  _descr="Remove any custom images from selected icons"
-				  verb=""/>
+				  _tip="Remove any custom images from selected icons"
+				  verb="Remove Custom Icons"/>
 		</placeholder>
 
 	</submenu>