aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/Makefile.am2
-rw-r--r--addressbook/demo/.cvsignore7
-rw-r--r--addressbook/demo/Makefile.am23
-rw-r--r--addressbook/demo/demo.c608
-rw-r--r--addressbook/demo/spec12
-rw-r--r--addressbook/gui/minicard/Makefile.am10
-rw-r--r--addressbook/gui/minicard/e-minicard-label.c162
-rw-r--r--addressbook/gui/minicard/e-minicard-label.h4
-rw-r--r--addressbook/gui/minicard/e-minicard.c140
-rw-r--r--addressbook/gui/minicard/e-minicard.h9
-rw-r--r--addressbook/gui/minicard/test-minicard-label.c21
-rw-r--r--addressbook/gui/widgets/Makefile.am10
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c162
-rw-r--r--addressbook/gui/widgets/e-minicard-label.h4
-rw-r--r--addressbook/gui/widgets/e-minicard.c140
-rw-r--r--addressbook/gui/widgets/e-minicard.h9
-rw-r--r--addressbook/gui/widgets/test-minicard-label.c21
17 files changed, 1065 insertions, 279 deletions
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 2b588a0738..545fcc97f5 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,2 +1,2 @@
SUBDIRS = \
- contact-editor printing
+ contact-editor printing demo
diff --git a/addressbook/demo/.cvsignore b/addressbook/demo/.cvsignore
new file mode 100644
index 0000000000..d4bfaff068
--- /dev/null
+++ b/addressbook/demo/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+*.la
+evolution-addressbook \ No newline at end of file
diff --git a/addressbook/demo/Makefile.am b/addressbook/demo/Makefile.am
new file mode 100644
index 0000000000..728f66d201
--- /dev/null
+++ b/addressbook/demo/Makefile.am
@@ -0,0 +1,23 @@
+INCLUDES = \
+ $(EXTRA_GNOME_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ -I$(top_srcdir)/widgets/e-text \
+ -I$(top_srcdir)/e-util \
+ -I$(top_srcdir)/widgets/e-table \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/widgets/e-minicard
+
+noinst_PROGRAMS = \
+ evolution-addressbook
+
+evolution_addressbook_SOURCES = \
+ demo.c
+
+evolution_addressbook_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(top_builddir)/widgets/e-minicard/libeminicard.a \
+ $(top_builddir)/widgets/e-table/libetable.a \
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/e-util/libeutil.la
+
+evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf`
diff --git a/addressbook/demo/demo.c b/addressbook/demo/demo.c
new file mode 100644
index 0000000000..4a45b50870
--- /dev/null
+++ b/addressbook/demo/demo.c
@@ -0,0 +1,608 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#include <stdio.h>
+#include <string.h>
+#include <gnome.h>
+#include <gnome-xml/tree.h>
+#include <gnome-xml/parser.h>
+#include <gnome-xml/xmlmemory.h>
+#include "e-util/e-cursors.h"
+#include "e-canvas.h"
+#include "e-table-simple.h"
+#include "e-table-header.h"
+#include "e-table-header-item.h"
+#include "e-table-item.h"
+#include "e-cell-text.h"
+#include "e-cell-checkbox.h"
+#include "e-table.h"
+#include "e-reflow.h"
+#include "e-minicard.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "table-test.h"
+
+#define COLS 4
+
+/* Here we define the initial layout of the table. This is an xml
+ format that allows you to change the initial ordering of the
+ columns or to do sorting or grouping initially. This specification
+ shows all 5 columns, but moves the importance column nearer to the
+ front. It also sorts by the "Full Name" column (ascending.)
+ Sorting and grouping take the model column as their arguments
+ (sorting is specified by the "column" argument to the leaf elemnt. */
+#define INITIAL_SPEC "<ETableSpecification> \
+ <columns-shown> \
+ <column> 0 </column> \
+ <column> 1 </column> \
+ <column> 2 </column> \
+ <column> 3 </column> \
+ </columns-shown> \
+ <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \
+</ETableSpecification>"
+
+char *headers[COLS] = {
+ "Email",
+ "Full Name",
+ "Address",
+ "Phone"
+};
+
+typedef struct _address address;
+typedef enum _rows rows;
+
+struct _address {
+ gchar *email;
+ gchar *full_name;
+ gchar *street;
+ gchar *phone;
+};
+
+enum _rows {
+ EMAIL,
+ FULL_NAME,
+ STREET,
+ PHONE,
+ LAST_COL
+};
+
+/* Virtual Column list:
+ 0 Email
+ 1 Full Name
+ 2 Street
+ 3 Phone
+*/
+
+
+
+static address **data;
+static int data_count;
+static ETableModel *e_table_model = NULL;
+static GtkWidget *e_table;
+static int window_count = 0;
+
+/*
+ * ETableSimple callbacks
+ * These are the callbacks that define the behavior of our custom model.
+ */
+
+/* Since our model is a constant size, we can just return its size in
+ the column and row count fields. */
+
+/* This function returns the number of columns in our ETableModel. */
+static int
+my_col_count (ETableModel *etc, void *data)
+{
+ return COLS;
+}
+
+/* This function returns the number of rows in our ETableModel. */
+static int
+my_row_count (ETableModel *etc, void *data)
+{
+ return data_count;
+}
+
+/* This function returns the value at a particular point in our ETableModel. */
+static void *
+my_value_at (ETableModel *etc, int col, int row, void *unused)
+{
+ if ( col >= LAST_COL || row >= data_count )
+ return NULL;
+ switch (col) {
+ case EMAIL:
+ return data[row]->email;
+ case FULL_NAME:
+ return data[row]->full_name;
+ case STREET:
+ return data[row]->street;
+ case PHONE:
+ return data[row]->phone;
+ default:
+ return NULL;
+ }
+}
+
+/* This function sets the value at a particular point in our ETableModel. */
+static void
+my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *unused)
+{
+ if ( col >= LAST_COL || row >= data_count )
+ return;
+ switch (col) {
+ case EMAIL:
+ g_free (data[row]->email);
+ data[row]->email = g_strdup (val);
+ break;
+ case FULL_NAME:
+ g_free (data[row]->full_name);
+ data[row]->full_name = g_strdup (val);
+ break;
+ case STREET:
+ g_free (data[row]->street);
+ data[row]->street = g_strdup (val);
+ break;
+ case PHONE:
+ g_free (data[row]->phone);
+ data[row]->phone = g_strdup (val);
+ break;
+ default:
+ return;
+ }
+}
+
+/* This function returns whether a particular cell is editable. */
+static gboolean
+my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
+{
+ return TRUE;
+}
+
+/* This function duplicates the value passed to it. */
+static void *
+my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
+{
+ return g_strdup(value);
+}
+
+/* This function frees the value passed to it. */
+static void
+my_free_value (ETableModel *etc, int col, void *value, void *data)
+{
+ g_free(value);
+}
+
+/* This function is for when the model is unfrozen. This can mostly
+ be ignored for simple models. */
+static void
+my_thaw (ETableModel *etc, void *data)
+{
+}
+
+static int idle;
+
+static gboolean
+save(gpointer unused)
+{
+ int i;
+ xmlDoc *document = xmlNewDoc("1.0");
+ xmlNode *root;
+ root = xmlNewDocNode(document, NULL, "address-book", NULL);
+ xmlDocSetRootElement(document, root);
+ for ( i = 0; i < data_count; i++ ) {
+ xmlNode *xml_address = xmlNewChild(root, NULL, "address", NULL);
+ if ( data[i]->email && *data[i]->email )
+ xmlSetProp(xml_address, "email", data[i]->email);
+ if ( data[i]->email && *data[i]->street )
+ xmlSetProp(xml_address, "street", data[i]->street);
+ if ( data[i]->email && *data[i]->full_name )
+ xmlSetProp(xml_address, "full-name", data[i]->full_name);
+ if ( data[i]->email && *data[i]->phone )
+ xmlSetProp(xml_address, "phone", data[i]->phone);
+ }
+ xmlSaveFile ("addressbook.xml", document);
+ idle = 0;
+ /* e_table_save_specification(E_TABLE(e_table), "spec"); */
+ return FALSE;
+}
+
+static void
+queue_save()
+{
+ if ( !idle )
+ idle = g_idle_add(save, NULL);
+}
+
+static void
+add_column (ETableModel *etc, address *newadd)
+{
+ data = g_realloc(data, (++data_count) * sizeof(address *));
+ data[data_count - 1] = newadd;
+ queue_save();
+ if ( etc )
+ e_table_model_changed(etc);
+}
+
+
+static void
+init_data()
+{
+ data = NULL;
+ data_count = 0;
+}
+
+static void
+create_model()
+{
+ xmlDoc *document;
+ xmlNode *xml_addressbook;
+ xmlNode *xml_address;
+
+ /* First we fill in the simple data. */
+ init_data();
+ if ( g_file_exists("addressbook.xml") ) {
+ document = xmlParseFile("addressbook.xml");
+ xml_addressbook = xmlDocGetRootElement(document);
+ for (xml_address = xml_addressbook->childs; xml_address; xml_address = xml_address->next) {
+ char *datum;
+ address *newadd;
+
+ newadd = g_new(address, 1);
+
+ datum = xmlGetProp(xml_address, "email");
+ if ( datum ) {
+ newadd->email = g_strdup(datum);
+ xmlFree(datum);
+ } else
+ newadd->email = g_strdup("");
+
+ datum = xmlGetProp(xml_address, "street");
+ if ( datum ) {
+ newadd->street = g_strdup(datum);
+ xmlFree(datum);
+ } else
+ newadd->street = g_strdup("");
+
+ datum = xmlGetProp(xml_address, "full-name");
+ if ( datum ) {
+ newadd->full_name = g_strdup(datum);
+ xmlFree(datum);
+ } else
+ newadd->full_name = g_strdup("");
+
+ datum = xmlGetProp(xml_address, "phone");
+ if ( datum ) {
+ newadd->phone = g_strdup(datum);
+ xmlFree(datum);
+ } else
+ newadd->phone = g_strdup("");
+ add_column (NULL, newadd);
+ }
+ xmlFreeDoc(document);
+ }
+
+
+ e_table_model = e_table_simple_new (
+ my_col_count, my_row_count, my_value_at,
+ my_set_value_at, my_is_cell_editable,
+ my_duplicate_value, my_free_value, my_thaw, NULL);
+
+ gtk_signal_connect(GTK_OBJECT(e_table_model), "model_changed",
+ GTK_SIGNAL_FUNC(queue_save), NULL);
+ gtk_signal_connect(GTK_OBJECT(e_table_model), "model_row_changed",
+ GTK_SIGNAL_FUNC(queue_save), NULL);
+ gtk_signal_connect(GTK_OBJECT(e_table_model), "model_cell_changed",
+ GTK_SIGNAL_FUNC(queue_save), NULL);
+}
+
+static void
+add_address_cb(GtkWidget *button, gpointer data)
+{
+ address *newadd = g_new(address, 1);
+ newadd->email = g_strdup("");
+ newadd->phone = g_strdup("");
+ newadd->full_name = g_strdup("");
+ newadd->street = g_strdup("");
+ add_column (e_table_model, newadd);
+}
+
+typedef struct {
+ GtkAllocation last_alloc;
+ GnomeCanvasItem *reflow;
+ GtkWidget *canvas;
+ GnomeCanvasItem *rect;
+} reflow_demo;
+
+static void
+rebuild_reflow(ETableModel *model, gpointer data)
+{
+ int i;
+ reflow_demo *demo = (reflow_demo *)data;
+ gtk_object_destroy(GTK_OBJECT(demo->reflow));
+ demo->reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( demo->canvas ) ),
+ e_reflow_get_type(),
+ "x", (double) 0,
+ "y", (double) 0,
+ "height", (double) 100,
+ "minimum_width", (double) 100,
+ NULL );
+
+ for ( i = 0; i < data_count; i++ )
+ {
+ GnomeCanvasItem *item;
+ item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(demo->reflow),
+ e_minicard_get_type(),
+ "model", e_table_model,
+ "row", i,
+ NULL);
+ e_reflow_add_item(E_REFLOW(demo->reflow), item);
+ }
+ e_canvas_item_request_reflow(demo->reflow);
+}
+
+static void destroy_callback(GtkWidget *app, gpointer data)
+{
+ reflow_demo *demo = (reflow_demo *)data;
+ g_free(demo);
+ window_count --;
+ if ( window_count <= 0 )
+ exit(0);
+}
+
+static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
+{
+ double width;
+ reflow_demo *demo = (reflow_demo *)data;
+ demo->last_alloc = *allocation;
+ gnome_canvas_item_set( demo->reflow,
+ "height", (double) allocation->height,
+ NULL );
+ gnome_canvas_item_set( demo->reflow,
+ "minimum_width", (double) allocation->width,
+ NULL );
+ gtk_object_get(GTK_OBJECT(demo->reflow),
+ "width", &width,
+ NULL);
+ width = MAX(width, allocation->width);
+ gnome_canvas_set_scroll_region(GNOME_CANVAS( demo->canvas ), 0, 0, width, allocation->height );
+ gnome_canvas_item_set( demo->rect,
+ "x2", (double) width,
+ "y2", (double) allocation->height,
+ NULL );
+}
+
+static void resize(ECanvas *canvas, gpointer data)
+{
+ double width;
+ reflow_demo *demo = (reflow_demo *)data;
+ gtk_object_get(GTK_OBJECT(demo->reflow),
+ "width", &width,
+ NULL);
+ width = MAX(width, demo->last_alloc.width);
+ gnome_canvas_set_scroll_region(GNOME_CANVAS(demo->canvas), 0, 0, width, demo->last_alloc.height );
+ gnome_canvas_item_set( demo->rect,
+ "x2", (double) width,
+ "y2", (double) demo->last_alloc.height,
+ NULL );
+}
+
+static void
+create_reflow()
+{
+ GtkWidget *window, *frame;
+ GtkWidget *button;
+ GtkWidget *vbox;
+ GtkWidget *inner_vbox;
+ GtkWidget *scrollbar;
+ int i;
+ reflow_demo *demo = g_new(reflow_demo, 1);
+
+ /* Next we create our model. This uses the functions we defined
+ earlier. */
+ if ( e_table_model == NULL )
+ create_model();
+
+ /* Here we create a window for our new table. This window
+ will get shown and the person will be able to test their
+ item. */
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ /* This frame is simply to get a bevel around our table. */
+ frame = gtk_frame_new (NULL);
+ /* Here we create the table. We give it the three pieces of
+ the table we've created, the header, the model, and the
+ initial layout. It does the rest. */
+ inner_vbox = gtk_vbox_new(FALSE, 0);
+ demo->canvas = e_canvas_new();
+ demo->rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( demo->canvas ) ),
+ gnome_canvas_rect_get_type(),
+ "x1", (double) 0,
+ "y1", (double) 0,
+ "x2", (double) 100,
+ "y2", (double) 100,
+ "fill_color", "white",
+ NULL );
+ demo->reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( demo->canvas ) ),
+ e_reflow_get_type(),
+ "x", (double) 0,
+ "y", (double) 0,
+ "height", (double) 100,
+ "minimum_width", (double) 100,
+ NULL );
+
+ gtk_signal_connect( GTK_OBJECT( demo->canvas ), "reflow",
+ GTK_SIGNAL_FUNC( resize ),
+ ( gpointer ) demo);
+
+ for ( i = 0; i < data_count; i++ )
+ {
+ GnomeCanvasItem *item;
+ item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(demo->reflow),
+ e_minicard_get_type(),
+ "model", e_table_model,
+ "row", i,
+ NULL);
+ e_reflow_add_item(E_REFLOW(demo->reflow), item);
+ }
+ gnome_canvas_set_scroll_region ( GNOME_CANVAS( demo->canvas ),
+ 0, 0,
+ 100, 100 );
+
+ scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(demo->canvas)));
+
+ /* Connect the signals */
+ gtk_signal_connect( GTK_OBJECT( window ), "destroy",
+ GTK_SIGNAL_FUNC( destroy_callback ),
+ ( gpointer ) demo );
+
+ gtk_signal_connect( GTK_OBJECT( demo->canvas ), "size_allocate",
+ GTK_SIGNAL_FUNC( allocate_callback ),
+ ( gpointer ) demo );
+
+ gdk_window_set_back_pixmap( GTK_LAYOUT(demo->canvas)->bin_window, NULL, FALSE);
+
+ vbox = gtk_vbox_new(FALSE, 0);
+
+ button = gtk_button_new_with_label("Add address");
+ gtk_signal_connect(GTK_OBJECT(button), "clicked",
+ GTK_SIGNAL_FUNC(add_address_cb), demo);
+
+ gtk_signal_connect(GTK_OBJECT( e_table_model), "model_changed",
+ GTK_SIGNAL_FUNC(rebuild_reflow), demo);
+
+ /* Build the gtk widget hierarchy. */
+ gtk_box_pack_start(GTK_BOX(inner_vbox), demo->canvas, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(inner_vbox), scrollbar, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (frame), inner_vbox);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (window), vbox);
+
+ /* Size the initial window. */
+ gtk_widget_set_usize (window, 200, 200);
+ /* Show it all. */
+ gtk_widget_show_all (window);
+ window_count ++;
+}
+
+static void e_table_destroy_callback(GtkWidget *app, gpointer data)
+{
+ window_count --;
+ if ( window_count <= 0 )
+ exit(0);
+}
+
+/* We create a window containing our new table. */
+static void
+create_table()
+{
+ GtkWidget *window, *frame;
+ ECell *cell_left_just;
+ ETableHeader *e_table_header;
+ GtkWidget *button;
+ GtkWidget *vbox;
+ int i;
+ /* Next we create our model. This uses the functions we defined
+ earlier. */
+ if ( e_table_model == NULL )
+ create_model();
+ /*
+ Next we create a header. The ETableHeader is used in two
+ different way. The first is the full_header. This is the
+ list of possible columns in the view. The second use is
+ completely internal. Many of the ETableHeader functions are
+ for that purpose. The only functions we really need are
+ e_table_header_new and e_table_header_add_col.
+
+ First we create the header. */
+ e_table_header = e_table_header_new ();
+
+ /* Next we have to build renderers for all of the columns.
+ Since all our columns are text columns, we can simply use
+ the same renderer over and over again. If we had different
+ types of columns, we could use a different renderer for
+ each column. */
+ cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT, TRUE);
+
+ /* Next we create a column object for each view column and add
+ them to the header. We don't create a column object for
+ the importance column since it will not be shown. */
+ for (i = 0; i < COLS; i++){
+ /* Create the column. */
+ ETableCol *ecol = e_table_col_new (
+ i, headers [i],
+ 80, 20, cell_left_just,
+ g_str_compare, TRUE);
+ /* Add it to the header. */
+ e_table_header_add_column (e_table_header, ecol, i);
+ }
+
+ /* Here we create a window for our new table. This window
+ will get shown and the person will be able to test their
+ item. */
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ /* This frame is simply to get a bevel around our table. */
+ frame = gtk_frame_new (NULL);
+ /* Here we create the table. We give it the three pieces of
+ the table we've created, the header, the model, and the
+ initial layout. It does the rest. */
+ e_table = e_table_new_from_spec_file (e_table_header, e_table_model, "spec");
+
+ gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)->sort_info), "sort_info_changed",
+ GTK_SIGNAL_FUNC(queue_save), NULL);
+
+ gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)->header), "structure_change",
+ GTK_SIGNAL_FUNC(queue_save), NULL);
+ gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)->header), "dimension_change",
+ GTK_SIGNAL_FUNC(queue_save), NULL);
+
+ gtk_signal_connect( GTK_OBJECT( window ), "destroy",
+ GTK_SIGNAL_FUNC( e_table_destroy_callback ),
+ NULL );
+
+ vbox = gtk_vbox_new(FALSE, 0);
+
+ button = gtk_button_new_with_label("Add address");
+ gtk_signal_connect(GTK_OBJECT(button), "clicked",
+ GTK_SIGNAL_FUNC(add_address_cb), NULL);
+
+ /* Build the gtk widget hierarchy. */
+ gtk_container_add (GTK_CONTAINER (frame), e_table);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (window), vbox);
+
+ /* Size the initial window. */
+ gtk_widget_set_usize (window, 200, 200);
+ /* Show it all. */
+ gtk_widget_show_all (window);
+ window_count ++;
+}
+
+/* This is the main function which just initializes gnome and call our create_table function */
+
+int
+main (int argc, char *argv [])
+{
+ gnome_init ("TableExample", "TableExample", argc, argv);
+ e_cursors_init ();
+
+ gtk_widget_push_visual (gdk_rgb_get_visual ());
+ gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+
+ create_table();
+ create_table();
+ create_table();
+ create_reflow();
+ create_reflow();
+
+ gtk_main ();
+
+ e_cursors_shutdown ();
+ return 0;
+}
+
+
+
+
+
+
+
diff --git a/addressbook/demo/spec b/addressbook/demo/spec
new file mode 100644
index 0000000000..2d366ed75f
--- /dev/null
+++ b/addressbook/demo/spec
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ETableSpecification>
+ <columns-shown>
+ <column>1</column>
+ <column>0</column>
+ <column>2</column>
+ <column>3</column>
+ </columns-shown>
+ <grouping>
+ <leaf column="2" ascending="1"/>
+ </grouping>
+</ETableSpecification>
diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am
index 65253e06f1..e1b130bc2a 100644
--- a/addressbook/gui/minicard/Makefile.am
+++ b/addressbook/gui/minicard/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/e-util \
+ -I$(top_srcdir)/widgets/e-table \
$(GNOME_INCLUDEDIR)
noinst_LIBRARIES = \
@@ -26,7 +27,8 @@ minicard_label_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a
minicard_test_SOURCES = \
test-minicard.c
@@ -35,7 +37,8 @@ minicard_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a
reflow_test_SOURCES = \
test-reflow.c
@@ -44,4 +47,5 @@ reflow_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a
diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c
index 25f7f939fc..799eb87cd1 100644
--- a/addressbook/gui/minicard/e-minicard-label.c
+++ b/addressbook/gui/minicard/e-minicard-label.c
@@ -46,7 +46,8 @@ enum {
ARG_HEIGHT,
ARG_HAS_FOCUS,
ARG_FIELD,
- ARG_FIELDNAME
+ ARG_FIELDNAME,
+ ARG_TEXT_MODEL
};
GtkType
@@ -95,6 +96,8 @@ e_minicard_label_class_init (EMinicardLabelClass *klass)
GTK_ARG_READWRITE, ARG_FIELD);
gtk_object_add_arg_type ("EMinicardLabel::fieldname", GTK_TYPE_STRING,
GTK_ARG_READWRITE, ARG_FIELDNAME);
+ gtk_object_add_arg_type ("EMinicardLabel::text_model", GTK_TYPE_OBJECT,
+ GTK_ARG_READWRITE, ARG_TEXT_MODEL);
object_class->set_arg = e_minicard_label_set_arg;
object_class->get_arg = e_minicard_label_get_arg;
@@ -114,8 +117,6 @@ e_minicard_label_init (EMinicardLabel *minicard_label)
minicard_label->rect = NULL;
minicard_label->fieldname = NULL;
minicard_label->field = NULL;
- minicard_label->fieldname_text = NULL;
- minicard_label->field_text = NULL;
e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);
}
@@ -131,26 +132,23 @@ e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
switch (arg_id){
case ARG_WIDTH:
- e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
- e_minicard_label_resize_children(e_minicard_label);
- e_canvas_item_request_reflow (item);
- break;
+ e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
+ e_minicard_label_resize_children(e_minicard_label);
+ e_canvas_item_request_reflow (item);
+ break;
case ARG_HAS_FOCUS:
if (e_minicard_label->field && (GTK_VALUE_ENUM(*arg) != E_FOCUS_NONE))
e_canvas_item_grab_focus(e_minicard_label->field);
break;
case ARG_FIELD:
- if ( e_minicard_label->field )
- gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
- else
- e_minicard_label->field_text = g_strdup( GTK_VALUE_STRING (*arg) );
- break;
+ gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
+ break;
case ARG_FIELDNAME:
- if ( e_minicard_label->fieldname )
- gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
- else
- e_minicard_label->fieldname_text = g_strdup( GTK_VALUE_STRING (*arg) );
- break;
+ gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
+ break;
+ case ARG_TEXT_MODEL:
+ gnome_canvas_item_set( e_minicard_label->field, "model", GTK_VALUE_OBJECT (*arg), NULL);
+ break;
}
}
@@ -159,32 +157,31 @@ e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
EMinicardLabel *e_minicard_label;
char *temp;
+ ETextModel *tempmodel;
e_minicard_label = E_MINICARD_LABEL (object);
switch (arg_id) {
case ARG_WIDTH:
- GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
- break;
+ GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
+ break;
case ARG_HEIGHT:
- GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
- break;
+ GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
+ break;
case ARG_HAS_FOCUS:
GTK_VALUE_ENUM (*arg) = e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
break;
case ARG_FIELD:
- if ( e_minicard_label->field ) {
- gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
- GTK_VALUE_STRING (*arg) = temp;
- } else
- GTK_VALUE_STRING (*arg) = g_strdup( e_minicard_label->field_text );
+ gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
+ GTK_VALUE_STRING (*arg) = temp;
break;
case ARG_FIELDNAME:
- if ( e_minicard_label->fieldname ) {
- gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
- GTK_VALUE_STRING (*arg) = temp;
- } else
- GTK_VALUE_STRING (*arg) = g_strdup( e_minicard_label->fieldname_text );
+ gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
+ GTK_VALUE_STRING (*arg) = temp;
+ break;
+ case ARG_TEXT_MODEL:
+ gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "model", &tempmodel, NULL );
+ GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(tempmodel);
break;
default:
arg->type = GTK_TYPE_INVALID;
@@ -195,6 +192,19 @@ e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
static void
e_minicard_label_realize (GnomeCanvasItem *item)
{
+ if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
+ (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
+
+ e_canvas_item_request_reflow(item);
+
+ if (!item->canvas->aa)
+ {
+ }
+}
+
+void
+e_minicard_label_construct (GnomeCanvasItem *item)
+{
EMinicardLabel *e_minicard_label;
GnomeCanvasGroup *group;
static GdkFont *font = NULL;
@@ -206,9 +216,6 @@ e_minicard_label_realize (GnomeCanvasItem *item)
e_minicard_label = E_MINICARD_LABEL (item);
group = GNOME_CANVAS_GROUP( item );
- if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
- (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
e_minicard_label->rect =
gnome_canvas_item_new( group,
gnome_canvas_rect_get_type(),
@@ -229,13 +236,6 @@ e_minicard_label_realize (GnomeCanvasItem *item)
"fill_color", "black",
NULL );
e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
- if ( e_minicard_label->fieldname_text )
- {
- gnome_canvas_item_set( e_minicard_label->fieldname,
- "text", e_minicard_label->fieldname_text,
- NULL );
- g_free( e_minicard_label->fieldname_text );
- }
e_minicard_label->field =
gnome_canvas_item_new( group,
@@ -249,20 +249,8 @@ e_minicard_label_realize (GnomeCanvasItem *item)
"editable", TRUE,
NULL );
e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
- if ( e_minicard_label->field_text )
- {
- gnome_canvas_item_set( e_minicard_label->field,
- "text", e_minicard_label->field_text,
- NULL );
- g_free( e_minicard_label->field_text );
- }
e_canvas_item_request_reflow(item);
-
- if (!item->canvas->aa)
- {
- }
-
}
static void
@@ -379,49 +367,53 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
static void
e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
{
- if ( GTK_OBJECT_FLAGS( e_minicard_label ) & GNOME_CANVAS_ITEM_REALIZED ) {
- gnome_canvas_item_set( e_minicard_label->fieldname,
- "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
- NULL );
- gnome_canvas_item_set( e_minicard_label->field,
- "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
- NULL );
- }
+ gnome_canvas_item_set( e_minicard_label->fieldname,
+ "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
+ NULL );
+ gnome_canvas_item_set( e_minicard_label->field,
+ "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
+ NULL );
}
static void
e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
{
EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
- if ( GTK_OBJECT_FLAGS( e_minicard_label ) & GNOME_CANVAS_ITEM_REALIZED )
- {
- gint old_height;
- gdouble text_height;
- old_height = e_minicard_label->height;
+
+ gint old_height;
+ gdouble text_height;
+ old_height = e_minicard_label->height;
- gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname),
- "text_height", &text_height,
- NULL);
+ gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname),
+ "text_height", &text_height,
+ NULL);
- e_minicard_label->height = text_height;
+ e_minicard_label->height = text_height;
- gtk_object_get(GTK_OBJECT(e_minicard_label->field),
- "text_height", &text_height,
- NULL);
+ gtk_object_get(GTK_OBJECT(e_minicard_label->field),
+ "text_height", &text_height,
+ NULL);
- if (e_minicard_label->height < text_height)
- e_minicard_label->height = text_height;
- e_minicard_label->height += 3;
+ if (e_minicard_label->height < text_height)
+ e_minicard_label->height = text_height;
+ e_minicard_label->height += 3;
- gnome_canvas_item_set( e_minicard_label->rect,
- "x2", (double) e_minicard_label->width - 1,
- "y2", (double) e_minicard_label->height - 1,
- NULL );
- e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
+ gnome_canvas_item_set( e_minicard_label->rect,
+ "x2", (double) e_minicard_label->width - 1,
+ "y2", (double) e_minicard_label->height - 1,
+ NULL );
+ e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
- if (old_height != e_minicard_label->height)
- e_canvas_item_request_parent_reflow(item);
-
- }
+ if (old_height != e_minicard_label->height)
+ e_canvas_item_request_parent_reflow(item);
}
+
+GnomeCanvasItem *
+e_minicard_label_new(GnomeCanvasGroup *parent)
+{
+ GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
+ e_minicard_label_construct(item);
+ return item;
+}
+
diff --git a/addressbook/gui/minicard/e-minicard-label.h b/addressbook/gui/minicard/e-minicard-label.h
index b439c53f9d..1790414a54 100644
--- a/addressbook/gui/minicard/e-minicard-label.h
+++ b/addressbook/gui/minicard/e-minicard-label.h
@@ -60,8 +60,6 @@ struct _EMinicardLabel
GnomeCanvasItem *fieldname;
GnomeCanvasItem *field;
GnomeCanvasItem *rect;
- char *fieldname_text;
- char *field_text;
gboolean has_focus;
};
@@ -73,6 +71,8 @@ struct _EMinicardLabelClass
GtkType e_minicard_label_get_type (void);
+GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
+void e_minicard_label_construct (GnomeCanvasItem *item);
#ifdef __cplusplus
}
diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c
index 79668b6507..b7b9a4c10e 100644
--- a/addressbook/gui/minicard/e-minicard.c
+++ b/addressbook/gui/minicard/e-minicard.c
@@ -24,6 +24,7 @@
#include "e-minicard.h"
#include "e-minicard-label.h"
#include "e-text.h"
+#include "e-table-text-model.h"
#include "e-canvas.h"
#include "e-util.h"
#include "e-canvas-utils.h"
@@ -37,6 +38,7 @@ static void e_minicard_unrealize (GnomeCanvasItem *item);
static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );
static void e_minicard_resize_children( EMinicard *e_minicard );
+static void remodel( EMinicard *e_minicard );
static GnomeCanvasGroupClass *parent_class = NULL;
@@ -46,7 +48,9 @@ enum {
ARG_WIDTH,
ARG_HEIGHT,
ARG_HAS_FOCUS,
- ARG_CARD
+ ARG_CARD,
+ ARG_MODEL,
+ ARG_ROW
};
GtkType
@@ -93,6 +97,10 @@ e_minicard_class_init (EMinicardClass *klass)
GTK_ARG_READWRITE, ARG_HAS_FOCUS);
gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT,
GTK_ARG_READWRITE, ARG_CARD);
+ gtk_object_add_arg_type ("EMinicard::model", GTK_TYPE_OBJECT,
+ GTK_ARG_READWRITE, ARG_MODEL);
+ gtk_object_add_arg_type ("EMinicard::row", GTK_TYPE_INT,
+ GTK_ARG_READWRITE, ARG_ROW);
object_class->set_arg = e_minicard_set_arg;
object_class->get_arg = e_minicard_get_arg;
@@ -113,6 +121,9 @@ e_minicard_init (EMinicard *minicard)
minicard->width = 10;
minicard->height = 10;
minicard->has_focus = FALSE;
+
+ minicard->model = NULL;
+ minicard->row = 0;
e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
}
@@ -131,7 +142,8 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
if (e_minicard->width != GTK_VALUE_DOUBLE (*arg)) {
e_minicard->width = GTK_VALUE_DOUBLE (*arg);
e_minicard_resize_children(e_minicard);
- e_canvas_item_request_reflow(item);
+ if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
+ e_canvas_item_request_reflow(item);
}
break;
case ARG_HAS_FOCUS:
@@ -148,13 +160,23 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
}
}
else
- e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(e_minicard));
+ e_canvas_item_grab_focus(item);
break;
case ARG_CARD:
- /* e_minicard->card = GTK_VALUE_POINTER (*arg);
+ /* e_minicard->card = GTK_VALUE_OBJECT (*arg);
_update_card(e_minicard);
gnome_canvas_item_request_update (item);*/
break;
+ case ARG_MODEL:
+ e_minicard->model = E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg));
+ remodel(e_minicard);
+ e_canvas_item_request_reflow(item);
+ break;
+ case ARG_ROW:
+ e_minicard->row = GTK_VALUE_INT (*arg);
+ remodel(e_minicard);
+ e_canvas_item_request_reflow(item);
+ break;
}
}
@@ -176,8 +198,14 @@ e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
break;
case ARG_CARD:
- /* GTK_VALUE_POINTER (*arg) = e_minicard->card; */
+ /* GTK_VALUE_OBJECT (*arg) = e_minicard->card; */
break;
+ case ARG_MODEL:
+ GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->model);
+ break;
+ case ARG_ROW:
+ GTK_VALUE_INT (*arg) = e_minicard->row;
+ break;
default:
arg->type = GTK_TYPE_INVALID;
break;
@@ -229,41 +257,46 @@ e_minicard_realize (GnomeCanvasItem *item)
"text", "Chris Lahey",
NULL );
e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
+
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4.0,
+ "fieldname", "Email:",
+ "field", "clahey@address.com",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4,
+ "fieldname", "Full Name:",
+ "field", "Christopher James Lahey",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- if ( rand() % 2 ) {
- new_item = gnome_canvas_item_new( group,
- e_minicard_label_get_type(),
- "width", e_minicard->width - 4,
- "fieldname", "Full Name:",
- "field", "Christopher James Lahey",
- NULL );
- e_minicard->fields = g_list_append( e_minicard->fields, new_item);
- e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- }
-
- if (rand() % 2) {
- new_item = gnome_canvas_item_new( group,
- e_minicard_label_get_type(),
- "width", e_minicard->width - 4,
- "fieldname", "Address:",
- "field", "100 Main St\nHome town, USA",
- NULL );
- e_minicard->fields = g_list_append( e_minicard->fields, new_item);
- e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- }
-
- if (rand() % 2) {
- new_item = gnome_canvas_item_new( group,
- e_minicard_label_get_type(),
- "width", e_minicard->width - 4.0,
- "fieldname", "Email:",
- "field", "clahey@address.com",
- NULL );
- e_minicard->fields = g_list_append( e_minicard->fields, new_item);
- e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- }
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4,
+ "fieldname", "Street Address:",
+ "field", "100 Main St\nHome town, USA",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4,
+ "fieldname", "Phone:",
+ "field", "000-0000",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+
+ remodel(e_minicard);
e_canvas_item_request_reflow(item);
-
+
if (!item->canvas->aa) {
}
}
@@ -384,6 +417,35 @@ e_minicard_resize_children( EMinicard *e_minicard )
}
static void
+remodel( EMinicard *e_minicard )
+{
+ GnomeCanvasGroup *group;
+
+ group = GNOME_CANVAS_GROUP( e_minicard );
+
+ if ( e_minicard->model ) {
+ gint column = 0;
+ GList *list = e_minicard->fields;
+ ETableTextModel *model;
+ for ( ; list; list = list->next, column++ ) {
+ ETableTextModel *model = e_table_text_model_new(e_minicard->model, e_minicard->row, column);
+ gnome_canvas_item_set(GNOME_CANVAS_ITEM(list->data),
+ "text_model", model,
+ NULL);
+ gtk_object_sink(GTK_OBJECT(model));
+ }
+ if ( e_minicard->header_text ) {
+ model = e_table_text_model_new(e_minicard->model, e_minicard->row, 1);
+ gnome_canvas_item_set(GNOME_CANVAS_ITEM(e_minicard->header_text),
+ "model", model,
+ NULL);
+ gtk_object_sink(GTK_OBJECT(model));
+ }
+
+ }
+}
+
+static void
e_minicard_reflow( GnomeCanvasItem *item, int flags )
{
EMinicard *e_minicard = E_MINICARD(item);
@@ -391,7 +453,7 @@ e_minicard_reflow( GnomeCanvasItem *item, int flags )
GList *list;
gdouble text_height;
gint old_height;
-
+
old_height = e_minicard->height;
gtk_object_get( GTK_OBJECT( e_minicard->header_text ),
diff --git a/addressbook/gui/minicard/e-minicard.h b/addressbook/gui/minicard/e-minicard.h
index 3be80c1586..05d95a743e 100644
--- a/addressbook/gui/minicard/e-minicard.h
+++ b/addressbook/gui/minicard/e-minicard.h
@@ -22,6 +22,7 @@
#define __E_MINICARD_H__
#include <gnome.h>
+#include "e-table-model.h"
#ifdef __cplusplus
extern "C" {
@@ -36,6 +37,10 @@ extern "C" {
* --------------------------------------------------------------------------------
* width double RW width of the card
* height double R height of the card
+ * model ETableModel RW model to read from
+ * row int RW ETableModel row to read from
+ *
+ * Later:
* card ECard* RW Pointer to the ECard
*/
@@ -66,6 +71,10 @@ struct _EMinicard
GnomeCanvasItem *header_rect;
GnomeCanvasItem *header_text;
GList *fields; /* Of type GnomeCanvasItem. */
+
+ ETableModel *model;
+ int row;
+ guint needs_remodeling : 1;
gboolean has_focus;
diff --git a/addressbook/gui/minicard/test-minicard-label.c b/addressbook/gui/minicard/test-minicard-label.c
index 8da34e6f22..727d709925 100644
--- a/addressbook/gui/minicard/test-minicard-label.c
+++ b/addressbook/gui/minicard/test-minicard-label.c
@@ -21,6 +21,7 @@
#include <gnome.h>
#include "e-minicard-label.h"
+#include "e-canvas.h"
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *label;
@@ -80,7 +81,7 @@ int main( int argc, char *argv[] )
gnome_init( "Minicard Label Test", VERSION, argc, argv);
app = gnome_app_new("Minicard Label Test", NULL);
- canvas = gnome_canvas_new();
+ canvas = e_canvas_new();
rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
gnome_canvas_rect_get_type(),
"x1", (double) 0,
@@ -89,15 +90,15 @@ int main( int argc, char *argv[] )
"y2", (double) 100,
"fill_color", "white",
NULL );
- label = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
- e_minicard_label_get_type(),
- "x", (double) 0,
- "y", (double) 0,
- "width", (double) 100,
- "height", (double) 100,
- "fieldname", "Full Name:",
- "field", "Christopher James Lahey",
- NULL );
+ label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) ));
+ gnome_canvas_item_set( label,
+ "x", (double) 0,
+ "y", (double) 0,
+ "width", (double) 100,
+ "height", (double) 100,
+ "fieldname", "Full Name:",
+ "field", "Christopher James Lahey",
+ NULL );
gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
0, 0,
100, 100 );
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 65253e06f1..e1b130bc2a 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/e-util \
+ -I$(top_srcdir)/widgets/e-table \
$(GNOME_INCLUDEDIR)
noinst_LIBRARIES = \
@@ -26,7 +27,8 @@ minicard_label_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a
minicard_test_SOURCES = \
test-minicard.c
@@ -35,7 +37,8 @@ minicard_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a
reflow_test_SOURCES = \
test-reflow.c
@@ -44,4 +47,5 @@ reflow_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 25f7f939fc..799eb87cd1 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -46,7 +46,8 @@ enum {
ARG_HEIGHT,
ARG_HAS_FOCUS,
ARG_FIELD,
- ARG_FIELDNAME
+ ARG_FIELDNAME,
+ ARG_TEXT_MODEL
};
GtkType
@@ -95,6 +96,8 @@ e_minicard_label_class_init (EMinicardLabelClass *klass)
GTK_ARG_READWRITE, ARG_FIELD);
gtk_object_add_arg_type ("EMinicardLabel::fieldname", GTK_TYPE_STRING,
GTK_ARG_READWRITE, ARG_FIELDNAME);
+ gtk_object_add_arg_type ("EMinicardLabel::text_model", GTK_TYPE_OBJECT,
+ GTK_ARG_READWRITE, ARG_TEXT_MODEL);
object_class->set_arg = e_minicard_label_set_arg;
object_class->get_arg = e_minicard_label_get_arg;
@@ -114,8 +117,6 @@ e_minicard_label_init (EMinicardLabel *minicard_label)
minicard_label->rect = NULL;
minicard_label->fieldname = NULL;
minicard_label->field = NULL;
- minicard_label->fieldname_text = NULL;
- minicard_label->field_text = NULL;
e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);
}
@@ -131,26 +132,23 @@ e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
switch (arg_id){
case ARG_WIDTH:
- e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
- e_minicard_label_resize_children(e_minicard_label);
- e_canvas_item_request_reflow (item);
- break;
+ e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
+ e_minicard_label_resize_children(e_minicard_label);
+ e_canvas_item_request_reflow (item);
+ break;
case ARG_HAS_FOCUS:
if (e_minicard_label->field && (GTK_VALUE_ENUM(*arg) != E_FOCUS_NONE))
e_canvas_item_grab_focus(e_minicard_label->field);
break;
case ARG_FIELD:
- if ( e_minicard_label->field )
- gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
- else
- e_minicard_label->field_text = g_strdup( GTK_VALUE_STRING (*arg) );
- break;
+ gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
+ break;
case ARG_FIELDNAME:
- if ( e_minicard_label->fieldname )
- gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
- else
- e_minicard_label->fieldname_text = g_strdup( GTK_VALUE_STRING (*arg) );
- break;
+ gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
+ break;
+ case ARG_TEXT_MODEL:
+ gnome_canvas_item_set( e_minicard_label->field, "model", GTK_VALUE_OBJECT (*arg), NULL);
+ break;
}
}
@@ -159,32 +157,31 @@ e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
EMinicardLabel *e_minicard_label;
char *temp;
+ ETextModel *tempmodel;
e_minicard_label = E_MINICARD_LABEL (object);
switch (arg_id) {
case ARG_WIDTH:
- GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
- break;
+ GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
+ break;
case ARG_HEIGHT:
- GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
- break;
+ GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
+ break;
case ARG_HAS_FOCUS:
GTK_VALUE_ENUM (*arg) = e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
break;
case ARG_FIELD:
- if ( e_minicard_label->field ) {
- gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
- GTK_VALUE_STRING (*arg) = temp;
- } else
- GTK_VALUE_STRING (*arg) = g_strdup( e_minicard_label->field_text );
+ gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
+ GTK_VALUE_STRING (*arg) = temp;
break;
case ARG_FIELDNAME:
- if ( e_minicard_label->fieldname ) {
- gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
- GTK_VALUE_STRING (*arg) = temp;
- } else
- GTK_VALUE_STRING (*arg) = g_strdup( e_minicard_label->fieldname_text );
+ gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
+ GTK_VALUE_STRING (*arg) = temp;
+ break;
+ case ARG_TEXT_MODEL:
+ gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "model", &tempmodel, NULL );
+ GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(tempmodel);
break;
default:
arg->type = GTK_TYPE_INVALID;
@@ -195,6 +192,19 @@ e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
static void
e_minicard_label_realize (GnomeCanvasItem *item)
{
+ if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
+ (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
+
+ e_canvas_item_request_reflow(item);
+
+ if (!item->canvas->aa)
+ {
+ }
+}
+
+void
+e_minicard_label_construct (GnomeCanvasItem *item)
+{
EMinicardLabel *e_minicard_label;
GnomeCanvasGroup *group;
static GdkFont *font = NULL;
@@ -206,9 +216,6 @@ e_minicard_label_realize (GnomeCanvasItem *item)
e_minicard_label = E_MINICARD_LABEL (item);
group = GNOME_CANVAS_GROUP( item );
- if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
- (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
e_minicard_label->rect =
gnome_canvas_item_new( group,
gnome_canvas_rect_get_type(),
@@ -229,13 +236,6 @@ e_minicard_label_realize (GnomeCanvasItem *item)
"fill_color", "black",
NULL );
e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
- if ( e_minicard_label->fieldname_text )
- {
- gnome_canvas_item_set( e_minicard_label->fieldname,
- "text", e_minicard_label->fieldname_text,
- NULL );
- g_free( e_minicard_label->fieldname_text );
- }
e_minicard_label->field =
gnome_canvas_item_new( group,
@@ -249,20 +249,8 @@ e_minicard_label_realize (GnomeCanvasItem *item)
"editable", TRUE,
NULL );
e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
- if ( e_minicard_label->field_text )
- {
- gnome_canvas_item_set( e_minicard_label->field,
- "text", e_minicard_label->field_text,
- NULL );
- g_free( e_minicard_label->field_text );
- }
e_canvas_item_request_reflow(item);
-
- if (!item->canvas->aa)
- {
- }
-
}
static void
@@ -379,49 +367,53 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
static void
e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
{
- if ( GTK_OBJECT_FLAGS( e_minicard_label ) & GNOME_CANVAS_ITEM_REALIZED ) {
- gnome_canvas_item_set( e_minicard_label->fieldname,
- "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
- NULL );
- gnome_canvas_item_set( e_minicard_label->field,
- "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
- NULL );
- }
+ gnome_canvas_item_set( e_minicard_label->fieldname,
+ "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
+ NULL );
+ gnome_canvas_item_set( e_minicard_label->field,
+ "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
+ NULL );
}
static void
e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
{
EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
- if ( GTK_OBJECT_FLAGS( e_minicard_label ) & GNOME_CANVAS_ITEM_REALIZED )
- {
- gint old_height;
- gdouble text_height;
- old_height = e_minicard_label->height;
+
+ gint old_height;
+ gdouble text_height;
+ old_height = e_minicard_label->height;
- gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname),
- "text_height", &text_height,
- NULL);
+ gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname),
+ "text_height", &text_height,
+ NULL);
- e_minicard_label->height = text_height;
+ e_minicard_label->height = text_height;
- gtk_object_get(GTK_OBJECT(e_minicard_label->field),
- "text_height", &text_height,
- NULL);
+ gtk_object_get(GTK_OBJECT(e_minicard_label->field),
+ "text_height", &text_height,
+ NULL);
- if (e_minicard_label->height < text_height)
- e_minicard_label->height = text_height;
- e_minicard_label->height += 3;
+ if (e_minicard_label->height < text_height)
+ e_minicard_label->height = text_height;
+ e_minicard_label->height += 3;
- gnome_canvas_item_set( e_minicard_label->rect,
- "x2", (double) e_minicard_label->width - 1,
- "y2", (double) e_minicard_label->height - 1,
- NULL );
- e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
+ gnome_canvas_item_set( e_minicard_label->rect,
+ "x2", (double) e_minicard_label->width - 1,
+ "y2", (double) e_minicard_label->height - 1,
+ NULL );
+ e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
- if (old_height != e_minicard_label->height)
- e_canvas_item_request_parent_reflow(item);
-
- }
+ if (old_height != e_minicard_label->height)
+ e_canvas_item_request_parent_reflow(item);
}
+
+GnomeCanvasItem *
+e_minicard_label_new(GnomeCanvasGroup *parent)
+{
+ GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
+ e_minicard_label_construct(item);
+ return item;
+}
+
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index b439c53f9d..1790414a54 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -60,8 +60,6 @@ struct _EMinicardLabel
GnomeCanvasItem *fieldname;
GnomeCanvasItem *field;
GnomeCanvasItem *rect;
- char *fieldname_text;
- char *field_text;
gboolean has_focus;
};
@@ -73,6 +71,8 @@ struct _EMinicardLabelClass
GtkType e_minicard_label_get_type (void);
+GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
+void e_minicard_label_construct (GnomeCanvasItem *item);
#ifdef __cplusplus
}
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 79668b6507..b7b9a4c10e 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -24,6 +24,7 @@
#include "e-minicard.h"
#include "e-minicard-label.h"
#include "e-text.h"
+#include "e-table-text-model.h"
#include "e-canvas.h"
#include "e-util.h"
#include "e-canvas-utils.h"
@@ -37,6 +38,7 @@ static void e_minicard_unrealize (GnomeCanvasItem *item);
static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );
static void e_minicard_resize_children( EMinicard *e_minicard );
+static void remodel( EMinicard *e_minicard );
static GnomeCanvasGroupClass *parent_class = NULL;
@@ -46,7 +48,9 @@ enum {
ARG_WIDTH,
ARG_HEIGHT,
ARG_HAS_FOCUS,
- ARG_CARD
+ ARG_CARD,
+ ARG_MODEL,
+ ARG_ROW
};
GtkType
@@ -93,6 +97,10 @@ e_minicard_class_init (EMinicardClass *klass)
GTK_ARG_READWRITE, ARG_HAS_FOCUS);
gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT,
GTK_ARG_READWRITE, ARG_CARD);
+ gtk_object_add_arg_type ("EMinicard::model", GTK_TYPE_OBJECT,
+ GTK_ARG_READWRITE, ARG_MODEL);
+ gtk_object_add_arg_type ("EMinicard::row", GTK_TYPE_INT,
+ GTK_ARG_READWRITE, ARG_ROW);
object_class->set_arg = e_minicard_set_arg;
object_class->get_arg = e_minicard_get_arg;
@@ -113,6 +121,9 @@ e_minicard_init (EMinicard *minicard)
minicard->width = 10;
minicard->height = 10;
minicard->has_focus = FALSE;
+
+ minicard->model = NULL;
+ minicard->row = 0;
e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
}
@@ -131,7 +142,8 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
if (e_minicard->width != GTK_VALUE_DOUBLE (*arg)) {
e_minicard->width = GTK_VALUE_DOUBLE (*arg);
e_minicard_resize_children(e_minicard);
- e_canvas_item_request_reflow(item);
+ if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
+ e_canvas_item_request_reflow(item);
}
break;
case ARG_HAS_FOCUS:
@@ -148,13 +160,23 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
}
}
else
- e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(e_minicard));
+ e_canvas_item_grab_focus(item);
break;
case ARG_CARD:
- /* e_minicard->card = GTK_VALUE_POINTER (*arg);
+ /* e_minicard->card = GTK_VALUE_OBJECT (*arg);
_update_card(e_minicard);
gnome_canvas_item_request_update (item);*/
break;
+ case ARG_MODEL:
+ e_minicard->model = E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg));
+ remodel(e_minicard);
+ e_canvas_item_request_reflow(item);
+ break;
+ case ARG_ROW:
+ e_minicard->row = GTK_VALUE_INT (*arg);
+ remodel(e_minicard);
+ e_canvas_item_request_reflow(item);
+ break;
}
}
@@ -176,8 +198,14 @@ e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
break;
case ARG_CARD:
- /* GTK_VALUE_POINTER (*arg) = e_minicard->card; */
+ /* GTK_VALUE_OBJECT (*arg) = e_minicard->card; */
break;
+ case ARG_MODEL:
+ GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->model);
+ break;
+ case ARG_ROW:
+ GTK_VALUE_INT (*arg) = e_minicard->row;
+ break;
default:
arg->type = GTK_TYPE_INVALID;
break;
@@ -229,41 +257,46 @@ e_minicard_realize (GnomeCanvasItem *item)
"text", "Chris Lahey",
NULL );
e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
+
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4.0,
+ "fieldname", "Email:",
+ "field", "clahey@address.com",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4,
+ "fieldname", "Full Name:",
+ "field", "Christopher James Lahey",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- if ( rand() % 2 ) {
- new_item = gnome_canvas_item_new( group,
- e_minicard_label_get_type(),
- "width", e_minicard->width - 4,
- "fieldname", "Full Name:",
- "field", "Christopher James Lahey",
- NULL );
- e_minicard->fields = g_list_append( e_minicard->fields, new_item);
- e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- }
-
- if (rand() % 2) {
- new_item = gnome_canvas_item_new( group,
- e_minicard_label_get_type(),
- "width", e_minicard->width - 4,
- "fieldname", "Address:",
- "field", "100 Main St\nHome town, USA",
- NULL );
- e_minicard->fields = g_list_append( e_minicard->fields, new_item);
- e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- }
-
- if (rand() % 2) {
- new_item = gnome_canvas_item_new( group,
- e_minicard_label_get_type(),
- "width", e_minicard->width - 4.0,
- "fieldname", "Email:",
- "field", "clahey@address.com",
- NULL );
- e_minicard->fields = g_list_append( e_minicard->fields, new_item);
- e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
- }
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4,
+ "fieldname", "Street Address:",
+ "field", "100 Main St\nHome town, USA",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+
+ new_item = e_minicard_label_new(group);
+ gnome_canvas_item_set( new_item,
+ "width", e_minicard->width - 4,
+ "fieldname", "Phone:",
+ "field", "000-0000",
+ NULL );
+ e_minicard->fields = g_list_append( e_minicard->fields, new_item);
+ e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
+
+ remodel(e_minicard);
e_canvas_item_request_reflow(item);
-
+
if (!item->canvas->aa) {
}
}
@@ -384,6 +417,35 @@ e_minicard_resize_children( EMinicard *e_minicard )
}
static void
+remodel( EMinicard *e_minicard )
+{
+ GnomeCanvasGroup *group;
+
+ group = GNOME_CANVAS_GROUP( e_minicard );
+
+ if ( e_minicard->model ) {
+ gint column = 0;
+ GList *list = e_minicard->fields;
+ ETableTextModel *model;
+ for ( ; list; list = list->next, column++ ) {
+ ETableTextModel *model = e_table_text_model_new(e_minicard->model, e_minicard->row, column);
+ gnome_canvas_item_set(GNOME_CANVAS_ITEM(list->data),
+ "text_model", model,
+ NULL);
+ gtk_object_sink(GTK_OBJECT(model));
+ }
+ if ( e_minicard->header_text ) {
+ model = e_table_text_model_new(e_minicard->model, e_minicard->row, 1);
+ gnome_canvas_item_set(GNOME_CANVAS_ITEM(e_minicard->header_text),
+ "model", model,
+ NULL);
+ gtk_object_sink(GTK_OBJECT(model));
+ }
+
+ }
+}
+
+static void
e_minicard_reflow( GnomeCanvasItem *item, int flags )
{
EMinicard *e_minicard = E_MINICARD(item);
@@ -391,7 +453,7 @@ e_minicard_reflow( GnomeCanvasItem *item, int flags )
GList *list;
gdouble text_height;
gint old_height;
-
+
old_height = e_minicard->height;
gtk_object_get( GTK_OBJECT( e_minicard->header_text ),
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 3be80c1586..05d95a743e 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -22,6 +22,7 @@
#define __E_MINICARD_H__
#include <gnome.h>
+#include "e-table-model.h"
#ifdef __cplusplus
extern "C" {
@@ -36,6 +37,10 @@ extern "C" {
* --------------------------------------------------------------------------------
* width double RW width of the card
* height double R height of the card
+ * model ETableModel RW model to read from
+ * row int RW ETableModel row to read from
+ *
+ * Later:
* card ECard* RW Pointer to the ECard
*/
@@ -66,6 +71,10 @@ struct _EMinicard
GnomeCanvasItem *header_rect;
GnomeCanvasItem *header_text;
GList *fields; /* Of type GnomeCanvasItem. */
+
+ ETableModel *model;
+ int row;
+ guint needs_remodeling : 1;
gboolean has_focus;
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
index 8da34e6f22..727d709925 100644
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ b/addressbook/gui/widgets/test-minicard-label.c
@@ -21,6 +21,7 @@
#include <gnome.h>
#include "e-minicard-label.h"
+#include "e-canvas.h"
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *label;
@@ -80,7 +81,7 @@ int main( int argc, char *argv[] )
gnome_init( "Minicard Label Test", VERSION, argc, argv);
app = gnome_app_new("Minicard Label Test", NULL);
- canvas = gnome_canvas_new();
+ canvas = e_canvas_new();
rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
gnome_canvas_rect_get_type(),
"x1", (double) 0,
@@ -89,15 +90,15 @@ int main( int argc, char *argv[] )
"y2", (double) 100,
"fill_color", "white",
NULL );
- label = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
- e_minicard_label_get_type(),
- "x", (double) 0,
- "y", (double) 0,
- "width", (double) 100,
- "height", (double) 100,
- "fieldname", "Full Name:",
- "field", "Christopher James Lahey",
- NULL );
+ label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) ));
+ gnome_canvas_item_set( label,
+ "x", (double) 0,
+ "y", (double) 0,
+ "width", (double) 100,
+ "height", (double) 100,
+ "fieldname", "Full Name:",
+ "field", "Christopher James Lahey",
+ NULL );
gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
0, 0,
100, 100 );