pixmap_DATA isn't defined so don't use it as a variable.

2000-04-08  Christopher James Lahey  <clahey@helixcode.com>

	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.

	* addressbook/gui/component/,
	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
	addressbook/gui/component/addressbook-factory.c,
	addressbook/gui/component/addressbook.c,
	addressbook/gui/component/addressbook.gnorba,
	addressbook/gui/component/addressbook.h: New directory to proivde
	the component for contact management.  Simply uses an e-minicard-view.

	* addressbook/gui/minicard/e-minicard-view.c,
	addressbook/gui/minicard/e-minicard-view.h: New subclass of
	e-reflow-sorted that takes an EBook and uses it to compute the
	card data to display.

	* addressbook/gui/minicard/e-minicard.c,
	addressbook/gui/minicard/e-minicard.h: This now backends to a
	ECard instead of a ETableModel.

	* addressbook/gui/minicard/e-reflow.c,
	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
	add method.

	* addressbook/gui/minicard/e-reflow-sorted.c,
	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
	e-reflow that allows the data to be sorted on the fly.

	* addressbook/gui/minicard/test-minicard-view.c: New test to test
	the new minicard view.

	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
	backend of the e-minicard.

	* addressbook/gui/minicard/.cvsignore,
	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
	dependencies.  Added new files.

	* addressbook/gui/, addressbook/gui/Makefile.am,
	addressbook/gui/.cvsignore: New directory for addressbook gui
	bits.  Added subdirectories.  Created an initial .cvsignore.

	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.

	* addressbook/backend/pas/pas-backend-file.c: Added code to do
	notification on bookviews when changes in the backend are made.

	* addressbook/backend/pas/pas-book-view.c,
	addressbook/backend/pas/pas-book-view.h: Added helper functions to
	notify the view about the addition or modification of a single
	card.  Fixed a mistaken extra free.

	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
	incorrect parent class.

	* addressbook/backend/ebook/test-client.c: Made this accept an
	optional parameter that specifies the vcard to add.

	* configure.in: Replaced widgets/e-minicard/Makefile and
	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
	and addressbook/gui/component/Makefile respectively.

	* widgets/Makefile.am: Removed e-minicard since it's being moved
	to addressbook/gui/minicard.

	* widgets/e-text/e-text.c: Fixed the border width around tooltips
	and made the main tooltip area yellow.

From camel/ChangeLog:

2000-04-08  Christopher James Lahey  <clahey@helixcode.com>

	* providers/smtp/.cvsignore: Added a .cvsignore file.

From calendar/ChangeLog:

2000-04-08  Christopher James Lahey  <clahey@helixcode.com>

	* gui/Makefile.am: Removed linking with libetable and libeminicard
	since they weren't being used.

svn path=/trunk/; revision=2343

1 files changed, 185 insertions, 0 deletions

diff --git a/widgets/e-minicard/e-reflow-sorted.c b/widgets/e-minicard/e-reflow-sorted.c
new file mode 100644
index 0000000000..696efe454a
--- /dev/null
+++ b/widgets/e-minicard/e-reflow-sorted.c
@@ -0,0 +1,185 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* 
+ * e-reflow-sorted.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 <gnome.h>
+#include <math.h>
+#include "e-reflow-sorted.h"
+#include "e-canvas-utils.h"
+#include "e-canvas.h"
+#include "e-util.h"
+#include <glib.h>
+static void e_reflow_sorted_init		(EReflowSorted		 *card);
+static void e_reflow_sorted_class_init	(EReflowSortedClass	 *klass);
+static void e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
+static void e_reflow_sorted_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
+static void e_reflow_sorted_add_item(EReflow *e_reflow, GnomeCanvasItem *item);
+
+static EReflowClass *parent_class = NULL;
+
+/* The arguments we take */
+enum {
+	ARG_0,
+	ARG_COMPARE_FUNC,
+	ARG_STRING_FUNC
+};
+
+GtkType
+e_reflow_sorted_get_type (void)
+{
+  static GtkType reflow_type = 0;
+
+  if (!reflow_type)
+    {
+      static const GtkTypeInfo reflow_info =
+      {
+        "EReflowSorted",
+        sizeof (EReflowSorted),
+        sizeof (EReflowSortedClass),
+        (GtkClassInitFunc) e_reflow_sorted_class_init,
+        (GtkObjectInitFunc) e_reflow_sorted_init,
+        /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+      };
+
+      reflow_type = gtk_type_unique (e_reflow_get_type (), &reflow_info);
+    }
+
+  return reflow_type;
+}
+
+static void
+e_reflow_sorted_class_init (EReflowSortedClass *klass)
+{
+	GtkObjectClass *object_class;
+	EReflowClass *reflow_class;
+	
+	object_class = (GtkObjectClass*) klass;
+	reflow_class = E_REFLOW_CLASS (klass);
+	
+	parent_class = gtk_type_class (e_reflow_get_type ());
+	
+	gtk_object_add_arg_type ("EReflowSorted::compare_func", GTK_TYPE_POINTER,
+				 GTK_ARG_READWRITE, ARG_COMPARE_FUNC);
+	gtk_object_add_arg_type ("EReflowSorted::string_func", GTK_TYPE_POINTER,
+				 GTK_ARG_READWRITE, ARG_STRING_FUNC);
+	
+	reflow_class->add_item  = e_reflow_sorted_add_item;
+	
+	object_class->set_arg   = e_reflow_sorted_set_arg;
+	object_class->get_arg   = e_reflow_sorted_get_arg;
+}
+
+static void
+e_reflow_sorted_init (EReflowSorted *reflow)
+{
+	reflow->compare_func = NULL;
+	reflow->string_func = NULL;
+}
+
+static void
+e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+{
+	GnomeCanvasItem *item;
+	EReflowSorted *e_reflow_sorted;
+
+	item = GNOME_CANVAS_ITEM (o);
+	e_reflow_sorted = E_REFLOW_SORTED (o);
+	
+	switch (arg_id){
+	case ARG_COMPARE_FUNC:
+		e_reflow_sorted->compare_func = GTK_VALUE_POINTER (*arg);
+		break;
+	case ARG_STRING_FUNC:
+		e_reflow_sorted->string_func  = GTK_VALUE_POINTER (*arg);
+		break;
+	}
+}
+
+static void
+e_reflow_sorted_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+{
+	EReflowSorted *e_reflow_sorted;
+
+	e_reflow_sorted = E_REFLOW_SORTED (object);
+
+	switch (arg_id) {
+	case ARG_COMPARE_FUNC:
+		GTK_VALUE_POINTER (*arg) = e_reflow_sorted->compare_func;
+		break;
+	case ARG_STRING_FUNC:
+		GTK_VALUE_POINTER (*arg) = e_reflow_sorted->string_func;
+		break;
+	default:
+	  arg->type = GTK_TYPE_INVALID;
+	  break;
+	}
+}
+
+void
+e_reflow_sorted_remove_item(EReflowSorted *e_reflow_sorted, const gchar *id)
+{
+	if (e_reflow_sorted->string_func) {
+		EReflow *reflow = E_REFLOW(e_reflow_sorted);
+		GList *list;
+		for (list = reflow->items; list; list = g_list_next(list)) {
+			GnomeCanvasItem *item = list->data;
+			char *string = e_reflow_sorted->string_func (item);
+			if (string && !strcmp(string, id)) {
+				reflow->items = g_list_remove_link(reflow->items, list);
+				g_list_free_1(list);
+				gtk_object_destroy(GTK_OBJECT(item));
+				if ( GTK_OBJECT_FLAGS( e_reflow_sorted ) & GNOME_CANVAS_ITEM_REALIZED ) {
+					e_canvas_item_request_reflow(item);
+				}
+				return;
+			}
+		}
+	}
+}
+
+void
+e_reflow_sorted_replace_item(EReflowSorted *e_reflow_sorted, GnomeCanvasItem *item)
+{
+	if (e_reflow_sorted->string_func) {
+		char *string = e_reflow_sorted->string_func (item);
+		e_reflow_sorted_remove_item(e_reflow_sorted, string);
+		e_reflow_sorted_add_item(E_REFLOW(e_reflow_sorted), item);
+	}
+}
+
+
+static void
+e_reflow_sorted_add_item(EReflow *reflow, GnomeCanvasItem *item)
+{
+	EReflowSorted *e_reflow_sorted = E_REFLOW_SORTED(reflow);
+	if ( e_reflow_sorted->compare_func ) {
+		reflow->items = g_list_insert_sorted(reflow->items, item, e_reflow_sorted->compare_func);
+
+		if ( GTK_OBJECT_FLAGS( e_reflow_sorted ) & GNOME_CANVAS_ITEM_REALIZED ) {
+			gnome_canvas_item_set(item,
+					      "width", (double) reflow->column_width,
+					      NULL);
+			e_canvas_item_request_reflow(item);
+		}
+	}
+}