Removed these unnecessary .cvsignores.

2000-11-02  Christopher James Lahey  <clahey@helixcode.com>

	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these
	unnecessary .cvsignores.

	* gui/component/addressbook.c: Switch to using EAddressbookSearch
	instead of custom quick search widget.

	* gui/component/select-names/e-select-names.c: Made this do a
	slightly better job of rendering names.

	* gui/widgets/Makefile.am: Added e-addressbook-search.c and
	e-addressbook-search.h.

	* gui/widgets/e-addressbook-search.c,
	gui/widgets/e-addressbook-search.h: New class that puts up an
	entry and a combo box.

svn path=/trunk/; revision=6356

2 files changed, 53 insertions, 65 deletions

diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 3902cb0bc2..8a0d03cd05 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -22,6 +22,7 @@
 #include "addressbook/gui/search/e-addressbook-search-dialog.h"
 
 #include "addressbook/gui/widgets/e-addressbook-view.h"
+#include "addressbook/gui/widgets/e-addressbook-search.h"
 
 #include <select-names/e-select-names.h>
 #include <select-names/e-select-names-manager.h>
@@ -40,6 +41,7 @@
 
 typedef struct {
 	EAddressbookView *view;
+	EAddressbookSearch *search;
 	GtkWidget *vbox;
 	BonoboControl *control;
 	BonoboPropertyBag *properties;
@@ -232,53 +234,6 @@ print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 }
 
 static void
-search_entry_activated (GtkWidget* widget, gpointer user_data)
-{
-	char* search_word = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	char* search_query;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (search_word && strlen (search_word))
-		search_query = g_strdup_printf (
-			"(contains \"x-evolution-any-field\" \"%s\")",
-			search_word);
-	else
-		search_query = g_strdup (
-			"(contains \"full_name\" \"\")");
-
-	gtk_object_set (GTK_OBJECT(view->view),
-			"query", search_query,
-			NULL);
-
-	g_free (search_query);
-	g_free (search_word);
-}
-
-static GtkWidget*
-make_quick_search_widget (GtkSignalFunc start_search_func,
-			  gpointer user_data_for_search)
-{
-	GtkWidget *search_vbox = gtk_vbox_new (FALSE, 0);
-	GtkWidget *search_entry = gtk_entry_new ();
-
-	if (start_search_func)
-	{
-		gtk_signal_connect (GTK_OBJECT (search_entry), "activate",
-				    (GtkSignalFunc) search_entry_activated,
-				    user_data_for_search);
-	}
-	
-	/* add the search entry to the our search_vbox */
-	gtk_box_pack_start (GTK_BOX (search_vbox), search_entry,
-			    FALSE, TRUE, 3);
-	gtk_box_pack_start (GTK_BOX (search_vbox),
-			    gtk_label_new(_("Quick Search")),
-			    FALSE, TRUE, 0);
-
-	return search_vbox;
-}
-
-static void
 show_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	AddressbookView *view = (AddressbookView *) user_data;
@@ -367,8 +322,6 @@ control_activate (BonoboControl     *control,
 		  AddressbookView   *view)
 {
 	Bonobo_UIContainer remote_ui_container;
-	GtkWidget *quick_search_widget;
-	BonoboControl *search_control;
 
 	remote_ui_container = bonobo_control_get_remote_ui_container (control);
 	bonobo_ui_component_set_container (uic, remote_ui_container);
@@ -388,17 +341,6 @@ control_activate (BonoboControl     *control,
 			       "evolution-addressbook");
 #endif
 
-	quick_search_widget = make_quick_search_widget (
-		search_entry_activated, view);
-		
-	gtk_widget_show_all (quick_search_widget);
-	search_control = bonobo_control_new (quick_search_widget);
-
-	bonobo_ui_component_object_set (
-		uic, "/Toolbar/QuickSearch",
-		bonobo_object_corba_objref (BONOBO_OBJECT (search_control)),
-		NULL);
-
 	update_view_type (view);
 
 	bonobo_ui_component_thaw (uic, NULL);
@@ -550,6 +492,46 @@ set_prop (BonoboPropertyBag *bag,
 	}
 }
 
+static void
+addressbook_query_changed (EAddressbookSearch *eas, AddressbookView *view)
+{
+	char *search_word, *search_query;
+	int search_type;
+
+	gtk_object_get(GTK_OBJECT(eas),
+		       "text", &search_word,
+		       "option_choice", &search_type,
+		       NULL);
+
+	if (search_word && strlen (search_word)) {
+		switch (search_type) {
+		case 0:
+			search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%s\")",
+							search_word);
+			break;
+		case 1:
+			search_query = g_strdup_printf ("(contains \"full_name\" \"%s\")",
+							search_word);
+			break;
+		case 2:
+			search_query = g_strdup_printf ("(contains \"email\" \"%s\")",
+							search_word);
+			break;
+		default:
+			search_query = g_strdup ("(contains \"full_name\" \"\")");
+			break;
+		}
+	} else
+		search_query = g_strdup ("(contains \"full_name\" \"\")");
+
+	gtk_object_set (GTK_OBJECT(view->view),
+			"query", search_query,
+			NULL);
+
+	g_free (search_query);
+	g_free (search_word);
+}
+
 BonoboControl *
 addressbook_factory_new_control (void)
 {
@@ -557,7 +539,9 @@ addressbook_factory_new_control (void)
 
 	view = g_new0 (AddressbookView, 1);
 
-	view->vbox = gtk_vbox_new(FALSE, 0);
+	view->vbox = gtk_vbox_new(FALSE, GNOME_PAD);
+
+	gtk_container_set_border_width(GTK_CONTAINER(view->vbox), GNOME_PAD_SMALL);
 
 	gtk_signal_connect( GTK_OBJECT( view->vbox ), "destroy",
 			    GTK_SIGNAL_FUNC( destroy_callback ),
@@ -566,8 +550,13 @@ addressbook_factory_new_control (void)
 	/* Create the control. */
 	view->control = bonobo_control_new(view->vbox);
 
-	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
+	view->search = E_ADDRESSBOOK_SEARCH(e_addressbook_search_new());
+	gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET (view->search),
+			    FALSE, FALSE, 0);
+	gtk_signal_connect (GTK_OBJECT (view->search), "query_changed",
+			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);
 
+	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
 	gtk_box_pack_start(GTK_BOX(view->vbox), GTK_WIDGET(view->view),
 			   TRUE, TRUE, 0);
 
@@ -576,6 +565,7 @@ addressbook_factory_new_control (void)
 
 	gtk_widget_show( view->vbox );
 	gtk_widget_show( GTK_WIDGET(view->view) );
+	gtk_widget_show( GTK_WIDGET(view->search) );
 
 	view->properties = bonobo_property_bag_new (get_prop, set_prop, view);
 
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index e0ff5f6519..ece38c5efe 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -254,11 +254,9 @@ button_clicked(GtkWidget *button, ESelectNamesChild *child)
 		name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
 		email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
 		if (name && *name && email && *email) {
-			new.string = g_strdup_printf("%s <%s>", name, email);
+			new.string = g_strdup_printf("\"%s\" <%s>", name, email);
 		} else if (email && *email) {
 			new.string = g_strdup_printf("%s", email);
-		} else if (name && *name) {
-			new.string = g_strdup_printf("%s <>", name);
 		} else {
 			new.string = g_strdup("");
 		}