Index: configure.in =================================================================== RCS file: /cvs/gnome/gnumeric/configure.in,v retrieving revision 1.665 diff -u -w -r1.665 configure.in --- configure.in 6 Oct 2004 03:27:26 -0000 1.665 +++ configure.in 6 Oct 2004 03:31:25 -0000 @@ -4,7 +4,7 @@ m4_define([gnumeric_version_epoch], [1]) m4_define([gnumeric_version_major], [3]) m4_define([gnumeric_version_minor], [91]) -m4_define([gnumeric_version_extra], []) +m4_define([gnumeric_version_extra], [-psion]) m4_define([gnumeric_full_version], [gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor()gnumeric_version_extra]) Index: plugins/excel/plugin.xml.in =================================================================== RCS file: /cvs/gnome/gnumeric/plugins/excel/plugin.xml.in,v retrieving revision 1.23 diff -u -w -r1.23 plugin.xml.in --- plugins/excel/plugin.xml.in 24 Sep 2004 01:33:18 -0000 1.23 +++ plugins/excel/plugin.xml.in 6 Oct 2004 03:31:25 -0000 @@ -32,7 +32,7 @@ + format_level="auto" overwrite_files="TRUE" default_saver_priority="100"> <_description>MS Excel (tm) 97/2000/XP Index: schemas/gnumeric-dialogs.schemas.in =================================================================== RCS file: /cvs/gnome/gnumeric/schemas/gnumeric-dialogs.schemas.in,v retrieving revision 1.16 diff -u -w -r1.16 gnumeric-dialogs.schemas.in --- schemas/gnumeric-dialogs.schemas.in 29 Jan 2004 00:32:49 -0000 1.16 +++ schemas/gnumeric-dialogs.schemas.in 6 Oct 2004 03:31:25 -0000 @@ -241,7 +241,7 @@ Gnumeric string - Sans + Albany Default header/footer font name The default font name for headers and footers. Index: schemas/gnumeric-general.schemas.in =================================================================== RCS file: /cvs/gnome/gnumeric/schemas/gnumeric-general.schemas.in,v retrieving revision 1.27 diff -u -w -r1.27 gnumeric-general.schemas.in --- schemas/gnumeric-general.schemas.in 17 Jul 2004 06:17:40 -0000 1.27 +++ schemas/gnumeric-general.schemas.in 6 Oct 2004 03:31:25 -0000 @@ -74,7 +74,7 @@ Gnumeric string - Sans + Albany Default font name The default font name for new workbooks. Index: src/GNOME_Gnumeric-psion.xml =================================================================== RCS file: src/GNOME_Gnumeric-psion.xml diff -N src/GNOME_Gnumeric-psion.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/GNOME_Gnumeric-psion.xml 6 Oct 2004 03:31:25 -0000 @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/Makefile.am =================================================================== RCS file: /cvs/gnome/gnumeric/src/Makefile.am,v retrieving revision 1.352 diff -u -w -r1.352 Makefile.am --- src/Makefile.am 29 Sep 2004 19:58:37 -0000 1.352 +++ src/Makefile.am 6 Oct 2004 03:31:25 -0000 @@ -375,7 +375,7 @@ # include conditional files to ensure everything gets distributed no matter # what the build -EXTRA_DIST = GNOME_Gnumeric-gtk.xml \ +EXTRA_DIST = GNOME_Gnumeric-psion.xml \ gnm-marshalers.list \ main-application.c \ main-component.c \ @@ -391,7 +391,7 @@ # $(INTLLIBS) gtkactiondir=$(gnumeric_datadir) -gtkaction_DATA = GNOME_Gnumeric-gtk.xml +gtkaction_DATA = GNOME_Gnumeric-psion.xml # Bonobo requires things to be in a subdir of this form #bonobo_component_uidir=$(gnumeric_datadir)/gnome-2.0/ui Index: src/item-bar.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/item-bar.c,v retrieving revision 1.200 diff -u -w -r1.200 item-bar.c --- src/item-bar.c 29 Aug 2004 15:42:55 -0000 1.200 +++ src/item-bar.c 6 Oct 2004 03:31:26 -0000 @@ -703,11 +703,12 @@ } if (cri->visible) { + int const threshold = ib->is_col_header ? 4 : 1; total += cri->size_pixels; if (wbcg_edit_get_guru (ib->gcanvas->simple.scg->wbcg) == NULL && !wbcg_is_editing (ib->gcanvas->simple.scg->wbcg) && - (total - 4 < pos) && (pos < total + 4)) { + (total - threshold < pos) && (pos < total + threshold)) { if (the_total) *the_total = total; if (the_element) Index: src/item-cursor.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/item-cursor.c,v retrieving revision 1.204 diff -u -w -r1.204 item-cursor.c --- src/item-cursor.c 7 Sep 2004 05:49:47 -0000 1.204 +++ src/item-cursor.c 6 Oct 2004 03:31:26 -0000 @@ -583,13 +583,13 @@ ? ic->canvas_item.y1 + AUTO_HANDLE_WIDTH : ic->canvas_item.y2 - AUTO_HANDLE_WIDTH; - if ((y_test-AUTO_HANDLE_SPACE) <= y && - y <= (y_test+AUTO_HANDLE_SPACE)) { + if ((y_test-(AUTO_HANDLE_SPACE*2)) <= y && + y <= (y_test+(AUTO_HANDLE_SPACE*2))) { int const x_test = ic->auto_fill_handle_at_left ? ic->canvas_item.x1 + AUTO_HANDLE_WIDTH : ic->canvas_item.x2 - AUTO_HANDLE_WIDTH; - return (x_test-AUTO_HANDLE_SPACE) <= x && - x <= (x_test+AUTO_HANDLE_SPACE); + return (x_test-(AUTO_HANDLE_SPACE*2)) <= x && + x <= (x_test+(AUTO_HANDLE_SPACE*2)); } return FALSE; } Index: src/style.h =================================================================== RCS file: /cvs/gnome/gnumeric/src/style.h,v retrieving revision 1.79 diff -u -w -r1.79 style.h --- src/style.h 21 Feb 2004 17:16:45 -0000 1.79 +++ src/style.h 6 Oct 2004 03:31:26 -0000 @@ -5,7 +5,7 @@ #include #include "gnumeric.h" -#define DEFAULT_FONT "Sans" +#define DEFAULT_FONT "Albany" #define DEFAULT_SIZE 10.0 /* Alignment definitions */ Index: src/wbc-gtk.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/wbc-gtk.c,v retrieving revision 1.54 diff -u -w -r1.54 wbc-gtk.c --- src/wbc-gtk.c 28 Sep 2004 02:56:10 -0000 1.54 +++ src/wbc-gtk.c 6 Oct 2004 03:31:27 -0000 @@ -1067,7 +1067,7 @@ while (i-- > 1) { char *name = g_strdup_printf ("WindowListEntry%d", i); gtk_ui_manager_add_ui (gtk->ui, gtk->windows.merge_id, - "/menubar/View/Windows", + "/menubar/Windows", name, name, GTK_UI_MANAGER_AUTO, TRUE); g_free (name); } @@ -1313,7 +1313,7 @@ gtk_window_add_accel_group (wbcg->toplevel, gtk_ui_manager_get_accel_group (gtk->ui)); uifile = g_build_filename (gnm_sys_data_dir (NULL), - "GNOME_Gnumeric-gtk.xml", NULL); + "GNOME_Gnumeric-psion.xml", NULL); if (!gtk_ui_manager_add_ui_from_file (gtk->ui, uifile, &error)) { g_message ("building menus failed: %s", error->message); g_error_free (error); Index: src/wbcg-actions.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/wbcg-actions.c,v retrieving revision 1.64 diff -u -w -r1.64 wbcg-actions.c --- src/wbcg-actions.c 28 Sep 2004 02:56:10 -0000 1.64 +++ src/wbcg-actions.c 6 Oct 2004 03:31:28 -0000 @@ -1439,6 +1439,7 @@ { "MenuViewToolbars", NULL, N_("_Toolbars") }, { "MenuInsert", NULL, N_("_Insert") }, { "MenuInsertNames", NULL, N_("_Names") }, + { "MenuInsertDrawing", NULL, N_("_Drawing") }, { "MenuInsertSpecial", NULL, N_("S_pecial") }, { "MenuFormat", NULL, N_("F_ormat") }, { "MenuFormatColumn", NULL, N_("C_olumn") }, @@ -1550,7 +1551,7 @@ NULL, N_("Delete the column(s) containing the selected cells"), G_CALLBACK (cb_edit_delete_columns) }, { "EditDeleteCells", NULL, N_("C_ells..."), - "minus", N_("Delete the selected cells, shifting others into their place"), + NULL, N_("Delete the selected cells, shifting others into their place"), G_CALLBACK (cb_edit_delete_cells) }, @@ -1635,11 +1636,11 @@ G_CALLBACK (cb_edit_goto) }, { "EditRecalc", NULL, N_("Recalculate"), - "F9", N_("Recalculate the spreadsheet"), + "9", N_("Recalculate the spreadsheet"), G_CALLBACK (cb_edit_recalc) }, /* View */ - { "ViewNew", NULL, N_("_New View..."), + { "ViewNew", NULL, N_("_New Window..."), NULL, N_("Create a new view of the workbook"), G_CALLBACK (cb_view_new) }, { "ViewFreezeThawPanes", NULL, N_("_Freeze Panes"), @@ -1649,15 +1650,15 @@ NULL, N_("Zoom the spreadsheet in or out"), G_CALLBACK (cb_view_zoom) }, { "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), - NULL, N_("Increase the zoom to make things larger"), + "plus", N_("Increase the zoom to make things larger"), G_CALLBACK (cb_view_zoom_in) }, { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), - NULL, N_("Decrease the zoom to make things smaller"), + "minus", N_("Decrease the zoom to make things smaller"), G_CALLBACK (cb_view_zoom_out) }, /* Insert */ { "InsertCells", NULL, N_("C_ells..."), - "plus", N_("Insert new cells"), + NULL, N_("Insert new cells"), G_CALLBACK (cb_insert_cells) }, { "InsertColumns", "Gnumeric_ColumnAdd", N_("_Columns"), NULL, N_("Insert new columns"), @@ -1691,7 +1692,7 @@ /* Insert -> Name */ { "EditNames", NULL, N_("_Define..."), - "F3", N_("Edit sheet and workbook names"), + "3", N_("Edit sheet and workbook names"), G_CALLBACK (cb_define_name) }, #if 0 GNOMEUIINFO_ITEM_NONE (N_("_Auto generate names..."), @@ -1703,7 +1704,7 @@ { "FormatCells", NULL, N_("_Cells..."), "1", N_("Modify the formatting of the selected cells"), G_CALLBACK (cb_format_cells) }, - { "FormatWorkbook", NULL, N_("_Workbook..."), + { "FormatWorkbook", NULL, N_("_Workbook Preferences..."), NULL, N_("Modify the workbook attributes"), G_CALLBACK (cb_workbook_attr) }, { "FormatGnumeric", GTK_STOCK_PREFERENCES, N_("_Gnumeric..."), @@ -2098,7 +2099,7 @@ G_CALLBACK (cb_view_statusbar), TRUE }, { "ViewFullScreen", GTK_STOCK_ZOOM_FIT, - N_("F_ull Screen..."), "F11", + N_("F_ull Screen..."), "1", N_("in or out"), G_CALLBACK (cb_view_fullscreen), FALSE } }; Index: src/dialogs/dialog-col-width.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/dialogs/dialog-col-width.c,v retrieving revision 1.15 diff -u -w -r1.15 dialog-col-width.c --- src/dialogs/dialog-col-width.c 6 Mar 2004 23:10:16 -0000 1.15 +++ src/dialogs/dialog-col-width.c 6 Oct 2004 03:31:28 -0000 @@ -69,6 +69,8 @@ static void dialog_col_width_button_sensitivity (ColWidthState *state) { + gboolean changed_info = TRUE; +#if 0 gnm_float value = gtk_spin_button_get_value (state->spin); gboolean use_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (state->default_check)); @@ -82,6 +84,7 @@ || (use_default && !state->orig_is_default)); } +#endif gtk_widget_set_sensitive (state->ok_button, changed_info); gtk_widget_set_sensitive (state->apply_button, changed_info); } Index: src/dialogs/dialog-row-height.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/dialogs/dialog-row-height.c,v retrieving revision 1.15 diff -u -w -r1.15 dialog-row-height.c --- src/dialogs/dialog-row-height.c 6 Mar 2004 23:10:16 -0000 1.15 +++ src/dialogs/dialog-row-height.c 6 Oct 2004 03:31:28 -0000 @@ -69,6 +69,8 @@ static void dialog_row_height_button_sensitivity (RowHeightState *state) { + gboolean changed_info = TRUE; +#if 0 gnm_float value = gtk_spin_button_get_value (state->spin); gboolean use_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (state->default_check)); @@ -82,6 +84,7 @@ || (use_default && !state->orig_is_default)); } +#endif gtk_widget_set_sensitive (state->ok_button, changed_info); gtk_widget_set_sensitive (state->apply_button, changed_info); } Index: src/dialogs/dialog-workbook-attr.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/dialogs/dialog-workbook-attr.c,v retrieving revision 1.43 diff -u -w -r1.43 dialog-workbook-attr.c --- src/dialogs/dialog-workbook-attr.c 29 Dec 2003 19:18:38 -0000 1.43 +++ src/dialogs/dialog-workbook-attr.c 6 Oct 2004 03:31:28 -0000 @@ -106,11 +106,12 @@ static void cb_widget_changed (G_GNUC_UNUSED GtkWidget *widget, AttrState *state) { - gboolean changed; + gboolean changed = TRUE; int max_iterations; double iteration_tolerance; get_entry_values (state, &max_iterations, &iteration_tolerance); +#if 0 changed = !((gtk_toggle_button_get_active (state->view.show_hsb) == state->old.show_hsb) && (gtk_toggle_button_get_active (state->view.show_vsb) == state->old.show_vsb) && @@ -121,6 +122,7 @@ (gtk_toggle_button_get_active (state->view.iteration_enabled) == state->old.iteration_enabled) && (max_iterations == state->old.max_iterations) && (iteration_tolerance == state->old.iteration_tolerance)); +#endif gtk_widget_set_sensitive (state->ok_button, changed); gtk_widget_set_sensitive (state->apply_button, changed); Index: src/dialogs/preferences.glade =================================================================== RCS file: /cvs/gnome/gnumeric/src/dialogs/preferences.glade,v retrieving revision 1.7 diff -u -w -r1.7 preferences.glade --- src/dialogs/preferences.glade 9 Feb 2004 19:45:58 -0000 1.7 +++ src/dialogs/preferences.glade 6 Oct 2004 03:31:28 -0000 @@ -5,7 +5,7 @@ 6 - Gnumeric Preferences + Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False Index: src/dialogs/workbook-attr.glade =================================================================== RCS file: /cvs/gnome/gnumeric/src/dialogs/workbook-attr.glade,v retrieving revision 1.17 diff -u -w -r1.17 workbook-attr.glade --- src/dialogs/workbook-attr.glade 24 Apr 2003 15:26:17 -0000 1.17 +++ src/dialogs/workbook-attr.glade 6 Oct 2004 03:31:28 -0000 @@ -4,7 +4,7 @@ - Format Workbook + Workbook Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False