Commit a08923f9 authored by Jody Goldberg's avatar Jody Goldberg
Browse files

Minor improvements to

- ole test program
- zoom dialog.
parent c9a3284b
......@@ -10,7 +10,8 @@
1999-09-23 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Set the spinbox value
when we start with a custom zoom factor.
when we start with a custom zoom factor, round correctly. Set the
parent to be gnumeric.
1999-09-22 Jody Goldberg <jgoldberg@home.com>
......
......@@ -10,7 +10,8 @@
1999-09-23 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Set the spinbox value
when we start with a custom zoom factor.
when we start with a custom zoom factor, round correctly. Set the
parent to be gnumeric.
1999-09-22 Jody Goldberg <jgoldberg@home.com>
......
......@@ -2,6 +2,7 @@
* ole.c (dump_vba) : Remove the escher code. The new version needs to
much context to be useable at this level.
(enter_dir) : Improve error message, and fix thinko.
* ms-excel-read.c (ms_excel_read_cell) : Fix importing of column
widths.
......
......@@ -128,6 +128,7 @@ list_commands ()
printf (" * dump <stream name>: dump stream\n");
printf (" * summary : dump document summary info\n");
printf (" * debug : dump internal ole library status\n");
printf (" * vba : attempt to dump vba \n");
printf (" Raw transfer commands\n");
printf (" * get <stream name> <fname>\n");
printf (" * put <fname> <stream name>\n");
......@@ -198,9 +199,9 @@ enter_dir (MsOle *ole)
g_free (newpath);
return;
}
if (s.type != MsOleStorageT ||
if (s.type != MsOleStorageT &&
s.type != MsOleRootT) {
printf ("Trying to enter a stream");
printf ("Trying to enter a stream. (%d)\n", s.type);
g_free (newpath);
return;
}
......
......@@ -93,7 +93,7 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
radio = GTK_RADIO_BUTTON (glade_xml_get_widget (gui, "radio_custom"));
g_return_if_fail (radio != NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
gtk_spin_button_set_value (zoom, (int)(cur_sheet->last_zoom_factor_used * 100.));
gtk_spin_button_set_value (zoom, (int)(cur_sheet->last_zoom_factor_used * 100. + .5));
}
gtk_clist_freeze (list);
......@@ -119,6 +119,10 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
return;
}
/* Make the dialog a child of the application so that it will iconify */
gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (wb->toplevel));
/* Bring up the dialog */
res = gnome_dialog_run (GNOME_DIALOG (dialog));
if (res == 0) {
float const new_zoom = gtk_spin_button_get_value_as_int(zoom) / 100.;
......@@ -128,6 +132,7 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
}
}
/* If the user closed the dialog with prejudice, its already destroyed */
if (res >= 0)
gnome_dialog_close (GNOME_DIALOG (dialog));
}
......
......@@ -29,9 +29,9 @@
<class>GnomeDialog</class>
<name>Zoom</name>
<title>Zoom</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
......@@ -336,6 +336,7 @@
<class>GtkButton</class>
<name>ok_button</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
......@@ -345,6 +346,7 @@
<name>cancel_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
......
......@@ -845,7 +845,6 @@ sheet_col_set_width (Sheet *sheet, int col, int width)
/* Move any cell comments */
sheet_reposition_comments_from_col (sheet, col);
}
static inline int
......
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