[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: |
Fri, 08 Feb 2008 23:30:13 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/02/08 23:30:13
Modified files:
lib/gtksheet : ChangeLog gtksheet.c
src/ui/gui : ChangeLog data-editor.c data-sheet.c
psppire-data-store.c
Log message:
Removed the "feature" where rows are automatically appended
to the datasheet on focusing below the last row.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/ChangeLog?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-sheet.c?cvsroot=pspp&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.54&r2=1.55
Patches:
Index: lib/gtksheet/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- lib/gtksheet/ChangeLog 21 Sep 2007 01:53:58 -0000 1.19
+++ lib/gtksheet/ChangeLog 8 Feb 2008 23:30:12 -0000 1.20
@@ -1,3 +1,11 @@
+2008-02-08 John Darrington <address@hidden>
+
+ * gtksheet.c: Removed the sheet_locked feature, which we never
+ used, and interfered with the editability of the entry widget.
+
+ * gtksheet.c: Add one to the row to which we scroll. Seems like
+ the best way to cope with granularity problems.
+
21 Septempber 2007 John Darrington <address@hidden>
* gtksheet.c (range_update_callback): Scroll to cell 0,0 if the
Index: lib/gtksheet/gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- lib/gtksheet/gtksheet.c 3 Feb 2008 12:09:24 -0000 1.33
+++ lib/gtksheet/gtksheet.c 8 Feb 2008 23:30:12 -0000 1.34
@@ -1,5 +1,11 @@
-/* This version of GtkSheet has been *heavily* modified, for the specific
- requirements of PSPPIRE. */
+/*
+ * Copyright (C) 2006, 2008 Free Software Foundation
+ *
+ * This version of GtkSheet has been *heavily* modified, for the specific
+ * requirements of PSPPIRE. The changes are copyright by the
+ * Free Software Foundation. The copyright notice for the original work is
+ * below.
+*/
/* GtkSheet widget for Gtk+.
* Copyright (C) 1999-2001 Adrian E. Feiguin <address@hidden>
@@ -66,7 +72,6 @@
/* sheet flags */
enum
{
- GTK_SHEET_IS_LOCKED = 1 << 0,
GTK_SHEET_IS_FROZEN = 1 << 1,
GTK_SHEET_IN_XDRAG = 1 << 2,
GTK_SHEET_IN_YDRAG = 1 << 3,
@@ -80,9 +85,6 @@
#define GTK_SHEET_SET_FLAGS(sheet,flag) (GTK_SHEET_FLAGS (sheet) |= (flag))
#define GTK_SHEET_UNSET_FLAGS(sheet,flag) (GTK_SHEET_FLAGS (sheet) &= ~ (flag))
-#define GTK_SHEET_IS_LOCKED(sheet) (GTK_SHEET_FLAGS (sheet) &
GTK_SHEET_IS_LOCKED)
-
-
#define GTK_SHEET_IS_FROZEN(sheet) (GTK_SHEET_FLAGS (sheet) &
GTK_SHEET_IS_FROZEN)
#define GTK_SHEET_IN_XDRAG(sheet) (GTK_SHEET_FLAGS (sheet) &
GTK_SHEET_IN_XDRAG)
#define GTK_SHEET_IN_YDRAG(sheet) (GTK_SHEET_FLAGS (sheet) &
GTK_SHEET_IN_YDRAG)
@@ -1752,40 +1754,6 @@
return sheet->justify_entry;
}
-void
-gtk_sheet_set_locked (GtkSheet *sheet, gboolean locked)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- if ( locked )
- {
- GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IS_LOCKED);
- gtk_widget_hide (sheet->sheet_entry);
- gtk_widget_unmap (sheet->sheet_entry);
- }
- else
- {
- GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IS_LOCKED);
- if (GTK_WIDGET_MAPPED (GTK_WIDGET (sheet)))
- {
- gtk_widget_show (sheet->sheet_entry);
- gtk_widget_map (sheet->sheet_entry);
- }
- }
-
- gtk_editable_set_editable (GTK_EDITABLE (sheet->sheet_entry), locked);
-
-}
-
-gboolean
-gtk_sheet_locked (const GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
- return GTK_SHEET_IS_LOCKED (sheet);
-}
/* This routine has problems with gtk+- 1.2 related with the
label / button drawing - I think it's a bug in gtk+- 1.2 */
@@ -2080,21 +2048,22 @@
width = sheet->sheet_window_width;
/* adjust vertical scrollbar */
- if (row >= 0 && row_align >= 0.)
+ if (row >= 0 && row_align >= 0.0)
{
y = ROW_TOP_YPIXEL (sheet, row) - sheet->voffset
- - (gint) ( row_align*height + (1. - row_align)
+ - (gint) ( row_align * height + (1.0 - row_align)
* yyy_row_height (sheet, row));
/* This forces the sheet to scroll when you don't see the entire cell */
min_row = row;
adjust = 0;
- if (row_align == 1.)
+ if (row_align >= 1.0)
{
while (min_row >= 0 && min_row > MIN_VISIBLE_ROW (sheet))
{
if (yyy_row_is_visible (sheet, min_row))
adjust += yyy_row_height (sheet, min_row);
+
if (adjust >= height)
{
break;
@@ -2102,6 +2071,9 @@
min_row--;
}
min_row = MAX (min_row, 0);
+
+ min_row ++;
+
y = ROW_TOP_YPIXEL (sheet, min_row) - sheet->voffset +
yyy_row_height (sheet, min_row) - 1;
}
@@ -2118,17 +2090,16 @@
}
/* adjust horizontal scrollbar */
- if (column >= 0 && col_align >= 0.)
+ if (column >= 0 && col_align >= 0.0)
{
x = COLUMN_LEFT_XPIXEL (sheet, column) - sheet->hoffset
- - (gint) ( col_align*width + (1.- col_align)*
+ - (gint) ( col_align*width + (1.0 - col_align)*
xxx_column_width (sheet, column));
-
/* This forces the sheet to scroll when you don't see the entire cell */
min_col = column;
adjust = 0;
- if (col_align == 1.)
+ if (col_align == 1.0)
{
while (min_col >= 0 && min_col > MIN_VISIBLE_COLUMN (sheet))
{
@@ -2154,7 +2125,6 @@
sheet->old_vadjustment = -1.;
g_signal_emit_by_name (G_OBJECT (sheet->hadjustment),
"value_changed");
-
}
}
@@ -2822,7 +2792,6 @@
}
if (!GTK_WIDGET_MAPPED (sheet->sheet_entry)
- && ! gtk_sheet_locked (sheet)
&& sheet->active_cell.row >= 0
&& sheet->active_cell.col >= 0 )
{
@@ -3863,16 +3832,6 @@
gtk_sheet_get_attributes (sheet, row, col, &attributes);
justification = attributes.justification;
- if (text && strlen (text) != 0)
- {
- gtk_sheet_set_cell (sheet, row, col, justification, text);
- g_signal_emit (G_OBJECT (sheet), sheet_signals[SET_CELL], 0, row, col);
- }
- else
- {
- gtk_sheet_cell_clear (sheet, row, col);
- }
-
row = sheet->active_cell.row;
col = sheet->active_cell.col;
@@ -3905,7 +3864,8 @@
g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
if (row < 0 || col < 0) return FALSE;
- if (row >= yyy_row_count (sheet) || col >= xxx_column_count (sheet))
+
+ if ( row > yyy_row_count (sheet) || col > xxx_column_count (sheet))
return FALSE;
if (!veto) return FALSE;
@@ -3928,7 +3888,6 @@
gtk_sheet_show_active_cell (sheet);
-
g_signal_connect (G_OBJECT (gtk_sheet_get_entry (sheet)),
"changed",
G_CALLBACK (gtk_sheet_entry_changed),
@@ -3980,10 +3939,6 @@
gtk_entry_set_visibility (GTK_ENTRY (sheet_entry), attributes.is_visible);
- if (gtk_sheet_locked (sheet) || !attributes.is_editable)
- gtk_editable_set_editable (GTK_EDITABLE (sheet_entry), FALSE);
- else
- gtk_editable_set_editable (GTK_EDITABLE (sheet_entry), TRUE);
/*** Added by John Gotts. Mar 25, 2005 *********/
old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry));
@@ -4560,8 +4515,6 @@
if (range->col0 < 0 || range->coli < 0) return;
- if ( gtk_sheet_locked (sheet)) return ;
-
if (sheet->state != GTK_SHEET_NORMAL)
gtk_sheet_real_unselect_range (sheet, NULL);
else
@@ -4851,7 +4804,6 @@
else if (sheet->cursor_drag->type == GDK_TOP_LEFT_ARROW &&
!GTK_SHEET_IN_SELECTION (sheet)
&& ! GTK_SHEET_IN_DRAG (sheet)
- && ! gtk_sheet_locked (sheet)
&& sheet->active_cell.row >= 0
&& sheet->active_cell.col >= 0
)
@@ -4916,38 +4868,6 @@
return TRUE;
}
-#if 0
-static gint
-gtk_sheet_scroll (gpointer data)
-{
- GtkSheet *sheet;
- gint x, y, row, column;
- gint move;
-
- sheet = GTK_SHEET (data);
-
- GDK_THREADS_ENTER ();
-
- gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
- gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
-
- move = TRUE;
-
- if (GTK_SHEET_IN_SELECTION (sheet))
- gtk_sheet_extend_selection (sheet, row, column);
-
- if (GTK_SHEET_IN_DRAG (sheet) || GTK_SHEET_IN_RESIZE (sheet))
- {
- move = gtk_sheet_move_query (sheet, row, column);
- if (move) draw_xor_rectangle (sheet, sheet->drag_range);
- }
-
- GDK_THREADS_LEAVE ();
-
- return TRUE;
-}
-#endif
-
static void
gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column, gboolean *veto)
{
@@ -5618,7 +5538,7 @@
if (row >= MAX_VISIBLE_ROW (sheet) && sheet->state !=
GTK_SHEET_COLUMN_SELECTED)
{
row_align = 1.;
- new_row = MIN (yyy_row_count (sheet), row + 1);
+ new_row = MIN (yyy_row_count (sheet) - 1, row + 1);
row_move = TRUE;
if (MAX_VISIBLE_ROW (sheet) == yyy_row_count (sheet) - 1 &&
ROW_TOP_YPIXEL (sheet, yyy_row_count (sheet)- 1) +
@@ -5959,12 +5879,12 @@
break;
case GDK_Home:
row = 0;
- while (!yyy_row_is_visible (sheet, row) && row < yyy_row_count (sheet)-
1) row++;
+ while (!yyy_row_is_visible (sheet, row) && row < yyy_row_count (sheet) -
1) row++;
gtk_sheet_click_cell (sheet, row, sheet->active_cell.col, &veto);
extend_selection = FALSE;
break;
case GDK_End:
- row = yyy_row_count (sheet)- 1;
+ row = yyy_row_count (sheet) - 1;
while (!yyy_row_is_visible (sheet, row) && row > 0) row--;
gtk_sheet_click_cell (sheet, row, sheet->active_cell.col, &veto);
extend_selection = FALSE;
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- src/ui/gui/ChangeLog 8 Feb 2008 14:46:49 -0000 1.107
+++ src/ui/gui/ChangeLog 8 Feb 2008 23:30:13 -0000 1.108
@@ -8,6 +8,13 @@
2008-02-08 John Darrington <address@hidden>
+ * psppire-data-store.c: Remove feature which automatically inserts
+ cases at end of data.
+
+ * datasheet.c: Make rows after the last + 1, not editable.
+
+2008-02-08 John Darrington <address@hidden>
+
* sort-cases-dialog.c transpose-dialog.c: Added dialog_valid
predicates.
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/ui/gui/data-editor.c 8 Feb 2008 17:50:52 -0000 1.61
+++ src/ui/gui/data-editor.c 8 Feb 2008 23:30:13 -0000 1.62
@@ -1768,6 +1768,7 @@
static gint
update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer
data)
{
+ GtkEntry *datum_entry;
GladeXML *data_editor_xml = data;
PsppireDataStore *data_store =
@@ -1775,6 +1776,11 @@
g_return_val_if_fail (data_editor_xml, FALSE);
+
+ datum_entry =
+ GTK_ENTRY (get_widget_assert (data_editor_xml,
+ "datum_entry"));
+
if (data_store)
{
const struct variable *var =
@@ -1784,10 +1790,6 @@
GtkEntry *cell_ref_entry =
GTK_ENTRY (get_widget_assert (data_editor_xml,
"cell_ref_entry"));
- GtkEntry *datum_entry =
- GTK_ENTRY (get_widget_assert (data_editor_xml,
- "datum_entry"));
-
if ( var )
{
gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
@@ -1802,14 +1804,17 @@
g_free (s);
}
else
- gtk_entry_set_text (cell_ref_entry, "");
-
+ goto blank_entry;
if ( var )
{
gchar *text =
psppire_data_store_get_string (data_store, row,
var_get_dict_index(var));
+
+ if ( ! text )
+ goto blank_entry;
+
g_strchug (text);
gtk_entry_set_text (datum_entry, text);
@@ -1817,10 +1822,16 @@
free (text);
}
else
- gtk_entry_set_text (datum_entry, "");
+ goto blank_entry;
+
}
return FALSE;
+
+ blank_entry:
+ gtk_entry_set_text (datum_entry, "");
+
+ return FALSE;
}
Index: src/ui/gui/data-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-sheet.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/ui/gui/data-sheet.c 25 Oct 2007 11:24:29 -0000 1.24
+++ src/ui/gui/data-sheet.c 8 Feb 2008 23:30:13 -0000 1.25
@@ -36,36 +36,27 @@
static gboolean
-traverse_callback (GtkSheet * sheet,
+traverse_callback (GtkSheet *sheet,
gint row, gint col,
gint *new_row, gint *new_column
)
{
- gint case_count;
- gint n_vars;
+ gint n_vars, n_cases;
+ GtkWidget *entry = gtk_sheet_get_entry (sheet);
PsppireDataStore *data_store =
PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
-
g_assert (data_store);
n_vars = psppire_dict_get_var_cnt (data_store->dict);
- if ( *new_column >= n_vars )
- return FALSE;
-
- case_count = psppire_case_file_get_case_count (data_store->case_file);
+ n_cases = psppire_data_store_get_case_count (data_store);
- if ( *new_row >= case_count )
- {
- gint i;
+ g_object_set (entry, "editable", (*new_row < n_cases + 1), NULL);
- for ( i = case_count ; i <= *new_row; ++i )
- psppire_data_store_insert_new_case (data_store, i);
-
- return TRUE;
- }
+ if ( *new_column >= n_vars )
+ return FALSE;
return TRUE;
}
Index: src/ui/gui/psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/ui/gui/psppire-data-store.c 3 Feb 2008 12:09:25 -0000 1.54
+++ src/ui/gui/psppire-data-store.c 8 Feb 2008 23:30:13 -0000 1.55
@@ -676,23 +676,17 @@
psppire_data_store_set_string (PsppireDataStore *store,
const gchar *text, glong row, glong col)
{
+ glong n_cases;
const struct variable *pv = psppire_dict_get_variable (store->dict, col);
g_return_val_if_fail (pv, FALSE);
-#if 0
- /* Allow the user to insert a lot of blank cases, simply by skipping rows */
- for (r = psppire_case_file_get_case_count (store->case_file); r <= row ; ++r)
- {
-
- gint c;
+ n_cases = psppire_data_store_get_case_count (store);
- psppire_case_array_insert_case (store->cases, r, 0, 0);
+ if ( row > n_cases)
+ return FALSE;
-
- for (c = 0 ; c < psppire_dict_get_var_cnt (store->dict); ++c )
- psppire_data_store_clear_datum (model, r, c);
- }
-#endif
+ if (row == n_cases)
+ psppire_data_store_insert_new_case (store, row);
psppire_case_file_data_in (store->case_file, row,
var_get_case_index (pv), ss_cstr (text),
- [Pspp-cvs] pspp lib/gtksheet/ChangeLog lib/gtksheet/gtkshe...,
John Darrington <=