Cleaned up GUI, by objectifying the data editor. Removed a number of global variables.

[pspp-builds.git] / src / ui / gui / data-sheet.c

diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c
index 03cf1c4f73022af91bb36b21cec21fffee7de6b2..6cd26bce09b6e3c90572e68e6172cbb3480f6993 100644 (file)
--- a/src/ui/gui/data-sheet.c
+++ b/src/ui/gui/data-sheet.c
@@ -1,4 +1,4 @@
-/* 
+/*
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
 
@@ -15,7 +15,7 @@
    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. 
+   02110-1301, USA.
 */
 
 #include <config.h>
@@ -36,24 +36,27 @@
 #include <data/case.h>
 #include <data/data-in.h>
 
-#include "menu-actions.h"
 #include "data-sheet.h"
 
 
-
-extern GladeXML *xml;
-
-static gboolean 
-traverse_callback (GtkSheet * sheet, 
-                  gint row, gint col, 
+static gboolean
+traverse_callback (GtkSheet * sheet,
+                  gint row, gint col,
                   gint *new_row, gint *new_column
                   )
 {
   gint case_count;
-  PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet));
-  const gint n_vars = psppire_dict_get_var_cnt(data_store->dict);
+  gint n_vars;
+
+  PsppireDataStore *data_store =
+    PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet));
+
 
-  if ( *new_column >= n_vars ) 
+  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);
@@ -62,7 +65,7 @@ traverse_callback (GtkSheet * sheet,
     {
       gint i;
 
-      for ( i = case_count ; i <= *new_row; ++i ) 
+      for ( i = case_count ; i <= *new_row; ++i )
        psppire_data_store_insert_new_case (data_store, i);
 
       return TRUE;
@@ -73,28 +76,13 @@ traverse_callback (GtkSheet * sheet,
 
 
 
-/* Callback which occurs when the column title is double clicked */
-static gboolean
-click2column(GtkWidget *w, gint col, gpointer data)
-{
-  gint current_row, current_column;
-  GtkWidget *var_sheet  = get_widget_assert(xml, "variable_sheet");
-
-  select_sheet(PAGE_VAR_SHEET);
-
-  gtk_sheet_get_active_cell(GTK_SHEET(var_sheet), 
-                           &current_row, &current_column);
-
-  gtk_sheet_set_active_cell(GTK_SHEET(var_sheet), col, current_column);
-
-  return FALSE;
-}
-
-
 /* Update the data_ref_entry with the reference of the active cell */
-gint 
+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;
@@ -102,19 +90,20 @@ update_data_ref_entry(const GtkSheet *sheet, gint row, gint col)
   PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet));
   if (data_store)
     {
-      const struct variable *pv = 
+      const struct variable *pv =
        psppire_dict_get_variable(data_store->dict, col);
 
       gchar *text ;
       gchar *s ;
 
-      if ( !xml) 
+      if ( !data_editor_xml)
        return FALSE;
 
-      text = g_strdup_printf("%d: %s", row, 
+      text = g_strdup_printf("%d: %s", row,
                             pv ? var_get_name (pv) : "");
-  
-      cell_ref_entry = GTK_ENTRY(get_widget_assert(xml, "cell_ref_entry"));
+ 
+      cell_ref_entry = GTK_ENTRY(get_widget_assert (data_editor_xml,
+                                                  "cell_ref_entry"));
 
       s = pspp_locale_to_utf8(text, -1, 0);
 
@@ -128,11 +117,11 @@ update_data_ref_entry(const GtkSheet *sheet, gint row, gint col)
   return FALSE;
 }
 
-extern PsppireDataStore *data_store ;
+extern PsppireDataStore *the_data_store ;
 
 
 /* Return the width that an  'M' character would occupy when typeset in WIDGET */
-static guint 
+static guint
 calc_m_width(GtkWidget *widget, const PangoFontDescription *font_desc)
 {
   PangoRectangle rect;
@@ -145,7 +134,7 @@ calc_m_width(GtkWidget *widget, const PangoFontDescription *font_desc)
   g_assert (layout);
 
   pango_layout_set_text (layout, "M", 1);
-  
+ 
   pango_layout_set_font_description (layout, font_desc);
 
   pango_layout_get_extents (layout, NULL, &rect);
@@ -173,10 +162,10 @@ psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
 {
   GtkWidget *sheet;
 
-  sheet = gtk_sheet_new(G_SHEET_ROW(data_store), 
-                       G_SHEET_COLUMN(data_store), "data sheet", 0); 
+  sheet = gtk_sheet_new(G_SHEET_ROW(the_data_store),
+                       G_SHEET_COLUMN(the_data_store), "data sheet", 0);
 
-  data_store->width_of_m = calc_m_width(sheet, data_store->font_desc);
+  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),
@@ -186,14 +175,14 @@ psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
                    G_CALLBACK (traverse_callback), 0);
 
 
-  g_signal_connect (G_OBJECT (sheet), "double-click-column",
-                   G_CALLBACK (click2column),
-                   0);
-
-  g_signal_connect (G_OBJECT (data_store), "font-changed",
+  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_model(sheet, G_SHEET_MODEL(the_data_store));
+
   gtk_widget_show(sheet);
 
   return sheet;