Rearranged SUBDIRS for dependencies.

2000-03-12  Christopher James Lahey  <clahey@helixcode.com>

        * widgets/Makefile.am: Rearranged SUBDIRS for dependencies.

        * widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
        object which stores a piece of text data.  All methods are
        virtual.

        * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
        to use an ETextModel for its data.

        * widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.

        * widgets/e-minicard/test-minicard-label.c: Made this work again.

        * widgets/e-minicard/e-minicard.c,
        widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
        get its data.

        * widgets/e-minicard/e-minicard-label.c,
        widgets/e-minicard/e-minicard-label.h: Added the ability to set
        the text model used for the contained text widget.

        * widgets/e-minicard/Makefile.am: Added e-table since e-minicard
        is now dependent on an e-table-model for its data.

        * e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to
        speed up reflow and to make it fail less often.

        * addressbook/demo, addressbook/demo/.cvsignore,
        addressbook/demo/Makefile.am, addressbook/demo/demo.c,
        addressbook/demo/spec: A new program to test ETable and EMinicard
        integration.

        * configure.in: Added addressbook/demo/Makefile.

        * addressbook/Makefile.am: Added the demo/ subdirectory.

in widgets/e-table/:

2000-03-12  Christopher James Lahey  <clahey@helixcode.com>

        * e-table.c: Made this use an ECanvas.  Fixed a bug where
        e_table_new_from_spec_file was calling e_table_construct instead
        of e_table_construct_from_spec_file.

        * e-table-item.c, e-table-header-item.c, e-table-column-item.c:
        Switched these to use GTK_TYPE_OBJECT and GTK_VALUE_OBJECT instead
        of GTK_TYPE_POINTER and GTK_TYPE_OBJECT.

        * e-cell-text.c: Got rid of a crashing bug.

        * e-table-text-model.c, e-table-text-model.h: A new object which
        is an e-text-model which uses an e-table-model for its data.

        * Makefile.am: Added e-table-text-model.c and
        e-table-text-model.h.

        * .cvsignore: Added table-example-1 and table-example-2.

svn path=/trunk/; revision=2101

1 files changed, 217 insertions, 0 deletions

diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
new file mode 100644
index 0000000000..69ffdc3568
--- /dev/null
+++ b/widgets/text/e-table-text-model.c
@@ -0,0 +1,217 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* ETableTextModel - Text item model for evolution.
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * Author: Chris Lahey <clahey@umich.edu>
+ *
+ * A majority of code taken from:
+ *
+ * Text item type for GnomeCanvas widget
+ *
+ * GnomeCanvas is basically a port of the Tk toolkit's most excellent
+ * canvas widget.  Tk is copyrighted by the Regents of the University
+ * of California, Sun Microsystems, and other parties.
+ *
+ * Copyright (C) 1998 The Free Software Foundation
+ *
+ * Author: Federico Mena <federico@nuclecu.unam.mx> */
+
+#include <config.h>
+#include <ctype.h>
+#include "e-table-text-model.h"
+
+static void e_table_text_model_class_init (ETableTextModelClass *class);
+static void e_table_text_model_init (ETableTextModel *model);
+static void e_table_text_model_destroy (GtkObject *object);
+
+static gchar *e_table_text_model_get_text(ETextModel *model);
+static void e_table_text_model_set_text(ETextModel *model, gchar *text);
+static void e_table_text_model_insert(ETextModel *model, gint postion, gchar *text);
+static void e_table_text_model_insert_length(ETextModel *model, gint postion, gchar *text, gint length);
+static void e_table_text_model_delete(ETextModel *model, gint postion, gint length);
+
+static GtkObject *parent_class;
+
+
+
+/**
+ * e_table_text_model_get_type:
+ * @void: 
+ * 
+ * Registers the &ETableTextModel class if necessary, and returns the type ID
+ * associated to it.
+ * 
+ * Return value: The type ID of the &ETableTextModel class.
+ **/
+GtkType
+e_table_text_model_get_type (void)
+{
+	static GtkType model_type = 0;
+
+	if (!model_type) {
+		GtkTypeInfo model_info = {
+			"ETableTextModel",
+			sizeof (ETableTextModel),
+			sizeof (ETableTextModelClass),
+			(GtkClassInitFunc) e_table_text_model_class_init,
+			(GtkObjectInitFunc) e_table_text_model_init,
+			NULL, /* reserved_1 */
+			NULL, /* reserved_2 */
+			(GtkClassInitFunc) NULL
+		};
+
+		model_type = gtk_type_unique (e_text_model_get_type (), &model_info);
+	}
+
+	return model_type;
+}
+
+/* Class initialization function for the text item */
+static void
+e_table_text_model_class_init (ETableTextModelClass *klass)
+{
+	GtkObjectClass *object_class;
+	ETextModelClass *model_class;
+
+	object_class = (GtkObjectClass *) klass;
+	model_class = (ETextModelClass *) klass;
+
+	parent_class = gtk_type_class (e_text_model_get_type ());
+
+	model_class->get_text = e_table_text_model_get_text;
+	model_class->set_text = e_table_text_model_set_text;
+	model_class->insert = e_table_text_model_insert;
+	model_class->insert_length = e_table_text_model_insert_length;
+	model_class->delete = e_table_text_model_delete;
+	
+	object_class->destroy = e_table_text_model_destroy;
+}
+
+/* Object initialization function for the text item */
+static void
+e_table_text_model_init (ETableTextModel *model)
+{
+	model->model = NULL;
+	model->row = 0;
+	model->model_col = 0;
+	model->cell_changed_signal_id = 0;
+	model->row_changed_signal_id = 0;
+}
+
+/* Destroy handler for the text item */
+static void
+e_table_text_model_destroy (GtkObject *object)
+{
+	ETableTextModel *model;
+
+	g_return_if_fail (object != NULL);
+	g_return_if_fail (E_IS_TEXT_MODEL (object));
+
+	model = E_TABLE_TEXT_MODEL (object);
+
+	if (model->cell_changed_signal_id)
+		gtk_signal_disconnect(GTK_OBJECT(model->model), 
+				      model->cell_changed_signal_id);
+
+	if (model->row_changed_signal_id)
+		gtk_signal_disconnect(GTK_OBJECT(model->model), 
+				      model->row_changed_signal_id);
+
+	if (model->model)
+		gtk_object_unref(GTK_OBJECT(model->model));
+
+	if (GTK_OBJECT_CLASS (parent_class)->destroy)
+		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+static gchar *
+e_table_text_model_get_text(ETextModel *text_model)
+{
+	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
+	if ( model->model )
+		return (gchar *)e_table_model_value_at(model->model, model->model_col, model->row);
+	else
+		return "";
+}
+
+static void
+e_table_text_model_set_text(ETextModel *text_model, gchar *text)
+{
+	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
+	if ( model->model )
+		e_table_model_set_value_at(model->model, model->model_col, model->row, (void *) text);
+}
+
+static void
+e_table_text_model_insert(ETextModel *text_model, gint position, gchar *text)
+{
+	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
+	if ( model->model ) {
+		gchar *temp = (gchar *)e_table_model_value_at(model->model, model->model_col, model->row);
+		temp = g_strdup_printf("%.*s%s%s", position, temp, text, temp + position);
+		e_table_model_set_value_at(model->model, model->model_col, model->row, temp);
+		g_free(temp);
+	}
+}
+
+static void
+e_table_text_model_insert_length(ETextModel *text_model, gint position, gchar *text, gint length)
+{
+	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
+	if ( model->model ) {
+		gchar *temp = (gchar *)e_table_model_value_at(model->model, model->model_col, model->row);
+		temp = g_strdup_printf("%.*s%.*s%s", position, temp, length, text, temp + position);
+		e_table_model_set_value_at(model->model, model->model_col, model->row, temp);
+		g_free(temp);
+	}
+}
+
+static void
+e_table_text_model_delete(ETextModel *text_model, gint position, gint length)
+{
+	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
+	if ( model->model ) {
+		gchar *temp = (gchar *)e_table_model_value_at(model->model, model->model_col, model->row);
+		temp = g_strdup_printf("%.*s%s", position, temp, temp + position + length);
+		e_table_model_set_value_at(model->model, model->model_col, model->row, temp);
+		g_free(temp);
+	}
+}
+
+static void
+cell_changed(ETableModel *table_model, int model_col, int row, ETableTextModel *model)
+{
+	if (model->model_col == model_col &&
+	    model->row == row)
+		e_text_model_changed(E_TEXT_MODEL(model));
+}
+
+static void
+row_changed(ETableModel *table_model, int row, ETableTextModel *model)
+{
+	if (model->row == row)
+		e_text_model_changed(E_TEXT_MODEL(model));
+}
+
+ETableTextModel *
+e_table_text_model_new(ETableModel *table_model, int row, int model_col)
+{
+	ETableTextModel *model = gtk_type_new (e_table_text_model_get_type ());
+	model->model = table_model;
+	if ( model->model ) {
+		gtk_object_ref(GTK_OBJECT(model->model));
+		model->cell_changed_signal_id = 
+			gtk_signal_connect(GTK_OBJECT(model->model),
+					   "model_cell_changed",
+					   GTK_SIGNAL_FUNC(cell_changed),
+					   model);
+		model->row_changed_signal_id = 
+			gtk_signal_connect(GTK_OBJECT(model->model),
+					   "model_row_changed",
+					   GTK_SIGNAL_FUNC(row_changed),
+					   model);
+	}
+	model->row = row;
+	model->model_col = model_col;
+	return model;
+}
+