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

8 files changed, 403 insertions, 71 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9e3a90330b..7b3e5f3f55 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,21 @@
+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.
+
 2000-11-01  Dan Winship  <danw@helixcode.com>
 
 	* gui/component/e-ldap-storage.c (load_ldap_data): 
diff --git a/addressbook/ename/.cvsignore b/addressbook/ename/.cvsignore
deleted file mode 100644
index e995588475..0000000000
--- a/addressbook/ename/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
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("");
 		}
diff --git a/addressbook/gui/minicard/.cvsignore b/addressbook/gui/minicard/.cvsignore
deleted file mode 100644
index e995588475..0000000000
--- a/addressbook/gui/minicard/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 03bd9a4d6e..91e361bee1 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -18,6 +18,8 @@ noinst_LIBRARIES =				\
 libeminicard_a_SOURCES =			\
 	e-addressbook-model.c			\
 	e-addressbook-model.h			\
+	e-addressbook-search.c			\
+	e-addressbook-search.h			\
 	e-addressbook-view.c			\
 	e-addressbook-view.h			\
 	e-minicard-control.c			\
diff --git a/addressbook/gui/widgets/e-addressbook-search.c b/addressbook/gui/widgets/e-addressbook-search.c
new file mode 100644
index 0000000000..c03b8fc096
--- /dev/null
+++ b/addressbook/gui/widgets/e-addressbook-search.c
@@ -0,0 +1,249 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* 
+ * e-addressbook-search.c
+ * Copyright (C) 2000  Helix Code, Inc.
+ * Author: Chris Lahey <clahey@helixcode.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <gnome.h>
+
+#include "e-addressbook-search.h"
+#include <gal/widgets/e-unicode.h>
+
+static void e_addressbook_search_init		(EAddressbookSearch		 *card);
+static void e_addressbook_search_class_init	(EAddressbookSearchClass	 *klass);
+static void e_addressbook_search_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
+static void e_addressbook_search_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
+static void e_addressbook_search_destroy (GtkObject *object);
+
+enum {
+	QUERY_CHANGED,
+
+	LAST_SIGNAL
+};
+
+static gint eas_signals [LAST_SIGNAL] = { 0, };
+
+static GtkHBoxClass *parent_class = NULL;
+
+/* The arguments we take */
+enum {
+	ARG_0,
+	ARG_OPTION_CHOICE,
+	ARG_TEXT,
+};
+
+GtkType
+e_addressbook_search_get_type (void)
+{
+	static GtkType type = 0;
+
+	if (!type) {
+		static const GtkTypeInfo info =
+		{
+			"EAddressbookSearch",
+			sizeof (EAddressbookSearch),
+			sizeof (EAddressbookSearchClass),
+			(GtkClassInitFunc) e_addressbook_search_class_init,
+			(GtkObjectInitFunc) e_addressbook_search_init,
+			/* reserved_1 */ NULL,
+		       	/* reserved_2 */ NULL,
+			(GtkClassInitFunc) NULL,
+		};
+		
+		type = gtk_type_unique (gtk_hbox_get_type (), &info);
+	}
+
+	return type;
+}
+
+static void
+e_addressbook_search_class_init (EAddressbookSearchClass *klass)
+{
+	GtkObjectClass *object_class;
+
+	object_class = GTK_OBJECT_CLASS(klass);
+
+	parent_class = gtk_type_class (gtk_hbox_get_type ());
+
+	object_class->set_arg = e_addressbook_search_set_arg;
+	object_class->get_arg = e_addressbook_search_get_arg;
+	object_class->destroy = e_addressbook_search_destroy;
+
+	gtk_object_add_arg_type ("EAddressbookSearch::option_choice", GTK_TYPE_ENUM,
+				 GTK_ARG_READWRITE, ARG_OPTION_CHOICE);
+	gtk_object_add_arg_type ("EAddressbookSearch::text", GTK_TYPE_STRING,
+				 GTK_ARG_READWRITE, ARG_TEXT);
+
+	eas_signals [QUERY_CHANGED] =
+		gtk_signal_new ("query_changed",
+				GTK_RUN_LAST,
+				object_class->type,
+				GTK_SIGNAL_OFFSET (EAddressbookSearchClass, query_changed),
+				gtk_marshal_NONE__NONE,
+				GTK_TYPE_NONE, 0);
+
+	gtk_object_class_add_signals (object_class, eas_signals, LAST_SIGNAL);
+}
+
+static void
+eas_query_changed(EAddressbookSearch *eas)
+{
+	gtk_signal_emit(GTK_OBJECT (eas),
+			eas_signals [QUERY_CHANGED]);
+}
+
+
+typedef enum {
+	EAS_ANY = 0,
+	EAS_FULL_NAME = 1,
+	EAS_EMAIL = 2,
+} EasChoiceId;
+
+
+typedef struct {
+	char *text;
+	char *name;
+	int id;
+} EasChoice;
+
+static EasChoice eas_choices[] = {
+	{ N_("Any field contains"), "x-evolution-any-field", EAS_ANY },
+	{ N_("Name contains"), "full_name", EAS_FULL_NAME },
+	{ N_("Email contains"), "email", EAS_EMAIL },
+	{ NULL, NULL, 0 }
+};
+
+static void
+eas_option_activated(GtkWidget *widget, EAddressbookSearch *eas)
+{
+	int id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EasChoiceId"));
+
+	eas->option_choice = id;
+	eas_query_changed(eas);
+}
+
+static void
+eas_entry_activated(GtkWidget *widget, EAddressbookSearch *eas)
+{
+	eas_query_changed(eas);
+}
+
+static void
+eas_pack_option_menu(EAddressbookSearch *eas)
+{
+	GtkWidget *menu, *item, *firstitem = NULL;
+	int i;
+
+	menu = gtk_menu_new ();
+	for (i = 0; eas_choices[i].name; i++) {
+
+		item = gtk_menu_item_new_with_label (_(eas_choices[i].text));
+		if (!firstitem)
+			firstitem = item;
+
+		gtk_menu_append (GTK_MENU (menu), item);
+
+		gtk_object_set_data (GTK_OBJECT (item), "EasChoiceId", GINT_TO_POINTER(i));
+
+		gtk_signal_connect (GTK_OBJECT (item), "activate",
+				    GTK_SIGNAL_FUNC (eas_option_activated),
+				    eas);
+	}
+	gtk_widget_show_all (menu);
+
+	gtk_option_menu_set_menu (GTK_OPTION_MENU (eas->option), 
+				  menu);
+	gtk_option_menu_set_history (GTK_OPTION_MENU (eas->option), 0);
+	gtk_widget_set_sensitive (eas->option, TRUE);
+}
+
+static void
+e_addressbook_search_init (EAddressbookSearch *eas)
+{
+	gtk_box_set_spacing(GTK_BOX(eas), GNOME_PAD);
+
+	eas->option = gtk_option_menu_new();
+	eas_pack_option_menu(eas);
+	gtk_widget_show(eas->option);
+	gtk_box_pack_start(GTK_BOX(eas), eas->option, FALSE, FALSE, 0);
+
+	eas->entry = gtk_entry_new();
+	gtk_signal_connect (GTK_OBJECT (eas->entry), "activate",
+			    GTK_SIGNAL_FUNC (eas_entry_activated), eas);
+	gtk_widget_show(eas->entry);
+	gtk_box_pack_start(GTK_BOX(eas), eas->entry, TRUE, TRUE, 0);
+	eas->option_choice = 0;
+}
+
+static void
+e_addressbook_search_destroy (GtkObject *object)
+{
+	if (GTK_OBJECT_CLASS(parent_class)->destroy)
+		GTK_OBJECT_CLASS(parent_class)->destroy(object);
+}
+
+GtkWidget*
+e_addressbook_search_new (void)
+{
+	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_search_get_type ()));
+	return widget;
+}
+
+static void
+e_addressbook_search_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+{
+	EAddressbookSearch *eas = E_ADDRESSBOOK_SEARCH(object);
+
+	switch (arg_id) {
+	case ARG_OPTION_CHOICE:
+		GTK_VALUE_ENUM (*arg) = eas->option_choice;
+		break;
+
+	case ARG_TEXT:
+		GTK_VALUE_STRING (*arg) = e_utf8_gtk_editable_get_text(GTK_EDITABLE(eas->entry));
+		break;
+
+	default:
+		arg->type = GTK_TYPE_INVALID;
+		break;
+	}
+}
+
+static void
+e_addressbook_search_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+{
+	EAddressbookSearch *eas = E_ADDRESSBOOK_SEARCH(object);
+
+	switch (arg_id) {
+	case ARG_OPTION_CHOICE:
+		eas->option_choice = GTK_VALUE_ENUM (*arg);
+		gtk_option_menu_set_history (GTK_OPTION_MENU (eas->option), eas->option_choice);
+		eas_query_changed(eas);
+		break;
+
+	case ARG_TEXT:
+		e_utf8_gtk_editable_set_text(GTK_EDITABLE(eas->entry), GTK_VALUE_STRING (*arg));
+		eas_query_changed(eas);
+		break;
+
+	default:
+		break;
+	}
+}
diff --git a/addressbook/gui/widgets/e-addressbook-search.h b/addressbook/gui/widgets/e-addressbook-search.h
new file mode 100644
index 0000000000..5216aa7ee5
--- /dev/null
+++ b/addressbook/gui/widgets/e-addressbook-search.h
@@ -0,0 +1,81 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* e-addressbook-search.h
+ * Copyright (C) 2000  Helix Code, Inc.
+ * Author: Chris Lahey <clahey@helixcode.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef __E_ADDRESSBOOK_SEARCH_H__
+#define __E_ADDRESSBOOK_SEARCH_H__
+
+#include <gnome.h>
+#include "addressbook/backend/ebook/e-book.h"
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+/* EAddressbookSearch - A card displaying information about a contact.
+ *
+ * The following arguments are available:
+ *
+ * name		type		read/write	description
+ * --------------------------------------------------------------------------------
+ */
+
+#define E_ADDRESSBOOK_SEARCH_TYPE			(e_addressbook_search_get_type ())
+#define E_ADDRESSBOOK_SEARCH(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_TYPE, EAddressbookSearch))
+#define E_ADDRESSBOOK_SEARCH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_TYPE, EAddressbookSearchClass))
+#define E_IS_ADDRESSBOOK_SEARCH(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_TYPE))
+#define E_IS_ADDRESSBOOK_SEARCH_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_TYPE))
+
+typedef enum {
+	E_ADDRESSBOOK_SEARCH_NONE, /* initialized to this */
+	E_ADDRESSBOOK_SEARCH_TABLE,
+	E_ADDRESSBOOK_SEARCH_MINICARD
+} EAddressbookSearchType;
+
+
+typedef struct _EAddressbookSearch       EAddressbookSearch;
+typedef struct _EAddressbookSearchClass  EAddressbookSearchClass;
+
+struct _EAddressbookSearch
+{
+	GtkHBox parent;
+	
+	/* item specific fields */
+	GtkWidget *entry;
+	GtkWidget *option;
+	int        option_choice;
+};
+
+struct _EAddressbookSearchClass
+{
+	GtkHBoxClass parent_class;
+
+	void (*query_changed) (EAddressbookSearch *search);
+};
+
+GtkWidget *e_addressbook_search_new        (void);
+GtkType    e_addressbook_search_get_type   (void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __E_ADDRESSBOOK_SEARCH_H__ */