[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp lib/gtksheet/ChangeLog lib/gtksheet/gtkshe...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp lib/gtksheet/ChangeLog lib/gtksheet/gtkshe... |
|
Date: |
Tue, 03 Jul 2007 05:49:53 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/07/03 05:49:53
Modified files:
lib/gtksheet : ChangeLog gtksheet.c gtksheet.h
src/ui/gui : ChangeLog data-editor.c data-sheet.c
Log message:
Removed some gtksheet features that were causing problems for us when
autoscrolling the datasheet.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/ChangeLog?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.h?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-sheet.c?cvsroot=pspp&r1=1.21&r2=1.22
Patches:
Index: lib/gtksheet/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- lib/gtksheet/ChangeLog 28 Jun 2007 05:02:38 -0000 1.12
+++ lib/gtksheet/ChangeLog 3 Jul 2007 05:49:53 -0000 1.13
@@ -1,4 +1,9 @@
- 28 June 2007 John Darrington <address@hidden>
+03 July 2007 John Darrington <address@hidden>
+
+ * gtksheet.c gtksheet.h: Removed the autoscroll-on-select feature
+ that was causing us grief.
+
+28 June 2007 John Darrington <address@hidden>
* gtksheet.c: Removed some features that we dont use, to get better
speed.
Index: lib/gtksheet/gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- lib/gtksheet/gtksheet.c 28 Jun 2007 05:02:38 -0000 1.17
+++ lib/gtksheet/gtksheet.c 3 Jul 2007 05:49:53 -0000 1.18
@@ -95,7 +95,6 @@
#define CELL_SPACING 1
#define DRAG_WIDTH 6
-#define TIMEOUT_SCROLL 20
#define TIMEOUT_FLASH 200
#define TIME_INTERVAL 8
#define COLUMN_MIN_WIDTH 10
@@ -644,7 +643,6 @@
gint row, gint column);
/* Clipped Range */
-static gint gtk_sheet_scroll (gpointer data);
static gint gtk_sheet_flash (gpointer data);
/* Drawing Routines */
@@ -667,7 +665,7 @@
/* Selection */
-static gint gtk_sheet_move_query (GtkSheet *sheet,
+static gboolean gtk_sheet_move_query (GtkSheet *sheet,
gint row, gint column);
static void gtk_sheet_real_select_range (GtkSheet * sheet,
const GtkSheetRange * range);
@@ -2010,7 +2008,7 @@
}
void
-gtk_sheet_moveto (GtkSheet * sheet,
+gtk_sheet_moveto (GtkSheet *sheet,
gint row,
gint column,
gfloat row_align,
@@ -2248,6 +2246,7 @@
if (!GTK_SHEET_IN_CLIP (sheet)) return;
GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_CLIP);
+
gtk_timeout_remove (sheet->clip_timer);
gtk_sheet_range_draw (sheet, &sheet->clip_range);
@@ -2443,7 +2442,6 @@
void
gtk_sheet_get_visible_range (GtkSheet *sheet, GtkSheetRange *range)
{
-
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet)) ;
g_return_if_fail (range != NULL);
@@ -2452,7 +2450,6 @@
range->col0 = MIN_VISIBLE_COLUMN (sheet);
range->rowi = MAX_VISIBLE_ROW (sheet);
range->coli = MAX_VISIBLE_COLUMN (sheet);
-
}
GtkAdjustment *
@@ -2626,12 +2623,6 @@
sheet->button = NULL;
}
- if (sheet->timer)
- {
- gtk_timeout_remove (sheet->timer);
- sheet->timer = 0;
- }
-
if (sheet->clip_timer)
{
gtk_timeout_remove (sheet->clip_timer);
@@ -3813,13 +3804,14 @@
}
gboolean
-gtk_sheet_get_pixel_info (GtkSheet * sheet,
+gtk_sheet_get_pixel_info (GtkSheet *sheet,
gint x,
gint y,
- gint * row,
- gint * column)
+ gint *row,
+ gint *column)
{
- gint trow, tcol;
+ gint trow = -1;
+ gint tcol = -1;
g_return_val_if_fail (sheet != NULL, 0);
g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
@@ -4837,7 +4829,7 @@
}
-static gint
+static gboolean
gtk_sheet_button_press (GtkWidget * widget,
GdkEventButton * event)
{
@@ -4936,7 +4928,11 @@
GDK_BUTTON_RELEASE_MASK,
NULL, NULL, event->time);
gtk_grab_add (GTK_WIDGET (sheet));
- sheet->timer = gtk_timeout_add (TIMEOUT_SCROLL, gtk_sheet_scroll, sheet);
+
+ /* This seems to be a kludge to work around a problem where the sheet
+ scrolls to another position. The timeout scrolls it back to its
+ original posn. JMD 3 July 2007
+ */
gtk_widget_grab_focus (GTK_WIDGET (sheet));
if (sheet->selection_mode != GTK_SELECTION_SINGLE &&
@@ -5007,11 +5003,11 @@
{
gtk_widget_get_pointer (widget, &x, &y);
column = COLUMN_FROM_XPIXEL (sheet, x);
+
if (xxx_column_is_sensitive (sheet, column))
{
gtk_sheet_click_cell (sheet, - 1, column, &veto);
gtk_grab_add (GTK_WIDGET (sheet));
- sheet->timer = gtk_timeout_add (TIMEOUT_SCROLL, gtk_sheet_scroll,
sheet);
gtk_widget_grab_focus (GTK_WIDGET (sheet));
GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
}
@@ -5025,7 +5021,6 @@
{
gtk_sheet_click_cell (sheet, row, - 1, &veto);
gtk_grab_add (GTK_WIDGET (sheet));
- sheet->timer = gtk_timeout_add (TIMEOUT_SCROLL, gtk_sheet_scroll,
sheet);
gtk_widget_grab_focus (GTK_WIDGET (sheet));
GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
}
@@ -5034,6 +5029,7 @@
return TRUE;
}
+#if 0
static gint
gtk_sheet_scroll (gpointer data)
{
@@ -5062,8 +5058,8 @@
GDK_THREADS_LEAVE ();
return TRUE;
-
}
+#endif
static void
gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column, gboolean *veto)
@@ -5268,8 +5264,6 @@
if (GTK_SHEET_IN_SELECTION)
gdk_pointer_ungrab (event->time);
- if (sheet->timer)
- gtk_timeout_remove (sheet->timer);
gtk_grab_remove (GTK_WIDGET (sheet));
GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
@@ -5545,7 +5539,7 @@
return TRUE;
}
-static gint
+static gboolean
gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column)
{
gint row_move, column_move;
Index: lib/gtksheet/gtksheet.h
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- lib/gtksheet/gtksheet.h 28 Jun 2007 02:38:32 -0000 1.8
+++ lib/gtksheet/gtksheet.h 3 Jul 2007 05:49:53 -0000 1.9
@@ -154,8 +154,6 @@
/* expanding selection */
GtkSheetCell selection_cell;
- /* timer for automatic scroll during selection */
- gint32 timer;
/* timer for flashing clipped range */
gint32 clip_timer;
gint interval;
@@ -441,7 +439,7 @@
* 1.0 being bottom or right; if row or column is negative then there
* is no change */
void
-gtk_sheet_moveto (GtkSheet * sheet,
+gtk_sheet_moveto (GtkSheet *sheet,
gint row,
gint column,
gfloat row_align,
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/ui/gui/ChangeLog 29 Jun 2007 05:14:32 -0000 1.61
+++ src/ui/gui/ChangeLog 3 Jul 2007 05:49:53 -0000 1.62
@@ -1,3 +1,8 @@
+2007-07-03 John Darrington <address@hidden>
+
+ * data-editor.c data-sheet.c: Turned off autoscrolling, and
+ manually move to cell on column click instead.
+
2007-06-29 John Darrington <address@hidden>
* data-editor.c data-editor.glade psppire-data-store.c
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/ui/gui/data-editor.c 29 Jun 2007 05:14:32 -0000 1.28
+++ src/ui/gui/data-editor.c 3 Jul 2007 05:49:53 -0000 1.29
@@ -433,20 +433,16 @@
G_CALLBACK (reference_manual),
e->window);
-
-
g_signal_connect (get_widget_assert (de->xml,"data_sheet"),
"double-click-column",
G_CALLBACK (click2column),
de);
-
g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
"double-click-row",
GTK_SIGNAL_FUNC (click2row),
de);
-
g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
"select-row",
GTK_SIGNAL_FUNC (enable_edit_clear),
@@ -542,6 +538,7 @@
click2row (GtkWidget *w, gint row, gpointer data)
{
struct data_editor *de = data;
+ GtkSheetRange visible_range;
gint current_row, current_column;
@@ -554,6 +551,14 @@
gtk_sheet_set_active_cell (GTK_SHEET (data_sheet), current_row, row);
+ gtk_sheet_get_visible_range (GTK_SHEET (data_sheet), &visible_range);
+
+ if ( row < visible_range.col0 || row > visible_range.coli)
+ {
+ gtk_sheet_moveto (GTK_SHEET (data_sheet),
+ current_row, row, 0, 0);
+ }
+
return FALSE;
}
Index: src/ui/gui/data-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-sheet.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/ui/gui/data-sheet.c 29 Jun 2007 00:52:03 -0000 1.21
+++ src/ui/gui/data-sheet.c 3 Jul 2007 05:49:53 -0000 1.22
@@ -137,6 +137,8 @@
gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_data_store));
+ gtk_sheet_set_autoscroll (GTK_SHEET (sheet), FALSE);
+
gtk_widget_show (sheet);
return sheet;
- [Pspp-cvs] pspp lib/gtksheet/ChangeLog lib/gtksheet/gtkshe...,
John Darrington <=