From d645d1f2362a623b037cbfa09405e09b0f530c71 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Wed, 17 Jan 2001 06:56:04 +0000 Subject: Load frames. 2001-01-16 Miguel de Icaza * e-table-config.c (configure_sort_dialog): Load frames. * Kill e-table-config-field.c * e-table-specification.c (e_table_specification_save_to_file): Specify version to xmlNewDoc. * e-table-state.c (e_table_state_save_to_string): Specify version to xmlNewDoc. * e-table-config.c (config_destroy): Destroy the copies. Unref the originals. (e_table_config_construct): Duplicate values of configuration here. (configure_sort_dialog): New function that populates the sort gtk combo boxes. * e-table.c (et_col_spec_to_col): Fixup use of title here. Do the actual translation here. * e-table-column-specification.c: Remove title_, it is now called title. Translation needs to take place elsewhere, not here * e-table-specification.c (e_table_specification_duplicate): Add preconditions here. (e_table_specification_save_to_node): ditto. (e_table_specification_save_to_string): ditto. (e_table_specification_save_to_file): ditto. * e-table-state.c (e_table_state_duplicate): Implement. * e-table-config.glade (dialog_sort): Change drop down menus to use GtkComboText widgets. * e-table-config.c (configure_dialog): New function, used to set up dialogs. svn path=/trunk/; revision=7563 --- widgets/table/e-table.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'widgets/table/e-table.c') diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 3a471ee7c8..5e597bdd0c 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -647,7 +647,9 @@ e_table_fill_table (ETable *e_table, ETableModel *model) } static ETableCol * -et_col_spec_to_col (ETable *e_table, ETableColumnSpecification *col_spec, ETableExtras *ete) +et_col_spec_to_col (ETable *e_table, + ETableColumnSpecification *col_spec, + ETableExtras *ete) { ETableCol *col = NULL; ECell *cell; @@ -660,24 +662,30 @@ et_col_spec_to_col (ETable *e_table, ETableColumnSpecification *col_spec, ETable if (col_spec->pixbuf && *col_spec->pixbuf) { GdkPixbuf *pixbuf; - pixbuf = e_table_extras_get_pixbuf(ete, col_spec->pixbuf); + pixbuf = e_table_extras_get_pixbuf( + ete, col_spec->pixbuf); if (pixbuf) { - col = e_table_col_new_with_pixbuf (col_spec->model_col, col_spec->title_, pixbuf, - col_spec->expansion, col_spec->minimum_width, - cell, compare, col_spec->resizable); + col = e_table_col_new_with_pixbuf ( + col_spec->model_col, _(col_spec->title), + pixbuf, col_spec->expansion, + col_spec->minimum_width, + cell, compare, col_spec->resizable); } } - if (col == NULL && col_spec->title_ && *col_spec->title_) { - col = e_table_col_new (col_spec->model_col, col_spec->title_, - col_spec->expansion, col_spec->minimum_width, - cell, compare, col_spec->resizable); + if (col == NULL && col_spec->title && *col_spec->title) { + col = e_table_col_new ( + col_spec->model_col, _(col_spec->title), + col_spec->expansion, col_spec->minimum_width, + cell, compare, col_spec->resizable); } } return col; } static ETableHeader * -et_spec_to_full_header (ETable *e_table, ETableSpecification *spec, ETableExtras *ete) +et_spec_to_full_header (ETable *e_table, + ETableSpecification *spec, + ETableExtras *ete) { ETableHeader *nh; int column; @@ -689,7 +697,8 @@ et_spec_to_full_header (ETable *e_table, ETableSpecification *spec, ETableExtras nh = e_table_header_new (); for (column = 0; spec->columns[column]; column++) { - ETableCol *col = et_col_spec_to_col(e_table, spec->columns[column], ete); + ETableCol *col = et_col_spec_to_col ( + e_table, spec->columns[column], ete); if (col) e_table_header_add_column (nh, col, -1); -- cgit