aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-03-01 05:07:06 +0800
committerChris Lahey <clahey@src.gnome.org>2000-03-01 05:07:06 +0800
commit832150b0dda320f18f1aedf2da23d0b087cde748 (patch)
treea81426b3f8f314cdd91eb152072ab5d53f9e3c2b /widgets
parent2f6721bf5bd7d5c853279db40b1fb15ded4745a2 (diff)
downloadgsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.tar
gsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.tar.gz
gsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.tar.bz2
gsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.tar.lz
gsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.tar.xz
gsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.tar.zst
gsoc2013-evolution-832150b0dda320f18f1aedf2da23d0b087cde748.zip
Test frozen columns
2000-02-29 Christopher James Lahey <clahey@helixcode.com> * test-table.c: Test frozen columns * e-table.c: Make frozen columns available through the xml file. * e-table-header.c, e-table-header.h, e-table-header-item.c: Added frozen columns API to let you specify some number of leading columns as undraggable. * Makefile.am: Add e-table-example-1.c and e-table-example-2.c. * e-table-example-1.c, e-table-example-2.c: New files. A couple of examples of ETable use. svn path=/trunk/; revision=1993
Diffstat (limited to 'widgets')
-rw-r--r--widgets/e-table/ChangeLog15
-rw-r--r--widgets/e-table/Makefile.am24
-rw-r--r--widgets/e-table/e-table-example-1.c252
-rw-r--r--widgets/e-table/e-table-example-2.c296
-rw-r--r--widgets/e-table/e-table-header-item.c9
-rw-r--r--widgets/e-table/e-table-header.c7
-rw-r--r--widgets/e-table/e-table-header.h2
-rw-r--r--widgets/e-table/e-table.c2
-rw-r--r--widgets/e-table/test-table.c2
-rw-r--r--widgets/table/e-table-example-1.c252
-rw-r--r--widgets/table/e-table-example-2.c296
-rw-r--r--widgets/table/e-table-header-item.c9
-rw-r--r--widgets/table/e-table-header.c7
-rw-r--r--widgets/table/e-table-header.h2
-rw-r--r--widgets/table/e-table.c2
-rw-r--r--widgets/table/test-table.c2
16 files changed, 1176 insertions, 3 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index d1ad08df6e..5f3d997ab7 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,18 @@
+2000-02-29 Christopher James Lahey <clahey@helixcode.com>
+
+ * test-table.c: Test frozen columns
+
+ * e-table.c: Make frozen columns available through the xml file.
+
+ * e-table-header.c, e-table-header.h, e-table-header-item.c: Added
+ frozen columns API to let you specify some number of leading
+ columns as undraggable.
+
+ * Makefile.am: Add e-table-example-1.c and e-table-example-2.c.
+
+ * e-table-example-1.c, e-table-example-2.c: New files. A couple
+ of examples of ETable use.
+
2000-02-28 NotZed <NotZed@HelixCode.com>
* Makefile.am (table_test_LDADD): Fixed references to eutil.
diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am
index a231708564..4364c1fbc0 100644
--- a/widgets/e-table/Makefile.am
+++ b/widgets/e-table/Makefile.am
@@ -47,7 +47,7 @@ libetable_a_SOURCES = \
e-table-subset-variable.h
noinst_PROGRAMS = \
- table-test
+ table-test table-example-1 table-example-2
table_test_SOURCES = \
test-table.c \
@@ -63,6 +63,28 @@ table_test_LDADD = \
table_test_LDFLAGS = `gnome-config --libs gdk_pixbuf`
+table_example_1_SOURCES = \
+ e-table-example-1.c
+
+table_example_1_LDADD = \
+ libetable.a \
+ $(EXTRA_GNOME_LIBS) \
+ $(top_builddir)/e-util/libeutil.a \
+ $(top_builddir)/widgets/e-text/libetext.a
+
+table_example_1_LDFLAGS = `gnome-config --libs gdk_pixbuf`
+
+table_example_2_SOURCES = \
+ e-table-example-2.c
+
+table_example_2_LDADD = \
+ libetable.a \
+ $(EXTRA_GNOME_LIBS) \
+ $(top_builddir)/e-util/libeutil.a \
+ $(top_builddir)/widgets/e-text/libetext.a
+
+table_example_2_LDFLAGS = `gnome-config --libs gdk_pixbuf`
+
EXTRA_DIST = \
sample.table \
add-col.xpm \
diff --git a/widgets/e-table/e-table-example-1.c b/widgets/e-table/e-table-example-1.c
new file mode 100644
index 0000000000..413fde3aba
--- /dev/null
+++ b/widgets/e-table/e-table-example-1.c
@@ -0,0 +1,252 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* This code is GPL. */
+#include <stdio.h>
+#include <string.h>
+#include <gnome.h>
+#include "e-util/e-cursors.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 <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "table-test.h"
+
+/*
+One way in which we make it simpler to build an ETableModel is through
+the ETableSimple class. Instead of creating your own ETableModel
+class, you simply create a new object of the ETableSimple class. You
+give it a bunch of functions that act as callbacks.
+
+You also get to pass a void * to ETableSimple and it gets passed to
+your callbacks. This would be for having multiple models of the same
+type. This is just an example though, so we statically define all the
+data and ignore the void *data parameter.
+
+In our example we will be creating a table model with 6 columns and 10
+rows. This corresponds to having 6 different types of information and
+10 different sets of data in our database.
+
+The headers will be hard coded, as will be the example data.
+
+*/
+
+/*
+ There are two different meanings to the word "column". The first is
+ the model column. A model column corresponds to a specific type of
+ data. This is very much like the usage in a database table where a
+ column is a field in the database.
+
+ The second type of column is a view column. A view column
+ corresponds to a visually displayed column. Each view column
+ corresponds to a specific model column, though a model column may
+ have any number of view columns associated with it, from zero to
+ greater than one.
+
+ Also, a view column doesn't necessarily depend on only one model
+ column. In some cases, the view column renderer can be given a
+ reference to another column to get extra information about its
+ display.
+*/
+
+#define ROWS 10
+#define COLS 4
+
+#define IMPORTANCE_COLUMN 4
+#define COLOR_COLUMN 5
+
+/* 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> 4 </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"
+};
+
+/* Virtual Column list:
+ 0 Email
+ 1 Full Name
+ 2 Address
+ 3 Phone
+*/
+
+char *table_data[ROWS][COLS];
+
+/*
+ * 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 ROWS;
+}
+
+/* This function returns the value at a particular point in our ETableModel. */
+static void *
+my_value_at (ETableModel *etc, int col, int row, void *data)
+{
+ return (void *) table_data [row][col];
+}
+
+/* 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 *data)
+{
+ g_free (table_data [row][col]);
+ table_data [row][col] = g_strdup (val);
+}
+
+/* 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)
+{
+}
+
+/* We create a window containing our new table. */
+static void
+create_table()
+{
+ GtkWidget *e_table, *window, *frame;
+ ECell *cell_left_just;
+ ETableHeader *e_table_header;
+ int i, j;
+ ETableModel *e_table_model = NULL;
+
+ /* First we fill in the simple data. */
+ for ( i = 0; i < ROWS; i++ ) {
+ for ( j = 0; j < COLS; j++ ) {
+ table_data[i][j] = g_strdup("");
+ }
+ }
+ /* Next we create our model. This uses the functions we defined
+ earlier. */
+ 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);
+ /*
+ 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 (e_table_header, e_table_model, INITIAL_SPEC);
+
+ /* Build the gtk widget hierarchy. */
+ gtk_container_add (GTK_CONTAINER (frame), e_table);
+ gtk_container_add (GTK_CONTAINER (window), frame);
+
+ /* Size the initial window. */
+ gtk_widget_set_usize (window, 200, 200);
+ /* Show it all. */
+ gtk_widget_show_all (window);
+}
+
+/* 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();
+
+ gtk_main ();
+
+ e_cursors_shutdown ();
+ return 0;
+}
diff --git a/widgets/e-table/e-table-example-2.c b/widgets/e-table/e-table-example-2.c
new file mode 100644
index 0000000000..bb05a1d198
--- /dev/null
+++ b/widgets/e-table/e-table-example-2.c
@@ -0,0 +1,296 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* This code is GPL. */
+#include <stdio.h>
+#include <string.h>
+#include <gnome.h>
+#include "e-util/e-cursors.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 <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "table-test.h"
+
+/*
+One way in which we make it simpler to build an ETableModel is through
+the ETableSimple class. Instead of creating your own ETableModel
+class, you simply create a new object of the ETableSimple class. You
+give it a bunch of functions that act as callbacks.
+
+You also get to pass a void * to ETableSimple and it gets passed to
+your callbacks. This would be for having multiple models of the same
+type. This is just an example though, so we statically define all the
+data and ignore the void *data parameter.
+
+In our example we will be creating a table model with 6 columns and 10
+rows. This corresponds to having 6 different types of information and
+10 different sets of data in our database.
+
+The headers will be hard coded, as will be the example data.
+
+*/
+
+/*
+ There are two different meanings to the word "column". The first is
+ the model column. A model column corresponds to a specific type of
+ data. This is very much like the usage in a database table where a
+ column is a field in the database.
+
+ The second type of column is a view column. A view column
+ corresponds to a visually displayed column. Each view column
+ corresponds to a specific model column, though a model column may
+ have any number of view columns associated with it, from zero to
+ greater than one.
+
+ Also, a view column doesn't necessarily depend on only one model
+ column. In some cases, the view column renderer can be given a
+ reference to another column to get extra information about its
+ display.
+*/
+
+#define ROWS 10
+#define VIEW_COLS 4
+#define PHYSICAL_COLS 5
+#define VIRTUAL_COLS 6
+
+#define IMPORTANCE_COLUMN 4
+#define COLOR_COLUMN 5
+
+/* 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> 4 </column> \
+ <column> 1 </column> \
+ <column> 2 </column> \
+ <column> 3 </column> \
+ </columns-shown> \
+ <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \
+</ETableSpecification>"
+
+char *headers[VIEW_COLS] = {
+ "Email",
+ "Full Name",
+ "Address",
+ "Phone"
+};
+
+/* Virtual Column list:
+ 0 Full Name
+ 1 Email
+ 2 Address
+ 3 Phone
+ 4 Importance field. This field will be a boolean. It also has a
+ special header, so doesn't appear in the headers list.
+ 5 Color field. This column is also not displayed. It is also
+ not stored in the database. It's calculated based on the
+ Importance field.
+*/
+
+char *table_data[ROWS][VIEW_COLS];
+gboolean importance_data[ROWS];
+
+/*
+ * 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. */
+
+static GdkColor *color1;
+static GdkColor *color2;
+
+static int
+my_col_count (ETableModel *etc, void *data)
+{
+ return VIRTUAL_COLS;
+}
+
+static int
+my_row_count (ETableModel *etc, void *data)
+{
+ return ROWS;
+}
+
+static void *
+my_value_at (ETableModel *etc, int col, int row, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ if ( importance_data[row] ) {
+ return color1;
+ } else {
+ return color2;
+ }
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ return (gpointer) importance_data[row];
+ } else {
+ return (void *) table_data [row][col];
+ }
+}
+
+static void
+my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ importance_data[row] = (gboolean) val;
+ } else {
+ g_free (table_data [row][col]);
+ table_data [row][col] = g_strdup (val);
+ }
+}
+
+static gboolean
+my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
+{
+ if ( col == IMPORTANCE_COLUMN )
+ return FALSE;
+ else
+ return TRUE;
+}
+
+static void *
+my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ return (void *) value;
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ return (void *) value;
+ } else {
+ return g_strdup(value);
+ }
+}
+
+static void
+my_free_value (ETableModel *etc, int col, void *value, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ } else {
+ g_free(value);
+ }
+}
+
+static void
+my_thaw (ETableModel *etc, void *data)
+{
+}
+
+/* We create a window containing our new table. */
+static void
+create_table()
+{
+ GtkWidget *e_table, *window, *frame;
+ ECell *cell_left_just;
+ ECell *cell_checkbox;
+ ETableHeader *e_table_header;
+ int i, j;
+ ETableModel *e_table_model = NULL;
+ ETableCol *ecol;
+ GdkPixbuf *pixbuf;
+
+ /* First we fill in the simple data. */
+ for ( i = 0; i < ROWS; i++ ) {
+ for ( j = 0; j < VIEW_COLS; j++ ) {
+ table_data[i][j] = g_strdup("");
+ }
+ importance_data[i] = FALSE;
+ }
+ /* Next we create our model. This uses the functions we defined
+ earlier. */
+ 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);
+ /*
+ 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 < VIEW_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);
+ }
+
+ /* Next we add a special column for the check box. */
+
+ cell_checkbox = e_cell_checkbox_new ();
+ pixbuf = gdk_pixbuf_new_from_file("clip.png");
+ ecol = e_table_col_new_with_pixbuf (i, pixbuf, 18, 18, cell_checkbox, g_int_compare, TRUE);
+ e_table_header_add_column (e_table_header, ecol, i);
+
+ /*
+ * Setup GUI
+ */
+ /* 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 (e_table_header, e_table_model, INITIAL_SPEC);
+
+ /* Build the gtk widget hierarchy. */
+ gtk_container_add (GTK_CONTAINER (frame), e_table);
+ gtk_container_add (GTK_CONTAINER (window), frame);
+
+ /* Size the initial window. */
+ gtk_widget_set_usize (window, 200, 200);
+ /* Show it all. */
+ gtk_widget_show_all (window);
+}
+
+
+
+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();
+
+ gtk_main ();
+
+ e_cursors_shutdown ();
+ return 0;
+}
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index 0289703bf2..91a64d204a 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -40,6 +40,7 @@
static GnomeCanvasItemClass *ethi_parent_class;
static void ethi_request_redraw (ETableHeaderItem *ethi);
+static void ethi_drop_table_header (ETableHeaderItem *ethi);
/*
@@ -326,6 +327,8 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
int col;
col = ethi_find_col_by_x (ethi, x);
+ if ( col < ethi->eth->frozen_count )
+ col = ethi->eth->frozen_count;
if (col != -1){
ethi_remove_destroy_marker (ethi);
@@ -380,6 +383,8 @@ ethi_drag_drop (GtkWidget *canvas,
int col;
col = ethi_find_col_by_x (ethi, x);
+ if ( col < ethi->eth->frozen_count )
+ col = ethi->eth->frozen_count;
ethi_add_drop_marker(ethi, col);
if (col != -1) {
@@ -700,6 +705,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
GdkGC *gc;
ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
+ if ( ethi->drag_col < ethi->eth->frozen_count && ethi->drag_col >= 0 ) {
+ ethi->maybe_drag = FALSE;
+ ethi->drag_col = -1;
+ }
if (ethi->drag_col == -1)
return;
diff --git a/widgets/e-table/e-table-header.c b/widgets/e-table/e-table-header.c
index b1aec7da7e..527e7e22bc 100644
--- a/widgets/e-table/e-table-header.c
+++ b/widgets/e-table/e-table-header.c
@@ -95,6 +95,7 @@ e_table_header_new (void)
ETableHeader *eth;
eth = gtk_type_new (e_table_header_get_type ());
+ eth->frozen_count = 0;
return eth;
}
@@ -343,3 +344,9 @@ e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col)
return total;
}
+
+void
+e_table_header_set_frozen_columns (ETableHeader *eth, int idx)
+{
+ eth->frozen_count = idx;
+}
diff --git a/widgets/e-table/e-table-header.h b/widgets/e-table/e-table-header.h
index 96e65fdc2f..0b4e40101f 100644
--- a/widgets/e-table/e-table-header.h
+++ b/widgets/e-table/e-table-header.h
@@ -22,6 +22,7 @@ struct _ETableHeader {
int col_count;
ETableCol **columns;
gboolean selectable;
+ int frozen_count;
};
typedef struct {
@@ -54,6 +55,7 @@ void e_table_header_remove (ETableHeader *eth, int idx);
void e_table_header_set_size (ETableHeader *eth, int idx, int size);
void e_table_header_set_selection (ETableHeader *eth,
gboolean allow_selection);
+void e_table_header_set_frozen_columns (ETableHeader *eth, int idx);
int e_table_header_col_diff (ETableHeader *eth,
int start_col, int end_col);
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index e508e24e02..589c1ec704 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -93,6 +93,8 @@ e_table_make_header (ETable *e_table, ETableHeader *full_header, xmlNode *xmlCol
e_table_header_add_column (nh, e_table_header_get_column (full_header, col), -1);
}
+
+ e_table_header_set_frozen_columns( nh, e_xml_get_integer_prop_by_name(xmlColumns, "frozen_columns") );
return nh;
}
diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c
index 0fdf32fcbe..401cacb285 100644
--- a/widgets/e-table/test-table.c
+++ b/widgets/e-table/test-table.c
@@ -323,7 +323,7 @@ e_table_test (void)
load_data ();
if (1){/*getenv ("DO")){*/
- do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
+ do_e_table_demo ("<ETableSpecification> <columns-shown frozen_columns=\"2\"> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"1\"> <group column=\"4\" ascending=\"0\"> <leaf column=\"2\" ascending=\"1\"/> </group> </group> </grouping> </ETableSpecification>");
}
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"1\"> <leaf column=\"2\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>");
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
new file mode 100644
index 0000000000..413fde3aba
--- /dev/null
+++ b/widgets/table/e-table-example-1.c
@@ -0,0 +1,252 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* This code is GPL. */
+#include <stdio.h>
+#include <string.h>
+#include <gnome.h>
+#include "e-util/e-cursors.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 <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "table-test.h"
+
+/*
+One way in which we make it simpler to build an ETableModel is through
+the ETableSimple class. Instead of creating your own ETableModel
+class, you simply create a new object of the ETableSimple class. You
+give it a bunch of functions that act as callbacks.
+
+You also get to pass a void * to ETableSimple and it gets passed to
+your callbacks. This would be for having multiple models of the same
+type. This is just an example though, so we statically define all the
+data and ignore the void *data parameter.
+
+In our example we will be creating a table model with 6 columns and 10
+rows. This corresponds to having 6 different types of information and
+10 different sets of data in our database.
+
+The headers will be hard coded, as will be the example data.
+
+*/
+
+/*
+ There are two different meanings to the word "column". The first is
+ the model column. A model column corresponds to a specific type of
+ data. This is very much like the usage in a database table where a
+ column is a field in the database.
+
+ The second type of column is a view column. A view column
+ corresponds to a visually displayed column. Each view column
+ corresponds to a specific model column, though a model column may
+ have any number of view columns associated with it, from zero to
+ greater than one.
+
+ Also, a view column doesn't necessarily depend on only one model
+ column. In some cases, the view column renderer can be given a
+ reference to another column to get extra information about its
+ display.
+*/
+
+#define ROWS 10
+#define COLS 4
+
+#define IMPORTANCE_COLUMN 4
+#define COLOR_COLUMN 5
+
+/* 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> 4 </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"
+};
+
+/* Virtual Column list:
+ 0 Email
+ 1 Full Name
+ 2 Address
+ 3 Phone
+*/
+
+char *table_data[ROWS][COLS];
+
+/*
+ * 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 ROWS;
+}
+
+/* This function returns the value at a particular point in our ETableModel. */
+static void *
+my_value_at (ETableModel *etc, int col, int row, void *data)
+{
+ return (void *) table_data [row][col];
+}
+
+/* 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 *data)
+{
+ g_free (table_data [row][col]);
+ table_data [row][col] = g_strdup (val);
+}
+
+/* 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)
+{
+}
+
+/* We create a window containing our new table. */
+static void
+create_table()
+{
+ GtkWidget *e_table, *window, *frame;
+ ECell *cell_left_just;
+ ETableHeader *e_table_header;
+ int i, j;
+ ETableModel *e_table_model = NULL;
+
+ /* First we fill in the simple data. */
+ for ( i = 0; i < ROWS; i++ ) {
+ for ( j = 0; j < COLS; j++ ) {
+ table_data[i][j] = g_strdup("");
+ }
+ }
+ /* Next we create our model. This uses the functions we defined
+ earlier. */
+ 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);
+ /*
+ 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 (e_table_header, e_table_model, INITIAL_SPEC);
+
+ /* Build the gtk widget hierarchy. */
+ gtk_container_add (GTK_CONTAINER (frame), e_table);
+ gtk_container_add (GTK_CONTAINER (window), frame);
+
+ /* Size the initial window. */
+ gtk_widget_set_usize (window, 200, 200);
+ /* Show it all. */
+ gtk_widget_show_all (window);
+}
+
+/* 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();
+
+ gtk_main ();
+
+ e_cursors_shutdown ();
+ return 0;
+}
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
new file mode 100644
index 0000000000..bb05a1d198
--- /dev/null
+++ b/widgets/table/e-table-example-2.c
@@ -0,0 +1,296 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* This code is GPL. */
+#include <stdio.h>
+#include <string.h>
+#include <gnome.h>
+#include "e-util/e-cursors.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 <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "table-test.h"
+
+/*
+One way in which we make it simpler to build an ETableModel is through
+the ETableSimple class. Instead of creating your own ETableModel
+class, you simply create a new object of the ETableSimple class. You
+give it a bunch of functions that act as callbacks.
+
+You also get to pass a void * to ETableSimple and it gets passed to
+your callbacks. This would be for having multiple models of the same
+type. This is just an example though, so we statically define all the
+data and ignore the void *data parameter.
+
+In our example we will be creating a table model with 6 columns and 10
+rows. This corresponds to having 6 different types of information and
+10 different sets of data in our database.
+
+The headers will be hard coded, as will be the example data.
+
+*/
+
+/*
+ There are two different meanings to the word "column". The first is
+ the model column. A model column corresponds to a specific type of
+ data. This is very much like the usage in a database table where a
+ column is a field in the database.
+
+ The second type of column is a view column. A view column
+ corresponds to a visually displayed column. Each view column
+ corresponds to a specific model column, though a model column may
+ have any number of view columns associated with it, from zero to
+ greater than one.
+
+ Also, a view column doesn't necessarily depend on only one model
+ column. In some cases, the view column renderer can be given a
+ reference to another column to get extra information about its
+ display.
+*/
+
+#define ROWS 10
+#define VIEW_COLS 4
+#define PHYSICAL_COLS 5
+#define VIRTUAL_COLS 6
+
+#define IMPORTANCE_COLUMN 4
+#define COLOR_COLUMN 5
+
+/* 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> 4 </column> \
+ <column> 1 </column> \
+ <column> 2 </column> \
+ <column> 3 </column> \
+ </columns-shown> \
+ <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \
+</ETableSpecification>"
+
+char *headers[VIEW_COLS] = {
+ "Email",
+ "Full Name",
+ "Address",
+ "Phone"
+};
+
+/* Virtual Column list:
+ 0 Full Name
+ 1 Email
+ 2 Address
+ 3 Phone
+ 4 Importance field. This field will be a boolean. It also has a
+ special header, so doesn't appear in the headers list.
+ 5 Color field. This column is also not displayed. It is also
+ not stored in the database. It's calculated based on the
+ Importance field.
+*/
+
+char *table_data[ROWS][VIEW_COLS];
+gboolean importance_data[ROWS];
+
+/*
+ * 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. */
+
+static GdkColor *color1;
+static GdkColor *color2;
+
+static int
+my_col_count (ETableModel *etc, void *data)
+{
+ return VIRTUAL_COLS;
+}
+
+static int
+my_row_count (ETableModel *etc, void *data)
+{
+ return ROWS;
+}
+
+static void *
+my_value_at (ETableModel *etc, int col, int row, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ if ( importance_data[row] ) {
+ return color1;
+ } else {
+ return color2;
+ }
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ return (gpointer) importance_data[row];
+ } else {
+ return (void *) table_data [row][col];
+ }
+}
+
+static void
+my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ importance_data[row] = (gboolean) val;
+ } else {
+ g_free (table_data [row][col]);
+ table_data [row][col] = g_strdup (val);
+ }
+}
+
+static gboolean
+my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
+{
+ if ( col == IMPORTANCE_COLUMN )
+ return FALSE;
+ else
+ return TRUE;
+}
+
+static void *
+my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ return (void *) value;
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ return (void *) value;
+ } else {
+ return g_strdup(value);
+ }
+}
+
+static void
+my_free_value (ETableModel *etc, int col, void *value, void *data)
+{
+ if ( col == COLOR_COLUMN ) {
+ } else if ( col == IMPORTANCE_COLUMN ) {
+ } else {
+ g_free(value);
+ }
+}
+
+static void
+my_thaw (ETableModel *etc, void *data)
+{
+}
+
+/* We create a window containing our new table. */
+static void
+create_table()
+{
+ GtkWidget *e_table, *window, *frame;
+ ECell *cell_left_just;
+ ECell *cell_checkbox;
+ ETableHeader *e_table_header;
+ int i, j;
+ ETableModel *e_table_model = NULL;
+ ETableCol *ecol;
+ GdkPixbuf *pixbuf;
+
+ /* First we fill in the simple data. */
+ for ( i = 0; i < ROWS; i++ ) {
+ for ( j = 0; j < VIEW_COLS; j++ ) {
+ table_data[i][j] = g_strdup("");
+ }
+ importance_data[i] = FALSE;
+ }
+ /* Next we create our model. This uses the functions we defined
+ earlier. */
+ 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);
+ /*
+ 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 < VIEW_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);
+ }
+
+ /* Next we add a special column for the check box. */
+
+ cell_checkbox = e_cell_checkbox_new ();
+ pixbuf = gdk_pixbuf_new_from_file("clip.png");
+ ecol = e_table_col_new_with_pixbuf (i, pixbuf, 18, 18, cell_checkbox, g_int_compare, TRUE);
+ e_table_header_add_column (e_table_header, ecol, i);
+
+ /*
+ * Setup GUI
+ */
+ /* 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 (e_table_header, e_table_model, INITIAL_SPEC);
+
+ /* Build the gtk widget hierarchy. */
+ gtk_container_add (GTK_CONTAINER (frame), e_table);
+ gtk_container_add (GTK_CONTAINER (window), frame);
+
+ /* Size the initial window. */
+ gtk_widget_set_usize (window, 200, 200);
+ /* Show it all. */
+ gtk_widget_show_all (window);
+}
+
+
+
+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();
+
+ gtk_main ();
+
+ e_cursors_shutdown ();
+ return 0;
+}
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 0289703bf2..91a64d204a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -40,6 +40,7 @@
static GnomeCanvasItemClass *ethi_parent_class;
static void ethi_request_redraw (ETableHeaderItem *ethi);
+static void ethi_drop_table_header (ETableHeaderItem *ethi);
/*
@@ -326,6 +327,8 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
int col;
col = ethi_find_col_by_x (ethi, x);
+ if ( col < ethi->eth->frozen_count )
+ col = ethi->eth->frozen_count;
if (col != -1){
ethi_remove_destroy_marker (ethi);
@@ -380,6 +383,8 @@ ethi_drag_drop (GtkWidget *canvas,
int col;
col = ethi_find_col_by_x (ethi, x);
+ if ( col < ethi->eth->frozen_count )
+ col = ethi->eth->frozen_count;
ethi_add_drop_marker(ethi, col);
if (col != -1) {
@@ -700,6 +705,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
GdkGC *gc;
ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
+ if ( ethi->drag_col < ethi->eth->frozen_count && ethi->drag_col >= 0 ) {
+ ethi->maybe_drag = FALSE;
+ ethi->drag_col = -1;
+ }
if (ethi->drag_col == -1)
return;
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index b1aec7da7e..527e7e22bc 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -95,6 +95,7 @@ e_table_header_new (void)
ETableHeader *eth;
eth = gtk_type_new (e_table_header_get_type ());
+ eth->frozen_count = 0;
return eth;
}
@@ -343,3 +344,9 @@ e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col)
return total;
}
+
+void
+e_table_header_set_frozen_columns (ETableHeader *eth, int idx)
+{
+ eth->frozen_count = idx;
+}
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index 96e65fdc2f..0b4e40101f 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -22,6 +22,7 @@ struct _ETableHeader {
int col_count;
ETableCol **columns;
gboolean selectable;
+ int frozen_count;
};
typedef struct {
@@ -54,6 +55,7 @@ void e_table_header_remove (ETableHeader *eth, int idx);
void e_table_header_set_size (ETableHeader *eth, int idx, int size);
void e_table_header_set_selection (ETableHeader *eth,
gboolean allow_selection);
+void e_table_header_set_frozen_columns (ETableHeader *eth, int idx);
int e_table_header_col_diff (ETableHeader *eth,
int start_col, int end_col);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index e508e24e02..589c1ec704 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -93,6 +93,8 @@ e_table_make_header (ETable *e_table, ETableHeader *full_header, xmlNode *xmlCol
e_table_header_add_column (nh, e_table_header_get_column (full_header, col), -1);
}
+
+ e_table_header_set_frozen_columns( nh, e_xml_get_integer_prop_by_name(xmlColumns, "frozen_columns") );
return nh;
}
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 0fdf32fcbe..401cacb285 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -323,7 +323,7 @@ e_table_test (void)
load_data ();
if (1){/*getenv ("DO")){*/
- do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
+ do_e_table_demo ("<ETableSpecification> <columns-shown frozen_columns=\"2\"> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"1\"> <group column=\"4\" ascending=\"0\"> <leaf column=\"2\" ascending=\"1\"/> </group> </group> </grouping> </ETableSpecification>");
}
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"1\"> <leaf column=\"2\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>");