Commit 4fc47b74 authored by Jon K Hellan's avatar Jon K Hellan Committed by Jon Kåre Hellan
Browse files

Remove autosave timer.

2000-01-19  Jon K Hellan  <hellan@acm.org>

	* src/workbook.c (workbook_do_destroy): Remove autosave timer.

	* src/dialogs/dialog-zoom.c (dialog_zoom_impl): Set initial focus
	to selected radio button.

	* src/dialogs/font-sel.glade.h, src/dialogs/font-sel.glade: Fix
	typo in preview text

	* src/dialogs/dialog-printer-setup.c (do_setup_main_dialog):
	Set Initial focus for print setup dialog.

	* src/workbook.c (workbook_can_close): Yes/No dialog: Give cancel
	button initial keyboard focus.
parent 92595046
2000-01-19 Jon K Hellan <hellan@acm.org>
* src/workbook.c (workbook_do_destroy): Remove autosave timer.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl): Set initial focus
to selected radio button.
* src/dialogs/font-sel.glade.h, src/dialogs/font-sel.glade: Fix
typo in preview text
* src/dialogs/dialog-printer-setup.c (do_setup_main_dialog):
Set Initial focus for print setup dialog.
* src/workbook.c (workbook_can_close): Yes/No dialog: Give cancel
button initial keyboard focus.
2000-01-19 Jody Goldberg <jgoldberg@home.com>
* src/item-cursor.c (item_cursor_animation_callback) : Return TRUE
......
2000-01-19 Jon K Hellan <hellan@acm.org>
* src/workbook.c (workbook_do_destroy): Remove autosave timer.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl): Set initial focus
to selected radio button.
* src/dialogs/font-sel.glade.h, src/dialogs/font-sel.glade: Fix
typo in preview text
* src/dialogs/dialog-printer-setup.c (do_setup_main_dialog):
Set Initial focus for print setup dialog.
* src/workbook.c (workbook_can_close): Yes/No dialog: Give cancel
button initial keyboard focus.
2000-01-19 Jody Goldberg <jgoldberg@home.com>
* src/item-cursor.c (item_cursor_animation_callback) : Return TRUE
......
......@@ -715,7 +715,7 @@ do_print_preview_cb (GtkWidget *w, dialog_print_info_t *dpi)
static void
do_setup_main_dialog (dialog_print_info_t *dpi)
{
GtkWidget *notebook, *old_parent;
GtkWidget *notebook, *old_parent, *focus_target;
int i;
g_return_if_fail (dpi != NULL);
......@@ -742,6 +742,9 @@ do_setup_main_dialog (dialog_print_info_t *dpi)
gtk_widget_queue_resize (notebook);
focus_target = glade_xml_get_widget (dpi->gui, "vertical-radio");
gtk_widget_grab_focus (focus_target);
for (i = 1; i < 5; i++) {
GtkWidget *w;
char *print = g_strdup_printf ("print-%d", i);
......
......@@ -56,7 +56,7 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
radio_cb_data cb_data[NUM_RADIO_BUTTONS];
GtkCList *list;
GtkWidget *dialog;
GtkWidget *dialog, *focus_target;
GtkRadioButton *radio, *custom;
GtkSpinButton *zoom;
GList *l, *sheets;
......@@ -72,6 +72,7 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
gtk_signal_connect (GTK_OBJECT (zoom), "focus_in_event",
GTK_SIGNAL_FUNC (custom_selected),
custom);
focus_target = GTK_WIDGET (custom);
for (i = NUM_RADIO_BUTTONS; --i >= 0; ) {
radio = GTK_RADIO_BUTTON (glade_xml_get_widget (gui, buttons[i].name));
......@@ -87,6 +88,7 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
if (cur_sheet->last_zoom_factor_used == buttons[i].factor) {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
is_custom = FALSE;
focus_target = GTK_WIDGET (radio);
}
}
......@@ -125,9 +127,10 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (wb->toplevel));
/* Hitting enter in the spin box should Press 'Ok' */
gnome_dialog_editable_enters(GNOME_DIALOG(dialog),
GTK_EDITABLE(zoom));
gnome_dialog_editable_enters (GNOME_DIALOG(dialog),
GTK_EDITABLE(zoom));
gtk_widget_grab_focus (focus_target);
/* Bring up the dialog */
res = gnome_dialog_run (GNOME_DIALOG (dialog));
if (res == 0) {
......
......@@ -207,7 +207,7 @@
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>20</text_max_length>
<text>AaBbCcDdEeJj12345</text>
<text>AaBbCcDdEe12345</text>
<child>
<padding>0</padding>
<expand>True</expand>
......
......@@ -9,7 +9,7 @@ gchar *s = N_("Font:");
gchar *s = N_("Font style:");
gchar *s = N_("Size:");
gchar *s = N_("Preview");
gchar *s = N_("AaBbCcDdEeJj12345");
gchar *s = N_("AaBbCcDdEe12345");
gchar *s = N_("label8");
gchar *s = N_("label7");
gchar *s = N_("label9");
......@@ -257,6 +257,8 @@ workbook_do_destroy (Workbook *wb)
GTK_OBJECT (wb->toplevel),
GTK_SIGNAL_FUNC (workbook_set_focus), wb);
gtk_timeout_remove (wb->autosave_timer);
/*
* Do all deletions that leave the workbook in a working
* order.
......@@ -520,7 +522,7 @@ workbook_can_close (Workbook *wb)
in_can_close = TRUE;
while (workbook_is_dirty (wb) && !done) {
GtkWidget *d, *l;
GtkWidget *d, *l, *cancel_button;
int button;
char *s;
......@@ -532,6 +534,8 @@ workbook_can_close (Workbook *wb)
GNOME_STOCK_BUTTON_NO,
GNOME_STOCK_BUTTON_CANCEL,
NULL);
cancel_button = g_list_last (GNOME_DIALOG (d)->buttons)->data;
gtk_widget_grab_focus (cancel_button);
gnome_dialog_set_parent (GNOME_DIALOG (d), GTK_WINDOW (wb->toplevel));
if (wb->filename)
......
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