added Maciej's patch +2001-04-02 Maciej Stachowiak <mjs@eazel.com>

2001-04-12  Robin * Slomkowski  <rslomkow@eazel.com>
	added Maciej's patch
 +2001-04-02  Maciej Stachowiak  <mjs@eazel.com>

	 	reviewed by: John Harper <jsh@eazel.com>
	 	             Mike Fleming <mfleming@eazel.com>

	 	* configure.in:
	 	* help/nautilus-quick-reference/C/index.html:
	 	* help/nautilus-release-notes/C/nautilus-release-notes.sgml:
	 	* help/nautilus-user-manual/C/nautilus-user-manual.sgml:
	 	* libnautilus-extensions/nautilus-global-preferences.c:
	 	(global_preferences_create_search_pane):
	 	* src/nautilus-first-time-druid.c: (back_update_page_callback),
	 	(next_gmc_transition_page_callback),
	 	(nautilus_first_time_druid_show):
	 	* src/nautilus-shell-ui.xml:
	 	* src/nautilus-window-menus.c:
	 	(nautilus_window_initialize_menus_part_1):

10 files changed, 188 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b559c9834..8cdf81db4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2001-04-12  Robin * Slomkowski  <rslomkow@eazel.com>
+	added Maciej's patch
+ +2001-04-02  Maciej Stachowiak  <mjs@eazel.com>
+	 
+	 	reviewed by: John Harper <jsh@eazel.com>
+	 	             Mike Fleming <mfleming@eazel.com>
+	 
+	 	* configure.in:
+	 	* help/nautilus-quick-reference/C/index.html:
+	 	* help/nautilus-release-notes/C/nautilus-release-notes.sgml:
+	 	* help/nautilus-user-manual/C/nautilus-user-manual.sgml:
+	 	* libnautilus-extensions/nautilus-global-preferences.c:
+	 	(global_preferences_create_search_pane):
+	 	* src/nautilus-first-time-druid.c: (back_update_page_callback),
+	 	(next_gmc_transition_page_callback),
+	 	(nautilus_first_time_druid_show):
+	 	* src/nautilus-shell-ui.xml:
+	 	* src/nautilus-window-menus.c:
+	 	(nautilus_window_initialize_menus_part_1):
+
 2001-04-12  Dan Mueth  <dan@eazel.com>
 
 	A few more general updates including what's new in Nautilus
diff --git a/configure.in b/configure.in
index 261066af1..5091d8d24 100644
--- a/configure.in
+++ b/configure.in
@@ -826,7 +826,6 @@ case "`medusa-config --libs 2>/dev/null | cut -d ' ' -f1`" in
 	MEDUSA_CFLAGS=""
 	MEDUSA_LIBS=""
 	AC_MSG_RESULT(no)
-	AC_MSG_WARN(Could not find medusa library. Please get it from GNOME's cvs.)
 ;;
  
 *)
diff --git a/help/nautilus-quick-reference/C/index.html b/help/nautilus-quick-reference/C/index.html
index 581114e9f..22c079732 100644
--- a/help/nautilus-quick-reference/C/index.html
+++ b/help/nautilus-quick-reference/C/index.html
@@ -43,6 +43,8 @@ Nautilus Quick Reference
 
 <br><a href="#locbar"><b>Location Bar</b></a>
 
+<br><a href="#find"><b>Fast Find</b></a>
+
 <br><a href="#sidebar"><b>Sidebar</b></a>
 
 <br><a href="#views"><b>Files, Folders, and Views</b></a>
@@ -211,6 +213,44 @@ different symbol instead of the magnifying glass.)</font> </td>
 
 <p>&nbsp;</p>
 
+<a name="find"></a> 
+
+<table bgcolor="black" border="0" cellpadding="1" width="95%">
+<tr>
+<td>
+<table bgcolor="white" border="0" cellpadding="6" cellspacing="0"
+width="100%">
+<tr>
+<td align="center" bgcolor="c1c1d0">
+<h2><font face=
+"Arial, Helvetica, Geneva, Swiss, SunSans-Regular">Fast Find</font></h2>
+</td>
+</tr>
+
+<tr>
+<td align="center"><img src="figures/find.png" alt="The Find Bar"></td>
+</tr>
+
+<tr>
+<td valign="top"><font face=
+"Arial, Helvetica, Geneva, Swiss, SunSans-Regular">Nautilus
+includes Medusa, a search daemon that indexes the content of all
+files and folders on your computer's hard disk. Medusa conducts its
+indexing in the background when your computer is idle.
+<br>
+<br>
+You can do a search with or without Medusa, but searches are faster with Medusa turned on.
+<br>
+<br>
+To turn on Medusa, open the preferences menu, choose Preferences, and click Search. Make sure the button next to "Enable fast search" is turned on.</font> </td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+
+<p>&nbsp;</p>
+
 <a name="sidebar"></a> 
 
 <table bgcolor="black" border="0" cellpadding="1" width="95%">
diff --git a/help/nautilus-release-notes/C/nautilus-release-notes.sgml b/help/nautilus-release-notes/C/nautilus-release-notes.sgml
index 1ccd24221..6f1990d2d 100644
--- a/help/nautilus-release-notes/C/nautilus-release-notes.sgml
+++ b/help/nautilus-release-notes/C/nautilus-release-notes.sgml
@@ -128,6 +128,15 @@
 
    <listitem>
     <para>
+     Nautilus includes a fast <guimenuitem>find</guimenuitem> feature
+     that indexes your hard disk so you can quickly search for a file
+     by content as well as file name, creation date, and other file
+     attributes.
+    </para>
+   </listitem>
+
+   <listitem>
+    <para>
      Nautilus has several <guimenuitem>customization</guimenuitem>
      features: You can change backgrounds, personalize icons, and
      switch themes.
@@ -258,6 +267,35 @@
     3. Restart Nautilus.
    </para>
 
+   <para><guimenuitem>Medusa Off by Default</guimenuitem></para>
+
+   <para>The Medusa daemon, which indexes your hard disk so fast
+   searches can be performed, is turned off by default. To turn it on,
+   follow these steps:
+   </para>
+
+   <para>
+    1. Open the preferences menu and choose Preferences.
+   </para>
+
+   <para>
+    2. Click Search in the left-hand column of the Preferences dialog box.
+   </para>
+
+   <para>
+    3. In the Fast Search section, make sure that the button next to
+    Enable fast search is turned on.
+   </para>
+
+   <para>
+    4. Click OK to close the Preferences dialog box.
+   </para>
+
+   <para>Note: For Medusa to perform its indexing task, the crond
+   program must also be running. If you have turned off crond, Medusa
+   won't work.
+   </para>
+
   </sect1>
 
   <sect1 id="session">
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index 88763d1a2..9a128d71e 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -787,11 +787,13 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 	
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_BOX (preference_box), NULL);
 
+
  	/*
  	 * Search Settings 
  	 */
 	search_pane = nautilus_preferences_box_add_pane (preference_box,
 							 _("Search"));
+#ifdef HAVE_MEDUSA
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Complexity Options"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
@@ -804,13 +806,19 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 							 1,
 							 NAUTILUS_PREFERENCES_USE_FAST_SEARCH,
 							 NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
+#endif
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Engines"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
+#ifdef HAVE_MEDUSA
 							 2,
+#else
+							 0,
+#endif
 							 NAUTILUS_PREFERENCES_SEARCH_WEB_URI,
 							 NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING);
 
+#ifdef HAVE_MEDUSA
 	/* Setup callbacks so that we can update the sensitivity of
 	 * the search pane when the medusa blocked state changes
 	 */
@@ -819,7 +827,7 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 						       fast_search_group,
 						       GTK_OBJECT (fast_search_group));
 	global_preferences_medusa_blocked_changed_callback (fast_search_group);
-
+#endif
 	return search_pane;
 }
 
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 88763d1a2..9a128d71e 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -787,11 +787,13 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 	
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_BOX (preference_box), NULL);
 
+
  	/*
  	 * Search Settings 
  	 */
 	search_pane = nautilus_preferences_box_add_pane (preference_box,
 							 _("Search"));
+#ifdef HAVE_MEDUSA
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Complexity Options"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
@@ -804,13 +806,19 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 							 1,
 							 NAUTILUS_PREFERENCES_USE_FAST_SEARCH,
 							 NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
+#endif
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Engines"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
+#ifdef HAVE_MEDUSA
 							 2,
+#else
+							 0,
+#endif
 							 NAUTILUS_PREFERENCES_SEARCH_WEB_URI,
 							 NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING);
 
+#ifdef HAVE_MEDUSA
 	/* Setup callbacks so that we can update the sensitivity of
 	 * the search pane when the medusa blocked state changes
 	 */
@@ -819,7 +827,7 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 						       fast_search_group,
 						       GTK_OBJECT (fast_search_group));
 	global_preferences_medusa_blocked_changed_callback (fast_search_group);
-
+#endif
 	return search_pane;
 }
 
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index 70e6ef5d3..472814b6b 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -763,6 +763,7 @@ next_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 static gboolean
 back_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 {
+#ifdef HAVE_MEDUSA
 	/* If we didn't want medusa, or cron is active, don't go "back" to the cron page */
 	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (enable_medusa_checkbox_widget)) ||
 	    cron_status == NAUTILUS_CRON_STATUS_ON) {
@@ -771,6 +772,9 @@ back_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 	else {
 		gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[START_CRON_INFORMATION_PAGE]));
 	}
+#else
+	gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[GMC_TRANSITION_PAGE]));
+#endif
 
 	return TRUE;
 }
@@ -991,6 +995,19 @@ set_up_medusa_page (NautilusDruidPageEazel *page)
 
 /* handle the "next" signal for the medusa page, if cron is enabled. */
 static gboolean
+next_gmc_transition_page_callback (GtkWidget *button, GnomeDruid *druid)
+{
+#ifdef HAVE_MEDUSA
+	gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[LAUNCH_MEDUSA_PAGE]));
+#else
+	gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[OFFER_UPDATE_PAGE]));
+#endif
+	return TRUE;
+}
+
+
+/* handle the "next" signal for the medusa page, if cron is enabled. */
+static gboolean
 next_medusa_page_callback (GtkWidget *button, GnomeDruid *druid)
 {
 	/* If we didn't want medusa, or cron is active, continue as normal */
@@ -1213,6 +1230,9 @@ nautilus_first_time_druid_show (NautilusApplication *application, gboolean manag
 	/* set up the GMC transition page */
 	set_page_title (NAUTILUS_DRUID_PAGE_EAZEL (pages[GMC_TRANSITION_PAGE]), _("GMC to Nautilus Transition"));
 	set_up_gmc_transition_page (NAUTILUS_DRUID_PAGE_EAZEL (pages[GMC_TRANSITION_PAGE]));
+	gtk_signal_connect (GTK_OBJECT (pages[GMC_TRANSITION_PAGE]), "next",
+			    GTK_SIGNAL_FUNC (next_gmc_transition_page_callback),
+			    druid);
 
 	/* set up the `Launch Medusa' page */
 	set_page_title (NAUTILUS_DRUID_PAGE_EAZEL (pages[LAUNCH_MEDUSA_PAGE]), _("Fast Searches"));
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index f84f52c81..5535e200e 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -73,6 +73,10 @@
  */
 
 #define MENU_PATH_TOGGLE_FIND_MODE			"/menu/File/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE                   "/commands/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE        "/commands/Toggle Find Mode With State"
+
+#define TOOLBAR_PATH_TOGGLE_FIND_MODE			"/Toolbar/Toggle Find Mode"
 
 #define MENU_PATH_SHOW_HIDE_SIDEBAR			"/menu/View/Show Hide Placeholder/Show Hide Sidebar"
 #define MENU_PATH_SHOW_HIDE_TOOLBAR			"/menu/View/Show Hide Placeholder/Show Hide Toolbar"
@@ -1201,6 +1205,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("New Window", file_menu_new_window_callback),
 		BONOBO_UI_VERB ("Close", file_menu_close_window_callback),
 		BONOBO_UI_VERB ("Close All Windows", file_menu_close_all_windows_callback),
+#ifdef HAVE_MEDUSA
 		BONOBO_UI_VERB ("Toggle Find Mode", file_menu_toggle_find_mode_callback),
 		/* FIXME: bugzilla.eazel.com 3590:
 		 * Note that we use a different verb for the toolbar button since
@@ -1208,6 +1213,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		 * otherwise confuse Bonobo.
 		 */
 		BONOBO_UI_VERB ("Toggle Find Mode With State", file_menu_toggle_find_mode_callback),
+#endif
 		BONOBO_UI_VERB ("Go to Web Search", file_menu_web_search_callback),
 		BONOBO_UI_VERB ("Undo", edit_menu_undo_callback),
 		BONOBO_UI_VERB ("Customize", customize_callback),
@@ -1284,6 +1290,25 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 	nautilus_bonobo_set_hidden (window->details->shell_ui, NAUTILUS_MENU_PATH_PROFILER, TRUE);
 #endif
 
+#ifndef HAVE_MEDUSA
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE,
+				    TRUE);
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				    TRUE);
+	/* Also set these items insensitive so that keyboard shortcuts do not trigger
+	   warnings */
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE,
+				       FALSE);
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				       FALSE);
+
+#endif
+
+
 	nautilus_window_ui_thaw (window);
 }
 
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 27e36529f..9a6b8e2cb 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -17,6 +17,8 @@
 	 _tip="Open another Nautilus window for the displayed location"/>
 	<cmd name="Stop"
 	 _tip="Stop loading this location"/>
+        <cmd name="Toggle Find Mode"/>
+        <cmd name="Toggle Find Mode With State"/>
 	<cmd name="Services"
 	 _tip="Go to Eazel Services"/>
 	<cmd name="Select All" accel="*Control*a" sensitive="0"/>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index f84f52c81..5535e200e 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -73,6 +73,10 @@
  */
 
 #define MENU_PATH_TOGGLE_FIND_MODE			"/menu/File/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE                   "/commands/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE        "/commands/Toggle Find Mode With State"
+
+#define TOOLBAR_PATH_TOGGLE_FIND_MODE			"/Toolbar/Toggle Find Mode"
 
 #define MENU_PATH_SHOW_HIDE_SIDEBAR			"/menu/View/Show Hide Placeholder/Show Hide Sidebar"
 #define MENU_PATH_SHOW_HIDE_TOOLBAR			"/menu/View/Show Hide Placeholder/Show Hide Toolbar"
@@ -1201,6 +1205,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("New Window", file_menu_new_window_callback),
 		BONOBO_UI_VERB ("Close", file_menu_close_window_callback),
 		BONOBO_UI_VERB ("Close All Windows", file_menu_close_all_windows_callback),
+#ifdef HAVE_MEDUSA
 		BONOBO_UI_VERB ("Toggle Find Mode", file_menu_toggle_find_mode_callback),
 		/* FIXME: bugzilla.eazel.com 3590:
 		 * Note that we use a different verb for the toolbar button since
@@ -1208,6 +1213,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		 * otherwise confuse Bonobo.
 		 */
 		BONOBO_UI_VERB ("Toggle Find Mode With State", file_menu_toggle_find_mode_callback),
+#endif
 		BONOBO_UI_VERB ("Go to Web Search", file_menu_web_search_callback),
 		BONOBO_UI_VERB ("Undo", edit_menu_undo_callback),
 		BONOBO_UI_VERB ("Customize", customize_callback),
@@ -1284,6 +1290,25 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 	nautilus_bonobo_set_hidden (window->details->shell_ui, NAUTILUS_MENU_PATH_PROFILER, TRUE);
 #endif
 
+#ifndef HAVE_MEDUSA
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE,
+				    TRUE);
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				    TRUE);
+	/* Also set these items insensitive so that keyboard shortcuts do not trigger
+	   warnings */
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE,
+				       FALSE);
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				       FALSE);
+
+#endif
+
+
 	nautilus_window_ui_thaw (window);
 }