Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnumeric/configure.in,v
retrieving revision 1.654
diff -u -w -r1.654 configure.in
--- configure.in 9 Sep 2004 04:35:47 -0000 1.654
+++ configure.in 9 Sep 2004 17:30:42 -0000
@@ -1,6 +1,6 @@
-*- mode: m4 -*-
AC_PREREQ(2.52)
-AC_INIT(gnumeric, 1.3.90,
+AC_INIT(gnumeric, 1.3.90-psion,
http://bugzilla.gnome.org/enter_bug.cgi?product=gnumeric)
AC_CONFIG_SRCDIR(src/sheet.h)
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 9 Sep 2004 17:30:42 -0000
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnumeric/src/Makefile.am,v
retrieving revision 1.349
diff -u -w -r1.349 Makefile.am
--- src/Makefile.am 8 Sep 2004 03:45:44 -0000 1.349
+++ src/Makefile.am 9 Sep 2004 17:30:43 -0000
@@ -369,7 +369,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 \
@@ -385,7 +385,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-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 9 Sep 2004 17:30:43 -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/wbc-gtk.c
===================================================================
RCS file: /cvs/gnome/gnumeric/src/wbc-gtk.c,v
retrieving revision 1.51
diff -u -w -r1.51 wbc-gtk.c
--- src/wbc-gtk.c 9 Sep 2004 03:51:32 -0000 1.51
+++ src/wbc-gtk.c 9 Sep 2004 17:30:43 -0000
@@ -1066,7 +1066,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);
}
@@ -1311,7 +1311,7 @@
gtk_window_add_accel_group (wbcg->toplevel,
gtk_ui_manager_get_accel_group (gtk->ui));
uifile = g_build_filename (gnumeric_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.60
diff -u -w -r1.60 wbcg-actions.c
--- src/wbcg-actions.c 9 Sep 2004 03:51:32 -0000 1.60
+++ src/wbcg-actions.c 9 Sep 2004 17:30:44 -0000
@@ -1415,6 +1415,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") },
@@ -1526,7 +1527,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) },
@@ -1625,15 +1626,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"),
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 9 Sep 2004 17:30:44 -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 9 Sep 2004 17:30:44 -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 9 Sep 2004 17:30:44 -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);