This were moved to widgets/e-text/ a while ago but never removed. They

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

        * widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
        e-text-event-processor.h, e-text-event-processor-emacs-like.c,
        e-text-event-processor-emacs-like.h,
        e-text-event-processor-types.h: This were moved to widgets/e-text/
        a while ago but never removed.  They have now been removed.

        * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
        warnings from this file.  Made tooltips disappear when you're
        finished with them.

        * widgets/e-minicard/test-reflow.c,
        widgets/e-minicard/test-minicard.c,
        widgets/e-minicard/test-minicard-label.c: Commented out unused
        about_callback functions.

        * widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
        its e-minicard children.

        * widgets/e-minicard/e-minicard.c: Made e-minicard take and return
        an EFocus for its "has_focus" argument.  This makes shift-tab work properly.

        * widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
        an EFocus for its "has_focus" argument.  Made the font that
        e-minicard-label uses only be allocated once.

        * e-util/e-canvas-utils.h: Fixed the comment at the top and added
        #ifndef __E_CANVAS_UTILS__.

        * e-util/Makefile.am: Added e-xml-utils.c and
        e-xml-utils.h.

        * e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some
        xml utilities.

        * e-util/e-util.h: Added type EFocus which describes which
        direction the focus will be coming from.


in mail:

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

        * message-list.c: Changed this to not use the "x" and "y"
        arguments to e-table-item.


in widgets/e-table:

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

        * e-table-subset-variable.c, e-table-subset-variable.h: A new
        model which is a subset, but you can add and remove rows.

        * test-table.c: Added a thaw method for use with the
        e-table-subset (emits model_changed.)  Adapted to the changes to
        e_table_item.  Properly parse headers.  Adapted to the changes to
        e_table, including creating example xml spec data.

        * test-cols.c, test-check.c: Added a thaw method for use with the
        e-table-subset (emits model_changed.)  Adapted to the changes to
        e_table_item.

        * e-table.c, e-table.h: Reworked e-table to use the ETable
        grouping system.  The only difference for the interface is that
        instead of passing in a column_spec and a grouping_spec, you pass
        in a single string that is an xml format that includes both pieces
        of information.

        * e-table-subset.h: Added rules for emacs to do correct
        indentation.

        * e-table-subset.c: Implemented freezing.  No signals are emitted
        while frozen and "model_changed" is emitted when thawed.

        * e-table-sorted.h: ETableSortedClass has ETableSubset as its
        parent object instead of ETableSubsetClass.  Fixed this.

        * e-table-simple.c, e-table-simple.h: Implemented the thaw method.
        Use of simple now requires an extra argument (the thaw method.)

        * e-table-model.h, e-table-model.c: Added e_table_model_freeze and
        e_table_model_thaw.

        * e-table-item.h, e-table-item.c: Reworked this a bit to make it
        provide some things the new group system needed and to make
        inter-item keyboard focus work.  Changed the external interface
        only in the list of arguments it recognizes and signals it emits.
        Instead of "x" and "y", you have to use
        e_canvas_item_move_absolute and instead of emitting a
        "height_changed" signal, it emits a "resize" signal.  There's new
        "has_focus", "width", and "height" arguments and a function to get
        the currently focused column.

        * e-table-header-item.c: Got rid of some warnings here.  Changed
        the

        * e-table-group-leaf.h, e-table-group-leaf.c,
        e-table-group-container.h, e-table-group-container.c: New types to
        make e_table_group work properly.

        * e-table-group.h, e-table-group.c: Completely reworked e-table
        grouping.  e-table-group now uses a hierarchical structure.

        * e-cell.h: Added e_cell_print.  This doesn't work yet.

        * e-cell.c: Made e_cell_realize exist.  (It was improperly named
        e_cell_view_realize in the .c.)

        * e-cell-text.c: Made the blinking cursor disappear properly.

        * check-filled.xpm, check-empty.xpm: Made these const char *[]
        instead of char *[] to avoid compiler warnings.

        * Makefile.am: Added e-table-group-container.c,
        e-table-group-container.h, e-table-group-leaf.c,
        e-table-group-leaf.h, e-table-subset-variable.c,
        e-table-subset-variable.h.

svn path=/trunk/; revision=1915

1 files changed, 58 insertions, 29 deletions

diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index 468d5dd794..1b3f346290 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -1,9 +1,12 @@
-#ifndef _E_TABLE_TREE_H_
-#define _E_TABLE_TREE_H_
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#ifndef _E_TABLE_GROUP_H_
+#define _E_TABLE_GROUP_H_
 
 #include <libgnomeui/gnome-canvas.h>
+#include <gnome-xml/tree.h>
 #include "e-table-model.h"
 #include "e-table-header.h"
+#include "e-util/e-util.h"
 
 #define E_TABLE_GROUP_TYPE        (e_table_group_get_type ())
 #define E_TABLE_GROUP(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup))
@@ -15,49 +18,75 @@ typedef struct {
 	GnomeCanvasGroup group;
 
 	/*
-	 * The ETableCol used to group this set
+	 * The full header.
 	 */
-	ETableCol    *ecol;
-
-	/*
-	 * The canvas rectangle that contains the children
-	 */
-	GnomeCanvasItem *rect;
-
-	/*
-	 * Dimensions of the ETableGroup
-	 */
-	int width, height;
-
+	ETableHeader *full_header;
+	ETableHeader *header;
+	
 	/*
-	 * State: the ETableGroup is open or closed
+	 * The model we pull data from.
 	 */
-	guint open:1;
+	ETableModel *model;
 
 	/*
 	 * Whether we should add indentation and open/close markers,
 	 * or if we just act as containers of subtables.
 	 */
-	guint transparent:1;
+	guint transparent : 1;
 
-	/*
-	 * List of GnomeCanvasItems we stack
-	 */
-	GSList *children;
+	guint has_focus : 1;
+	
+	guint frozen : 1;
 } ETableGroup;
 
 typedef struct {
 	GnomeCanvasGroupClass parent_class;
-	void (*height_changed) (ETableGroup *etg);
+	void (*resize) (ETableGroup *etg);
+
+	void (*add) (ETableGroup *etg, gint row);
+	gboolean (*remove) (ETableGroup *etg, gint row);
+	gint (*get_count) (ETableGroup *etg);
+	void (*increment) (ETableGroup *etg, gint position, gint amount);
+	void (*set_focus) (ETableGroup *etg, EFocus direction, gint view_col);
+	gboolean (*get_focus) (ETableGroup *etg);
+	gint (*get_focus_column) (ETableGroup *etg);
+	ETableCol *(*get_ecol) (ETableGroup *etg);
+
+	void (*thaw) (ETableGroup *etg);
+	gdouble (*get_height) (ETableGroup *etg);
+	gdouble (*get_width) (ETableGroup *etg);
+	void (*set_width) (ETableGroup *etg, gdouble width);
 } ETableGroupClass;
 
-GnomeCanvasItem *e_table_group_new       (GnomeCanvasGroup *parent, ETableCol *ecol,
-					  gboolean open, gboolean transparent);
-void             e_table_group_construct (GnomeCanvasGroup *parent, ETableGroup *etg, 
-					  ETableCol *ecol, gboolean open, gboolean transparent);
+void             e_table_group_add       (ETableGroup      *etg,
+					  gint              row);
+gboolean         e_table_group_remove    (ETableGroup      *etg,
+					  gint              row);
+gint             e_table_group_get_count (ETableGroup      *etg);
+void             e_table_group_increment (ETableGroup      *etg,
+					  gint              position,
+					  gint              amount);
+void             e_table_group_set_focus (ETableGroup      *etg,
+					  EFocus            direction,
+					  gint              view_col);
+gboolean         e_table_group_get_focus (ETableGroup      *etg);
+gint             e_table_group_get_focus_column (ETableGroup      *etg);
+ETableCol       *e_table_group_get_ecol  (ETableGroup      *etg);
+
+ETableGroup     *e_table_group_new       (GnomeCanvasGroup *parent,
+					  ETableHeader     *full_header,
+					  ETableHeader     *header,
+					  ETableModel      *model,
+					  xmlNode             *rules);
+void             e_table_group_construct (GnomeCanvasGroup *parent,
+					  ETableGroup      *etg,
+					  ETableHeader     *full_header,
+					  ETableHeader     *header,
+					  ETableModel      *model);
 
-void             e_table_group_add       (ETableGroup *etg, GnomeCanvasItem *child);
+/* For emitting the signal */
+void             e_table_group_resize    (ETableGroup      *etg);
 
 GtkType          e_table_group_get_type  (void);
 
-#endif /* _E_TABLE_TREE_H_ */
+#endif /* _E_TABLE_GROUP_H_ */