added stubbed "Add Annotation" command

	* components/rss-control/nautilus-rss-control.c:
	(nautilus_rss_control_initialize):
	* src/file-manager/fm-icon-view.c: (annotate_callback),
	(fm_icon_view_merge_menus), (fm_icon_view_update_menus):
	* src/file-manager/nautilus-icon-view-ui.xml:

	added stubbed "Add Annotation" command

4 files changed, 31 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index a48fee510..4636bfd15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
-2001-03-22  Andy Hertzfeld  <andy@eazel.com>
+2001-03-23  Andy Hertzfeld  <andy@eazel.com>
+
+	* components/rss-control/nautilus-rss-control.c:
+	(nautilus_rss_control_initialize):
+	* src/file-manager/fm-icon-view.c: (annotate_callback),
+	(fm_icon_view_merge_menus), (fm_icon_view_update_menus):
+	* src/file-manager/nautilus-icon-view-ui.xml:
+	
+	added stubbed "Add Annotation" command
 
+2001-03-22  Andy Hertzfeld  <andy@eazel.com>
 
 	* libnautilus-extensions/nautilus-annotation.c:
 	(calculate_checksum_callback), (process_digest_requests),
diff --git a/components/rss-control/nautilus-rss-control.c b/components/rss-control/nautilus-rss-control.c
index 20fbb3a2d..4d500e480 100644
--- a/components/rss-control/nautilus-rss-control.c
+++ b/components/rss-control/nautilus-rss-control.c
@@ -182,7 +182,6 @@ set_bonobo_properties (BonoboPropertyBag *bag,
 static void
 nautilus_rss_control_initialize (NautilusRSSControl *rss_control)
 {
-	GtkWidget *frame;
 	char *bullet_path;
 	BonoboPropertyBag *property_bag;
 		
@@ -199,15 +198,9 @@ nautilus_rss_control_initialize (NautilusRSSControl *rss_control)
 
 	/* receive mouse motion events */
 	gtk_widget_add_events (GTK_WIDGET (rss_control), GDK_POINTER_MOTION_MASK);
-
-	/* embed it into a frame */		
-	frame = gtk_frame_new (NULL);
-  	gtk_frame_set_shadow_type(GTK_FRAME (frame), GTK_SHADOW_OUT);
-  	gtk_widget_show (frame);
-	gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (rss_control));
 	
 	/* make the bonobo control */
-	rss_control->details->control = (BonoboObject*) bonobo_control_new (GTK_WIDGET (frame));
+	rss_control->details->control = (BonoboObject*) bonobo_control_new (GTK_WIDGET (rss_control));
 	
 	/* attach a property bag with the configure property */
 	property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, rss_control);
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 855f5f132..de1cf5d75 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -72,6 +72,7 @@
 
 /* Paths to use when creating & referring to Bonobo menu items */
 #define MENU_PATH_RENAME 			"/menu/File/File Items Placeholder/Rename"
+#define MENU_PATH_ANNOTATE 			"/menu/File/File Items Placeholder/Annotate"
 #define MENU_PATH_CUSTOMIZE_ICON_TEXT 		"/menu/Edit/Global Edit Items Placeholder/Icon Text"
 #define MENU_PATH_STRETCH_ICON 			"/menu/Edit/Edit Items Placeholder/Stretch"
 #define MENU_PATH_UNSTRETCH_ICONS 		"/menu/Edit/Edit Items Placeholder/Unstretch"
@@ -85,6 +86,7 @@
 
 #define COMMAND_PREFIX                          "/commands/"
 #define COMMAND_RENAME 				"/commands/Rename"
+#define COMMAND_ANNOTATE			"/commands/Annotate"
 #define COMMAND_STRETCH_ICON 			"/commands/Stretch"
 #define COMMAND_UNSTRETCH_ICONS 		"/commands/Unstretch"
 #define COMMAND_TIGHTER_LAYOUT 			"/commands/Tighter Layout"
@@ -389,6 +391,15 @@ rename_icon_callback (BonoboUIComponent *component, gpointer callback_data, cons
 }
 
 static void
+annotate_callback (BonoboUIComponent *component, gpointer callback_data, const char *verb)
+{
+	g_assert (FM_IS_ICON_VIEW (callback_data));
+  		
+	/* show the annotation window */
+	g_message ("annotate invoked...");
+}
+
+static void
 set_tighter_layout (FMIconView *icon_view, gboolean new_value)
 {
 	fm_icon_view_set_directory_tighter_layout (icon_view,  
@@ -1151,6 +1162,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
 	FMIconView *icon_view;
 	BonoboUIVerb verbs [] = {
 		BONOBO_UI_VERB ("Rename", rename_icon_callback),
+		BONOBO_UI_VERB ("Annotate", annotate_callback),
 		BONOBO_UI_VERB ("Icon Text", customize_icon_text_callback),
 		BONOBO_UI_VERB ("Stretch", show_stretch_handles_callback),
 		BONOBO_UI_VERB ("Unstretch", unstretch_icons_callback),
@@ -1240,6 +1252,10 @@ fm_icon_view_update_menus (FMDirectoryView *view)
 				       COMMAND_RENAME,
 				       selection_count == 1
 				       && nautilus_file_can_rename (selection->data));
+	
+	nautilus_bonobo_set_sensitive (icon_view->details->ui, 
+				       COMMAND_ANNOTATE,
+				       selection_count == 1);
 				       
 	bonobo_ui_component_thaw (icon_view->details->ui, NULL);
 	
diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/file-manager/nautilus-icon-view-ui.xml
index 4cbe8b0ba..26ac06eb9 100644
--- a/src/file-manager/nautilus-icon-view-ui.xml
+++ b/src/file-manager/nautilus-icon-view-ui.xml
@@ -3,6 +3,9 @@
 	<cmd name="Rename"
          _label="Rename"
 	 _tip="Rename selected icon"/>
+	<cmd name="Annotate"
+         _label="Add Annotation..."
+	 _tip="Add an annotation to this file"/>	
 	<cmd name="Icon Text"
          _label="Icon Captions..."
 	 _tip="Choose which information appears beneath each icon's name"/>
@@ -153,6 +156,7 @@
 	<popup name="selection">
 		<placeholder name="File Actions">
 			<menuitem name="Rename" verb="Rename"/>
+			<menuitem name="Annotate" verb="Annotate"/>
 		</placeholder>
 		<placeholder name="Icon Appearance Items">
 			<menuitem name="Stretch" verb="Stretch"/>