From 2f81032abc0e68f1a2cdbc88c23b0febd2524bb1 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 10 Aug 2001 15:47:18 +0000 Subject: new proto and virtual method 2001-08-10 JP Rosevear * gal/widgets/e-canvas-vbox.h: new proto and virtual method * gal/widgets/e-canvas-vbox.c (e_canvas_vbox_real_add_item_start): adds the the item to the beginning (e_canvas_vbox_add_item_start): call the virtual method 2001-08-10 JP Rosevear * e-table.c (et_build_groups): add the items to the start or end based on where the click to add should be (e_table_setup_table): ditto (et_real_construct): read additional spec flag * e-table.h: new flag * e-table-specification.c (etsp_init): init new flag (e_table_specification_load_from_node): set click to add end flag (e_table_specification_save_to_node): write out flag * e-table-specification.h: new flag svn path=/trunk/; revision=11880 --- widgets/table/e-table-specification.c | 3 +++ widgets/table/e-table-specification.h | 1 + widgets/table/e-table.c | 24 ++++++++++++++++++------ widgets/table/e-table.h | 1 + 4 files changed, 23 insertions(+), 6 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index 487f3113ad..1a2aefd9c9 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -65,6 +65,7 @@ etsp_init (ETableSpecification *etsp) etsp->alternating_row_colors = TRUE; etsp->no_headers = FALSE; etsp->click_to_add = FALSE; + etsp->click_to_add_end = FALSE; etsp->horizontal_draw_grid = FALSE; etsp->vertical_draw_grid = FALSE; etsp->draw_focus = TRUE; @@ -165,6 +166,7 @@ e_table_specification_load_from_node (ETableSpecification *specification, specification->no_headers = e_xml_get_bool_prop_by_name (node, "no-headers"); specification->click_to_add = e_xml_get_bool_prop_by_name (node, "click-to-add"); + specification->click_to_add_end = e_xml_get_bool_prop_by_name (node, "click-to-add-end") && specification->click_to_add; specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, "alternating-row-colors", TRUE); specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, "horizontal-draw-grid"); specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, "vertical-draw-grid"); @@ -311,6 +313,7 @@ e_table_specification_save_to_node (ETableSpecification *specification, node = xmlNewNode (NULL, "ETableSpecification"); e_xml_set_bool_prop_by_name (node, "no-headers", specification->no_headers); e_xml_set_bool_prop_by_name (node, "click-to-add", specification->click_to_add); + e_xml_set_bool_prop_by_name (node, "click-to-add-end", specification->click_to_add_end && specification->click_to_add); e_xml_set_bool_prop_by_name (node, "alternating-row-colors", specification->alternating_row_colors); e_xml_set_bool_prop_by_name (node, "horizontal-draw-grid", specification->horizontal_draw_grid); e_xml_set_bool_prop_by_name (node, "vertical-draw-grid", specification->vertical_draw_grid); diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index b2941f38d3..c50989eeb0 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -28,6 +28,7 @@ typedef struct { guint alternating_row_colors : 1; guint no_headers : 1; guint click_to_add : 1; + guint click_to_add_end : 1; guint horizontal_draw_grid : 1; guint vertical_draw_grid : 1; guint draw_focus : 1; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 1bbd37f772..bde2f990bc 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -595,7 +595,12 @@ et_build_groups (ETable *et) et->model, et->sort_info, 0); - e_canvas_vbox_add_item(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group)); + + if (et->use_click_to_add_end) + e_canvas_vbox_add_item_start(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group)); + else + e_canvas_vbox_add_item(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group)); + gnome_canvas_item_set(GNOME_CANVAS_ITEM(et->group), "alternating_row_colors", et->alternating_row_colors, "horizontal_draw_grid", et->horizontal_draw_grid, @@ -760,6 +765,8 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h "spacing", 10.0, NULL); + et_build_groups(e_table); + if (e_table->use_click_to_add) { e_table->click_to_add = gnome_canvas_item_new ( GNOME_CANVAS_GROUP(e_table->canvas_vbox), @@ -769,15 +776,19 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h "message", e_table->click_to_add_message, NULL); - e_canvas_vbox_add_item ( - E_CANVAS_VBOX(e_table->canvas_vbox), - e_table->click_to_add); + if (e_table->use_click_to_add_end) + e_canvas_vbox_add_item ( + E_CANVAS_VBOX(e_table->canvas_vbox), + e_table->click_to_add); + else + e_canvas_vbox_add_item_start ( + E_CANVAS_VBOX(e_table->canvas_vbox), + e_table->click_to_add); + gtk_signal_connect ( GTK_OBJECT (e_table->click_to_add), "cursor_change", GTK_SIGNAL_FUNC(click_to_add_cursor_change), e_table); } - - et_build_groups(e_table); } static void @@ -974,6 +985,7 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, ete = e_table_extras_new(); e_table->use_click_to_add = specification->click_to_add; + e_table->use_click_to_add_end = specification->click_to_add_end; e_table->click_to_add_message = e_utf8_from_locale_string (gettext (specification->click_to_add_message)); e_table->alternating_row_colors = specification->alternating_row_colors; e_table->horizontal_draw_grid = specification->horizontal_draw_grid; diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index f0656e7790..b5b9dd5f0a 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -89,6 +89,7 @@ typedef struct { char *click_to_add_message; GnomeCanvasItem *click_to_add; gboolean use_click_to_add; + gboolean use_click_to_add_end; ECursorMode cursor_mode; -- cgit v1.2.3