Commit 8f87e238 authored by Michael Meeks's avatar Michael Meeks

Workaround glade bug in 'import',

Kill warning / bug in summary read.
parent cfc781ed
1999-08-05 Michael Meeks <michael@imaginator.com>
* src/file.c (workbook_import): Major hacks to get round quirks
in libglade.
* src/import.glade: Add label to the container.
1999-08-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/cell.c (calc_text_dimensions): Made static.
......
1999-08-05 Michael Meeks <michael@imaginator.com>
* src/file.c (workbook_import): Major hacks to get round quirks
in libglade.
* src/import.glade: Add label to the container.
1999-08-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/cell.c (calc_text_dimensions): Made static.
......
1999-08-05 Michael Meeks <michael@imaginator.com>
* ms-summary.c (ms_summary_read): Trivial fix to kill warning.
1999-08-02 Jody Goldberg <jgoldberg@home.com>
* ms-obj.c (ms_obj_read_pre_biff8_obj) : New function to catch
......
......@@ -27,6 +27,9 @@ Michael
support and to provide a generic sensible sub-query offset.
* Fix VLookup so the lookfuns.xls works.
* Fix INDEX, AREAS, INDIRECT.
* Fixup csv import...
* Get scalability to large sheets sorted
* Test: sample.xls, Zero31.xls
Jody
* Where do the anchor points for objects come from.
......@@ -40,4 +43,4 @@ Jody
BIFF_OBJ: Embedded objects. S59DAD.HTM
Get Nested OLE object streams working nicely.
\ No newline at end of file
Get Nested OLE object streams working nicely.
......@@ -98,8 +98,9 @@ void
ms_summary_read (MsOle *f, SummaryInfo *sin)
{
MsOleSummary *si = ms_ole_summary_open (f);
if (si)
if (si) {
read_summary_items (sin, si);
ms_ole_summary_close (si);
ms_ole_summary_close (si);
}
}
......@@ -39,7 +39,7 @@
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<name>dialog-vbox</name>
<child>
<padding>4</padding>
<expand>True</expand>
......@@ -50,7 +50,7 @@
<widget>
<class>GtkVBox</class>
<name>vbox1</name>
<name>contents</name>
<child>
<padding>0</padding>
<expand>True</expand>
......@@ -126,7 +126,7 @@
<widget>
<class>GtkButton</class>
<name>button1</name>
<name>ok_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
......@@ -134,7 +134,7 @@
<widget>
<class>GtkButton</class>
<name>button3</name>
<name>cancel_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
......
......@@ -196,7 +196,7 @@ workbook_import (Workbook *parent, const char *filename)
{
Workbook *w = NULL;
GladeXML *gui;
GtkWidget *dialog;
GtkWidget *dialog, *contents;
GtkCList *clist;
int ret, row;
GList *l;
......@@ -207,10 +207,23 @@ workbook_import (Workbook *parent, const char *filename)
return NULL;
}
/* Hack to get round libglade's bad handling of gnome-dialogs */
contents = glade_xml_get_widget (gui, "contents");
dialog = glade_xml_get_widget (gui, "import-dialog");
gtk_widget_hide (GTK_WIDGET (dialog));
dialog = gnome_dialog_new ("Import File", GNOME_STOCK_BUTTON_OK,
GNOME_STOCK_BUTTON_CANCEL, NULL);
gtk_widget_reparent (contents, GTK_CONTAINER (GNOME_DIALOG(dialog)->vbox));
gtk_widget_show (contents);
/* End of hack */
if (parent != NULL)
gnome_dialog_set_parent (GNOME_DIALOG (dialog),
GTK_WINDOW (parent->toplevel));
gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
clist = GTK_CLIST (glade_xml_get_widget (gui, "import-clist"));
gtk_clist_set_selection_mode (clist, GTK_SELECTION_SINGLE);
......@@ -227,10 +240,10 @@ workbook_import (Workbook *parent, const char *filename)
gtk_clist_set_row_data (clist, row, l->data);
row++;
}
gtk_widget_show (dialog);
ret = gnome_dialog_run (GNOME_DIALOG (dialog));
if (ret == 0){
if (ret == 0) {
char *oldlocale;
if (clist->selection){
......@@ -252,8 +265,10 @@ workbook_import (Workbook *parent, const char *filename)
return w;
}
}
gtk_object_destroy (GTK_OBJECT (gui));
gtk_object_destroy (GTK_OBJECT (dialog));
if (ret != -1) {
gnome_dialog_close (GNOME_DIALOG (dialog));
}
gtk_object_unref (GTK_OBJECT (gui));
return w;
}
......
......@@ -39,7 +39,7 @@
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<name>dialog-vbox</name>
<child>
<padding>4</padding>
<expand>True</expand>
......@@ -50,7 +50,7 @@
<widget>
<class>GtkVBox</class>
<name>vbox1</name>
<name>contents</name>
<child>
<padding>0</padding>
<expand>True</expand>
......@@ -126,7 +126,7 @@
<widget>
<class>GtkButton</class>
<name>button1</name>
<name>ok_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
......@@ -134,7 +134,7 @@
<widget>
<class>GtkButton</class>
<name>button3</name>
<name>cancel_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
......
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