X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-sheet.c;h=2a211ac7442271ab067bdd1a305162f89e208dd5;hb=e598cda225c4f98025ec43b72eb1a9dd691b77cd;hp=9a3c0c520062c0f5cfb941384133a748870d12d7;hpb=e10bd21c92f8d6a82ed06bec7af9ee40bf5eb727;p=pspp-builds.git

diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c
index 9a3c0c52..2a211ac7 100644
--- a/src/ui/gui/data-sheet.c
+++ b/src/ui/gui/data-sheet.c
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,10 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <gtk/gtk.h>
@@ -40,83 +36,31 @@
 
 
 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));
-
+    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;
 }
 
-
-
-/* Update the data_ref_entry with the reference of the active cell */
-gint
-update_data_ref_entry (const GtkSheet *sheet, gint row, gint col)
-{
-
-  GladeXML *data_editor_xml = NULL; /* FIXME !!!! */
-
-
-  /* The entry where the reference to the current cell is displayed */
-  GtkEntry *cell_ref_entry;
-
-  PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model (sheet));
-  if (data_store)
-    {
-      const struct variable *pv =
-	psppire_dict_get_variable (data_store->dict, col);
-
-      gchar *text ;
-      gchar *s ;
-
-      if ( !data_editor_xml)
-	return FALSE;
-
-      text = g_strdup_printf ("%d: %s", row,
-			     pv ? var_get_name (pv) : "");
-
-      cell_ref_entry = GTK_ENTRY(get_widget_assert (data_editor_xml,
-						   "cell_ref_entry"));
-
-      s = pspp_locale_to_utf8 (text, -1, 0);
-
-      g_free (text);
-
-      gtk_entry_set_text (cell_ref_entry, s);
-
-      g_free (s);
-    }
-
-  return FALSE;
-}
-
 extern PsppireDataStore *the_data_store ;
 
 
@@ -139,10 +83,10 @@ calc_m_width (GtkWidget *widget, const PangoFontDescription *font_desc)
 
   pango_layout_get_extents (layout, NULL, &rect);
 
-  g_object_unref (G_OBJECT(layout));
-  g_object_unref (G_OBJECT(context));
+  g_object_unref (G_OBJECT (layout));
+  g_object_unref (G_OBJECT (context));
 
-  return PANGO_PIXELS(rect.width);
+  return PANGO_PIXELS (rect.width);
 }
 
 
@@ -151,26 +95,24 @@ void
 font_change_callback (GObject *obj, gpointer data)
 {
   GtkWidget *sheet  = data;
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE(obj);
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE (obj);
 
   ds->width_of_m = calc_m_width (sheet, ds->font_desc);
 }
 
-GtkWidget*
+
+
+G_MODULE_EXPORT GtkWidget*
 psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
 			   gint int1, gint int2)
 {
   GtkWidget *sheet;
 
-  sheet = gtk_sheet_new (G_SHEET_ROW(the_data_store),
-			G_SHEET_COLUMN(the_data_store), "data sheet", 0);
+  sheet = gtk_sheet_new (G_SHEET_ROW (the_data_store),
+			G_SHEET_COLUMN (the_data_store), "data sheet", 0);
 
   the_data_store->width_of_m = calc_m_width (sheet, the_data_store->font_desc);
 
-  g_signal_connect (G_OBJECT (sheet), "activate",
-		    G_CALLBACK (update_data_ref_entry),
-		    0);
-
   g_signal_connect (G_OBJECT (sheet), "traverse",
 		    G_CALLBACK (traverse_callback), 0);
 
@@ -178,10 +120,11 @@ psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
   g_signal_connect (G_OBJECT (the_data_store), "font-changed",
 		    G_CALLBACK (font_change_callback), sheet);
 
-  gtk_sheet_set_active_cell (GTK_SHEET(sheet), -1, -1);
+  gtk_sheet_set_active_cell (GTK_SHEET (sheet), -1, -1);
 
+  gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_data_store));
 
-  gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL(the_data_store));
+  gtk_sheet_set_autoscroll (GTK_SHEET (sheet), TRUE);
 
   gtk_widget_show (sheet);