Commit e15d0a2c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

rename gnumeric.xml GNOME_Gnumeric.xml.


2001-04-12  Jody Goldberg <jgoldberg@home.com>

	* src/Makefile.am : rename gnumeric.xml GNOME_Gnumeric.xml.

	* src/sheet.c (sheet_col_add) : update the max outline_level.
	(sheet_row_add) : ditto.

	* src/xml-io.c (xml_read_colrow_info) : restore the col/row outline
	  level data.
	(xml_write_colrow_info) : store it here.
parent 45a4251c
2001-04-12 Jody Goldberg <jgoldberg@home.com>
* src/Makefile.am : rename gnumeric.xml GNOME_Gnumeric.xml.
* src/sheet.c (sheet_col_add) : update the max outline_level.
(sheet_row_add) : ditto.
* src/xml-io.c (xml_read_colrow_info) : restore the col/row outline
level data.
(xml_write_colrow_info) : store it here.
* src/colrow.c (colrow_set_visibility) : don't collapse things unless
they are at the end of the region. Always uncollapse things.
......
2001-04-12 Jody Goldberg <jgoldberg@home.com>
* src/Makefile.am : rename gnumeric.xml GNOME_Gnumeric.xml.
* src/sheet.c (sheet_col_add) : update the max outline_level.
(sheet_row_add) : ditto.
* src/xml-io.c (xml_read_colrow_info) : restore the col/row outline
level data.
(xml_write_colrow_info) : store it here.
* src/colrow.c (colrow_set_visibility) : don't collapse things unless
they are at the end of the region. Always uncollapse things.
......
2001-04-12 Jody Goldberg <jgoldberg@home.com>
* src/Makefile.am : rename gnumeric.xml GNOME_Gnumeric.xml.
* src/sheet.c (sheet_col_add) : update the max outline_level.
(sheet_row_add) : ditto.
* src/xml-io.c (xml_read_colrow_info) : restore the col/row outline
level data.
(xml_write_colrow_info) : store it here.
* src/colrow.c (colrow_set_visibility) : don't collapse things unless
they are at the end of the region. Always uncollapse things.
......
2001-04-12 Jody Goldberg <jgoldberg@home.com>
* src/Makefile.am : rename gnumeric.xml GNOME_Gnumeric.xml.
* src/sheet.c (sheet_col_add) : update the max outline_level.
(sheet_row_add) : ditto.
* src/xml-io.c (xml_read_colrow_info) : restore the col/row outline
level data.
(xml_write_colrow_info) : store it here.
* src/colrow.c (colrow_set_visibility) : don't collapse things unless
they are at the end of the region. Always uncollapse things.
......
2001-04-12 Jody Goldberg <jgoldberg@home.com>
* src/Makefile.am : rename gnumeric.xml GNOME_Gnumeric.xml.
* src/sheet.c (sheet_col_add) : update the max outline_level.
(sheet_row_add) : ditto.
* src/xml-io.c (xml_read_colrow_info) : restore the col/row outline
level data.
(xml_write_colrow_info) : store it here.
* src/colrow.c (colrow_set_visibility) : don't collapse things unless
they are at the end of the region. Always uncollapse things.
......
......@@ -265,7 +265,9 @@ GNUMERIC_BONOBO_SOURCES = \
sheet-object-container.c \
sheet-object-container.h \
sheet-object-item.c \
sheet-object-item.h
sheet-object-item.h \
workbook-control-bonobo.h \
workbook-control-bonobo.c
gnumeric_SOURCES = \
main.c \
......@@ -315,7 +317,7 @@ dist-hook:
# $(GNOME_XML_LIB) \
# $(INTLLIBS)
EXTRA_DIST = portability.h.in gnumeric.xml
EXTRA_DIST = portability.h.in GNOME_Gnumeric.xml
uidir=$(datadir)/gnome/ui
ui_DATA = gnumeric.xml
ui_DATA = GNOME_Gnumeric.xml
......@@ -511,6 +511,8 @@ sheet_col_add (Sheet *sheet, ColRowInfo *cp)
*segment = g_new0 (ColRowSegment, 1);
(*segment)->info[COLROW_SUB_INDEX (col)] = cp;
if (cp->outline_level > sheet->cols.max_outline_level)
sheet->cols.max_outline_level = cp->outline_level;
if (col > sheet->cols.max_used){
sheet->cols.max_used = col;
sheet->priv->resize_scrollbar = TRUE;
......@@ -530,6 +532,8 @@ sheet_row_add (Sheet *sheet, ColRowInfo *rp)
*segment = g_new0 (ColRowSegment, 1);
(*segment)->info[COLROW_SUB_INDEX (row)] = rp;
if (rp->outline_level > sheet->rows.max_outline_level)
sheet->rows.max_outline_level = rp->outline_level;
if (rp->pos > sheet->rows.max_used){
sheet->rows.max_used = row;
sheet->priv->resize_scrollbar = TRUE;
......
......@@ -1659,8 +1659,14 @@ xml_write_colrow_info (ColRowInfo *info, void *user_data)
xml_set_value_points (cur, "Unit", prev->size_pts);
xml_set_value_int (cur, "MarginA", prev->margin_a);
xml_set_value_int (cur, "MarginB", prev->margin_b);
xml_set_value_int (cur, "HardSize", prev->hard_size);
xml_set_value_int (cur, "Hidden", !prev->visible);
if (prev->hard_size)
xml_set_value_int (cur, "HardSize", TRUE);
if (!prev->visible)
xml_set_value_int (cur, "Hidden", TRUE);
if (prev->is_collapsed)
xml_set_value_int (cur, "Collapsed", TRUE);
if (prev->outline_level > 0)
xml_set_value_int (cur, "OutlineLevel", prev->outline_level);
if (closure->rle_count > 1)
xml_set_value_int (cur, "Count", closure->rle_count);
......@@ -2564,6 +2570,10 @@ xml_read_colrow_info (XmlParseContext *ctxt, xmlNodePtr tree,
info->hard_size = val;
if (xml_get_value_int (tree, "Hidden", &val) && val)
info->visible = FALSE;
if (xml_get_value_int (tree, "Collapsed", &val) && val)
info->is_collapsed = TRUE;
if (xml_get_value_int (tree, "OutlineLevel", &val) && val > 0)
info->outline_level = val;
if (xml_get_value_int (tree, "Count", &count))
return count;
return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment