Added a BACKEND_CHANGED signal on PsppireDict, and handled it accordingly.

[pspp-builds.git] / src / ui / gui / psppire-var-store.c

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index f591277b40de8aa4e0a72013734a66bd456d3ba7..f9b2d081fbb21c897fdc3bac2afb60ab097cce41 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -1,11 +1,9 @@
-/* psppire-var-store.c
-
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.

    Copyright (C) 2006  Free Software Foundation
 
    Copyright (C) 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
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 <string.h>
 
 #include <config.h>
 #include <string.h>


@@ -43,6 +39,7 @@
 #include "missing-val-dialog.h"
 #include <data/value-labels.h>
 
 #include "missing-val-dialog.h"
 #include <data/value-labels.h>
 

+#include "var-display.h"

 
 #define TRAILING_ROWS 40
 
 
 #define TRAILING_ROWS 40
 


@@ -51,17 +48,22 @@ static void         psppire_var_store_class_init      (PsppireVarStoreClass *cla
 static void         psppire_var_store_sheet_model_init (GSheetModelIface *iface);
 static void         psppire_var_store_finalize        (GObject           *object);
 
 static void         psppire_var_store_sheet_model_init (GSheetModelIface *iface);
 static void         psppire_var_store_finalize        (GObject           *object);
 

-static gchar *psppire_var_store_get_string(const GSheetModel *sheet_model, gint row, gint column);

 
 

-static gboolean  psppire_var_store_clear(GSheetModel *model,  gint row, gint col);
+gchar * missing_values_to_string (const struct variable *pv, GError **err);
+
+
+static gchar *psppire_var_store_get_string (const GSheetModel *sheet_model, glong row, glong column);
+
+static gboolean  psppire_var_store_clear (GSheetModel *model,  glong row, glong col);

 
 
 
 

-static gboolean psppire_var_store_set_string(GSheetModel *model,
-                                         const gchar *text, gint row, gint column);
+static gboolean psppire_var_store_set_string (GSheetModel *model,
+                                         const gchar *text, glong row, glong column);

 
 

-static gint psppire_var_store_get_row_count(const GSheetModel * model);
+static glong psppire_var_store_get_row_count (const GSheetModel * model);
+static glong psppire_var_store_get_column_count (const GSheetModel * model);

 
 

-static gchar *text_for_column(const struct variable *pv, gint c, GError **err);
+static gchar *text_for_column (const struct variable *pv, gint c, GError **err);

 
 
 static void psppire_var_store_sheet_row_init (GSheetRowIface *iface);
 
 
 static void psppire_var_store_sheet_row_init (GSheetRowIface *iface);


@@ -135,9 +137,9 @@ psppire_var_store_class_init (PsppireVarStoreClass *class)
 static void
 psppire_var_store_init (PsppireVarStore *var_store)
 {
 static void
 psppire_var_store_init (PsppireVarStore *var_store)
 {

-  GdkColormap *colormap = gdk_colormap_get_system();
+  GdkColormap *colormap = gdk_colormap_get_system ();

 
 

-  g_assert(gdk_color_parse("gray", &var_store->disabled));
+  g_assert (gdk_color_parse ("gray", &var_store->disabled));

 
   gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE);
 
 
   gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE);
 


@@ -145,7 +147,7 @@ psppire_var_store_init (PsppireVarStore *var_store)
 }
 
 static gboolean
 }
 
 static gboolean

-psppire_var_store_item_editable(PsppireVarStore *var_store, gint row, gint column)
+psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong column)

 {
   const struct fmt_spec *write_spec ;
 
 {
   const struct fmt_spec *write_spec ;
 


@@ -154,10 +156,10 @@ psppire_var_store_item_editable(PsppireVarStore *var_store, gint row, gint colum
   if ( !pv )
     return TRUE;
 
   if ( !pv )
     return TRUE;
 

-  if ( VAR_STRING == var_get_type (pv) && column == COL_DECIMALS )
+  if ( var_is_alpha (pv) && column == COL_DECIMALS )

     return FALSE;
 
     return FALSE;
 

-  write_spec =var_get_write_format (pv);
+  write_spec = var_get_print_format (pv);

 
   switch ( write_spec->type )
     {
 
   switch ( write_spec->type )
     {


@@ -186,25 +188,25 @@ psppire_var_store_item_editable(PsppireVarStore *var_store, gint row, gint colum
 
 
 struct variable *
 
 
 struct variable *

-psppire_var_store_get_var (PsppireVarStore *store, gint row)
+psppire_var_store_get_var (PsppireVarStore *store, glong row)

 {
   return psppire_dict_get_variable (store->dict, row);
 }
 
 static gboolean
 {
   return psppire_dict_get_variable (store->dict, row);
 }
 
 static gboolean

-psppire_var_store_is_editable(const GSheetModel *model, gint row, gint column)
+psppire_var_store_is_editable (const GSheetModel *model, glong row, glong column)

 {
 {

-  PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
-  return psppire_var_store_item_editable(store, row, column);
+  PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
+  return psppire_var_store_item_editable (store, row, column);

 }
 
 
 static const GdkColor *
 }
 
 
 static const GdkColor *

-psppire_var_store_get_foreground(const GSheetModel *model, gint row, gint column)
+psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column)

 {
 {

-  PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+  PsppireVarStore *store = PSPPIRE_VAR_STORE (model);

 
 

-  if ( ! psppire_var_store_item_editable(store, row, column) )
+  if ( ! psppire_var_store_item_editable (store, row, column) )

     return &store->disabled;
 
   return NULL;
     return &store->disabled;
 
   return NULL;


@@ -212,20 +214,22 @@ psppire_var_store_get_foreground(const GSheetModel *model, gint row, gint column
 
 
 const PangoFontDescription *
 
 
 const PangoFontDescription *

-psppire_var_store_get_font_desc(const GSheetModel *model,
-                             gint row, gint column)
+psppire_var_store_get_font_desc (const GSheetModel *model,
+                             glong row, glong column)

 {
 {

-  PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+  PsppireVarStore *store = PSPPIRE_VAR_STORE (model);

 
   return store->font_desc;
 }
 
 
 
 
   return store->font_desc;
 }
 
 
 

+

 static void
 psppire_var_store_sheet_model_init (GSheetModelIface *iface)
 {
   iface->get_row_count = psppire_var_store_get_row_count;
 static void
 psppire_var_store_sheet_model_init (GSheetModelIface *iface)
 {
   iface->get_row_count = psppire_var_store_get_row_count;

+  iface->get_column_count = psppire_var_store_get_column_count;

   iface->free_strings = TRUE;
   iface->get_string = psppire_var_store_get_string;
   iface->set_string = psppire_var_store_set_string;
   iface->free_strings = TRUE;
   iface->get_string = psppire_var_store_get_string;
   iface->set_string = psppire_var_store_set_string;


@@ -254,39 +258,46 @@ psppire_var_store_new (PsppireDict *dict)
 
   retval = g_object_new (GTK_TYPE_VAR_STORE, NULL);
 
 
   retval = g_object_new (GTK_TYPE_VAR_STORE, NULL);
 

-  psppire_var_store_set_dictionary(retval, dict);
+  psppire_var_store_set_dictionary (retval, dict);

 
   return retval;
 }
 
 static void
 
   return retval;
 }
 
 static void

-var_change_callback(GtkWidget *w, gint n, gpointer data)
+var_change_callback (GtkWidget *w, gint n, gpointer data)

 {
 {

-  GSheetModel *model = G_SHEET_MODEL(data);
+  GSheetModel *model = G_SHEET_MODEL (data);
+

   g_sheet_model_range_changed (model,
                                 n, 0, n, n_COLS);
 }
 
 
 static void
   g_sheet_model_range_changed (model,
                                 n, 0, n, n_COLS);
 }
 
 
 static void

-var_delete_callback(GtkWidget *w, gint first, gint n, gpointer data)
+var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, gpointer data)

 {
 {

-  GSheetModel *model = G_SHEET_MODEL(data);
+  GSheetModel *model = G_SHEET_MODEL (data);

 
 

-  g_sheet_model_rows_deleted (model, first, n);
+  g_sheet_model_rows_deleted (model, dict_idx, 1);

 }
 
 
 
 static void
 }
 
 
 
 static void

-var_insert_callback(GtkWidget *w, gint row, gpointer data)
+var_insert_callback (GtkWidget *w, glong row, gpointer data)

 {
 {

-  GSheetModel *model = G_SHEET_MODEL(data);
+  GSheetModel *model = G_SHEET_MODEL (data);

 
   g_sheet_model_rows_inserted (model, row, 1);
 }
 
 
   g_sheet_model_rows_inserted (model, row, 1);
 }
 

+static void
+refresh (PsppireDict  *d, gpointer data)
+{
+  PsppireVarStore *vs = data;

 
 

+  g_sheet_model_range_changed (G_SHEET_MODEL (vs), -1, -1, -1, -1);
+}

 
 /**
  * psppire_var_store_replace_set_dictionary:
 
 /**
  * psppire_var_store_replace_set_dictionary:


@@ -297,24 +308,26 @@ var_insert_callback(GtkWidget *w, gint row, gpointer data)
  * destroyed.
  **/
 void
  * destroyed.
  **/
 void

-psppire_var_store_set_dictionary(PsppireVarStore *var_store, PsppireDict *dict)
+psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict)

 {
 {

-  if ( var_store->dict ) g_object_unref(var_store->dict);
+  if ( var_store->dict ) g_object_unref (var_store->dict);

 
   var_store->dict = dict;
 
 
   var_store->dict = dict;
 

-  g_signal_connect(dict, "variable-changed", G_CALLBACK(var_change_callback),
+  g_signal_connect (dict, "variable-changed", G_CALLBACK (var_change_callback),

                   var_store);
 
                   var_store);
 

-  g_signal_connect(dict, "variables-deleted", G_CALLBACK(var_delete_callback),
+  g_signal_connect (dict, "variable-deleted", G_CALLBACK (var_delete_callback),

                   var_store);
 
                   var_store);
 

-  g_signal_connect(dict, "variable-inserted", G_CALLBACK(var_insert_callback),
-                  var_store);
+  g_signal_connect (dict, "variable-inserted",
+                   G_CALLBACK (var_insert_callback), var_store);

 
 

+  g_signal_connect (dict, "backend-changed", G_CALLBACK (refresh),
+                   var_store);

 
   /* The entire model has changed */
 
   /* The entire model has changed */

-  g_sheet_model_range_changed (G_SHEET_MODEL(var_store), -1, -1, -1, -1);
+  g_sheet_model_range_changed (G_SHEET_MODEL (var_store), -1, -1, -1, -1);

 }
 
 static void
 }
 
 static void


@@ -325,13 +338,13 @@ psppire_var_store_finalize (GObject *object)
 }
 
 static gchar *
 }
 
 static gchar *

-psppire_var_store_get_string(const GSheetModel *model, gint row, gint column)
+psppire_var_store_get_string (const GSheetModel *model, glong row, glong column)

 {
 {

-  PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+  PsppireVarStore *store = PSPPIRE_VAR_STORE (model);

 
   struct variable *pv;
 
 
   struct variable *pv;
 

-  if ( row >= psppire_dict_get_var_cnt(store->dict))
+  if ( row >= psppire_dict_get_var_cnt (store->dict))

     return 0;
 
   pv = psppire_dict_get_variable (store->dict, row);
     return 0;
 
   pv = psppire_dict_get_variable (store->dict, row);


@@ -345,11 +358,11 @@ psppire_var_store_get_string(const GSheetModel *model, gint row, gint column)
    Returns true if anything was updated, false otherwise.
 */
 static gboolean
    Returns true if anything was updated, false otherwise.
 */
 static gboolean

-psppire_var_store_clear(GSheetModel *model,  gint row, gint col)
+psppire_var_store_clear (GSheetModel *model,  glong row, glong col)

 {
   struct variable *pv ;
 
 {
   struct variable *pv ;
 

-  PsppireVarStore *var_store = PSPPIRE_VAR_STORE(model);
+  PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model);

 
   if ( row >= psppire_dict_get_var_cnt (var_store->dict))
       return FALSE;
 
   if ( row >= psppire_dict_get_var_cnt (var_store->dict))
       return FALSE;


@@ -375,14 +388,14 @@ psppire_var_store_clear(GSheetModel *model,  gint row, gint col)
    Returns true if anything was updated, false otherwise.
 */
 static gboolean
    Returns true if anything was updated, false otherwise.
 */
 static gboolean

-psppire_var_store_set_string(GSheetModel *model,
-                         const gchar *text, gint row, gint col)
+psppire_var_store_set_string (GSheetModel *model,
+                         const gchar *text, glong row, glong col)

 {
   struct variable *pv ;
 
 {
   struct variable *pv ;
 

-  PsppireVarStore *var_store = PSPPIRE_VAR_STORE(model);
+  PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model);

 
 

-  if ( row >= psppire_dict_get_var_cnt(var_store->dict))
+  if ( row >= psppire_dict_get_var_cnt (var_store->dict))

       return FALSE;
 
   pv = psppire_var_store_get_var (var_store, row);
       return FALSE;
 
   pv = psppire_var_store_get_var (var_store, row);


@@ -393,12 +406,11 @@ psppire_var_store_set_string(GSheetModel *model,
   switch (col)
     {
     case COL_NAME:
   switch (col)
     {
     case COL_NAME:

-      psppire_dict_rename_var (var_store->dict, pv, text);
-      return TRUE;
+      return psppire_dict_rename_var (var_store->dict, pv, text);

       break;
     case COL_COLUMNS:
       if ( ! text) return FALSE;
       break;
     case COL_COLUMNS:
       if ( ! text) return FALSE;

-      var_set_display_width (pv, atoi(text));
+      var_set_display_width (pv, atoi (text));

       return TRUE;
       break;
     case COL_WIDTH:
       return TRUE;
       break;
     case COL_WIDTH:


@@ -444,7 +456,7 @@ psppire_var_store_set_string(GSheetModel *model,
       }
       break;
     case COL_LABEL:
       }
       break;
     case COL_LABEL:

-      var_set_label(pv, text);
+      var_set_label (pv, text);

       return TRUE;
       break;
     case COL_TYPE:
       return TRUE;
       break;
     case COL_TYPE:


@@ -456,7 +468,7 @@ psppire_var_store_set_string(GSheetModel *model,
       return FALSE;
       break;
     default:
       return FALSE;
       break;
     default:

-      g_assert_not_reached();
+      g_assert_not_reached ();

       return FALSE;
     }
 
       return FALSE;
     }
 


@@ -464,11 +476,11 @@ psppire_var_store_set_string(GSheetModel *model,
 }
 
 
 }
 
 

+const static gchar none[] = N_("None");
+

 static  gchar *
 static  gchar *

-text_for_column(const struct variable *pv, gint c, GError **err)
+text_for_column (const struct variable *pv, gint c, GError **err)

 {
 {

-  static gchar none[] = N_("None");
-

   static const gchar *const type_label[] =
     {
       N_("Numeric"),
   static const gchar *const type_label[] =
     {
       N_("Numeric"),


@@ -495,16 +507,16 @@ text_for_column(const struct variable *pv, gint c, GError **err)
        switch ( write_spec->type )
          {
          case FMT_F:
        switch ( write_spec->type )
          {
          case FMT_F:

-           return g_locale_to_utf8(gettext(type_label[VT_NUMERIC]), -1, 0, 0, err);
+           return g_locale_to_utf8 (gettext (type_label[VT_NUMERIC]), -1, 0, 0, err);

            break;
          case FMT_COMMA:
            break;
          case FMT_COMMA:

-           return g_locale_to_utf8(gettext(type_label[VT_COMMA]), -1, 0, 0, err);
+           return g_locale_to_utf8 (gettext (type_label[VT_COMMA]), -1, 0, 0, err);

            break;
          case FMT_DOT:
            break;
          case FMT_DOT:

-           return g_locale_to_utf8(gettext(type_label[VT_DOT]), -1, 0, 0, err);
+           return g_locale_to_utf8 (gettext (type_label[VT_DOT]), -1, 0, 0, err);

            break;
          case FMT_E:
            break;
          case FMT_E:

-           return g_locale_to_utf8(gettext(type_label[VT_SCIENTIFIC]), -1, 0, 0, err);
+           return g_locale_to_utf8 (gettext (type_label[VT_SCIENTIFIC]), -1, 0, 0, err);

            break;
          case FMT_DATE:
          case FMT_EDATE:
            break;
          case FMT_DATE:
          case FMT_EDATE:


@@ -519,26 +531,26 @@ text_for_column(const struct variable *pv, gint c, GError **err)
          case FMT_DTIME:
          case FMT_WKDAY:
          case FMT_MONTH:
          case FMT_DTIME:
          case FMT_WKDAY:
          case FMT_MONTH:

-           return g_locale_to_utf8(type_label[VT_DATE], -1, 0, 0, err);
+           return g_locale_to_utf8 (type_label[VT_DATE], -1, 0, 0, err);

            break;
          case FMT_DOLLAR:
            break;
          case FMT_DOLLAR:

-           return g_locale_to_utf8(type_label[VT_DOLLAR], -1, 0, 0, err);
+           return g_locale_to_utf8 (type_label[VT_DOLLAR], -1, 0, 0, err);

            break;
          case FMT_CCA:
          case FMT_CCB:
          case FMT_CCC:
          case FMT_CCD:
          case FMT_CCE:
            break;
          case FMT_CCA:
          case FMT_CCB:
          case FMT_CCC:
          case FMT_CCD:
          case FMT_CCE:

-           return g_locale_to_utf8(gettext(type_label[VT_CUSTOM]), -1, 0, 0, err);
+           return g_locale_to_utf8 (gettext (type_label[VT_CUSTOM]), -1, 0, 0, err);

            break;
          case FMT_A:
            break;
          case FMT_A:

-           return g_locale_to_utf8(gettext(type_label[VT_STRING]), -1, 0, 0, err);
+           return g_locale_to_utf8 (gettext (type_label[VT_STRING]), -1, 0, 0, err);

            break;
          default:
             {
               char str[FMT_STRING_LEN_MAX + 1];
            break;
          default:
             {
               char str[FMT_STRING_LEN_MAX + 1];

-              g_warning("Unknown format: \"%s\"\n",
-                        fmt_to_string(write_spec, str));
+              g_warning ("Unknown format: \"%s\"\n",
+                        fmt_to_string (write_spec, str));

             }
            break;
          }
             }
            break;
          }


@@ -547,30 +559,30 @@ text_for_column(const struct variable *pv, gint c, GError **err)
     case COL_WIDTH:
       {
        gchar *s;
     case COL_WIDTH:
       {
        gchar *s;

-       GString *gstr = g_string_sized_new(10);
-       g_string_printf(gstr, _("%d"), write_spec->w);
-       s = g_locale_to_utf8(gstr->str, gstr->len, 0, 0, err);
-       g_string_free(gstr, TRUE);
+       GString *gstr = g_string_sized_new (10);
+       g_string_printf (gstr, _("%d"), write_spec->w);
+       s = g_locale_to_utf8 (gstr->str, gstr->len, 0, 0, err);
+       g_string_free (gstr, TRUE);

        return s;
       }
       break;
     case COL_DECIMALS:
       {
        gchar *s;
        return s;
       }
       break;
     case COL_DECIMALS:
       {
        gchar *s;

-       GString *gstr = g_string_sized_new(10);
-       g_string_printf(gstr, _("%d"), write_spec->d);
-       s = g_locale_to_utf8(gstr->str, gstr->len, 0, 0, err);
-       g_string_free(gstr, TRUE);
+       GString *gstr = g_string_sized_new (10);
+       g_string_printf (gstr, _("%d"), write_spec->d);
+       s = g_locale_to_utf8 (gstr->str, gstr->len, 0, 0, err);
+       g_string_free (gstr, TRUE);

        return s;
       }
       break;
     case COL_COLUMNS:
       {
        gchar *s;
        return s;
       }
       break;
     case COL_COLUMNS:
       {
        gchar *s;

-       GString *gstr = g_string_sized_new(10);
-       g_string_printf(gstr, _("%d"), var_get_display_width (pv));
-       s = g_locale_to_utf8(gstr->str, gstr->len, 0, 0, err);
-       g_string_free(gstr, TRUE);
+       GString *gstr = g_string_sized_new (10);
+       g_string_printf (gstr, _("%d"), var_get_display_width (pv));
+       s = g_locale_to_utf8 (gstr->str, gstr->len, 0, 0, err);
+       g_string_free (gstr, TRUE);

        return s;
       }
       break;
        return s;
       }
       break;


@@ -580,63 +592,7 @@ text_for_column(const struct variable *pv, gint c, GError **err)
 
     case COL_MISSING:
       {
 
     case COL_MISSING:
       {

-       gchar *s;
-       const struct missing_values *miss = var_get_missing_values (pv);
-       if ( mv_is_empty(miss))
-         return g_locale_to_utf8(gettext(none), -1, 0, 0, err);
-       else
-         {
-           if ( ! mv_has_range (miss))
-             {
-               GString *gstr = g_string_sized_new(10);
-               const int n = mv_n_values(miss);
-               gchar *mv[4] = {0,0,0,0};
-               gint i;
-               for(i = 0 ; i < n; ++i )
-                 {
-                   union value v;
-                   mv_peek_value(miss, &v, i);
-                   mv[i] = value_to_text(v, *write_spec);
-                   if ( i > 0 )
-                     g_string_append(gstr, ", ");
-                   g_string_append(gstr, mv[i]);
-                   g_free(mv[i]);
-                 }
-               s = pspp_locale_to_utf8(gstr->str, gstr->len, err);
-               g_string_free(gstr, TRUE);
-             }
-           else
-             {
-               GString *gstr = g_string_sized_new(10);
-               gchar *l, *h;
-               union value low, high;
-               mv_peek_range(miss, &low.f, &high.f);
-
-               l = value_to_text(low, *write_spec);
-               h = value_to_text(high, *write_spec);
-
-               g_string_printf(gstr, "%s - %s", l, h);
-               g_free(l);
-               g_free(h);
-
-               if ( mv_has_value(miss))
-                 {
-                   gchar *ss = 0;
-                   union value v;
-                   mv_peek_value(miss, &v, 0);
-
-                   ss = value_to_text(v, *write_spec);
-
-                   g_string_append(gstr, ", ");
-                   g_string_append(gstr, ss);
-                   free(ss);
-                 }
-               s = pspp_locale_to_utf8(gstr->str, gstr->len, err);
-               g_string_free(gstr, TRUE);
-             }
-
-           return s;
-         }
+       return missing_values_to_string (pv, err);

       }
       break;
     case COL_VALUES:
       }
       break;
     case COL_VALUES:


@@ -670,19 +626,15 @@ text_for_column(const struct variable *pv, gint c, GError **err)
       break;
     case COL_ALIGN:
       {
       break;
     case COL_ALIGN:
       {

-       const gint align = var_get_alignment(pv);
+       const gint align = var_get_alignment (pv);

 
        g_assert (align < n_ALIGNMENTS);
 
        g_assert (align < n_ALIGNMENTS);

-       return g_locale_to_utf8(gettext(alignments[align]), -1, 0, 0, err);
+       return g_locale_to_utf8 (gettext (alignments[align]), -1, 0, 0, err);

       }
       break;
     case COL_MEASURE:
       {
       }
       break;
     case COL_MEASURE:
       {

-       const gint measure = var_get_measure (pv);
-
-       g_assert (measure < n_MEASURES);
-       return g_locale_to_utf8 (gettext (measures[measure]),
-                                -1, 0, 0, err);
+       return measure_to_string (pv, err);

       }
       break;
     }
       }
       break;
     }


@@ -693,85 +645,91 @@ text_for_column(const struct variable *pv, gint c, GError **err)
 
 /* Return the number of variables */
 gint
 
 /* Return the number of variables */
 gint

-psppire_var_store_get_var_cnt(PsppireVarStore  *store)
+psppire_var_store_get_var_cnt (PsppireVarStore  *store)

 {
 {

-  return psppire_dict_get_var_cnt(store->dict);
+  return psppire_dict_get_var_cnt (store->dict);

 }
 
 
 void
 }
 
 
 void

-psppire_var_store_set_font(PsppireVarStore *store, const PangoFontDescription *fd)
+psppire_var_store_set_font (PsppireVarStore *store, const PangoFontDescription *fd)

 {
   g_return_if_fail (store);
   g_return_if_fail (PSPPIRE_IS_VAR_STORE (store));
 
   store->font_desc = fd;
 
 {
   g_return_if_fail (store);
   g_return_if_fail (PSPPIRE_IS_VAR_STORE (store));
 
   store->font_desc = fd;
 

-  g_sheet_model_range_changed (G_SHEET_MODEL(store), -1, -1, -1, -1);
+  g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1);

 }
 
 
 }
 
 

-static gint
-psppire_var_store_get_row_count(const GSheetModel * model)
+static glong
+psppire_var_store_get_row_count (const GSheetModel * model)

 {
   gint rows = 0;
 {
   gint rows = 0;

-  PsppireVarStore *vs = PSPPIRE_VAR_STORE(model);
+  PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);

 
   if (vs->dict)
 
   if (vs->dict)

-    rows =  psppire_dict_get_var_cnt(vs->dict);
+    rows =  psppire_dict_get_var_cnt (vs->dict);

 
   return rows ;
 }
 
 
   return rows ;
 }
 

+static glong
+psppire_var_store_get_column_count (const GSheetModel * model)
+{
+  return n_COLS ;
+}
+
+

 /* Row related funcs */
 
 /* Row related funcs */
 

-static gint
-geometry_get_row_count(const GSheetRow *geom, gpointer data)
+static glong
+geometry_get_row_count (const GSheetRow *geom, gpointer data)

 {
   gint rows = 0;
 {
   gint rows = 0;

-  PsppireVarStore *vs = PSPPIRE_VAR_STORE(geom);
+  PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);

 
   if (vs->dict)
 
   if (vs->dict)

-    rows =  psppire_dict_get_var_cnt(vs->dict);
+    rows =  psppire_dict_get_var_cnt (vs->dict);

 
   return rows + TRAILING_ROWS;
 }
 
 
 static gint
 
   return rows + TRAILING_ROWS;
 }
 
 
 static gint

-geometry_get_height(const GSheetRow *geom, gint row, gpointer data)
+geometry_get_height (const GSheetRow *geom, glong row, gpointer data)

 {
   return 25;
 }
 
 
 static gboolean
 {
   return 25;
 }
 
 
 static gboolean

-geometry_is_sensitive(const GSheetRow *geom, gint row, gpointer data)
+geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data)

 {
 {

-  PsppireVarStore *vs = PSPPIRE_VAR_STORE(geom);
+  PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);

 
   if ( ! vs->dict)
     return FALSE;
 
 
   if ( ! vs->dict)
     return FALSE;
 

-  return  row < psppire_dict_get_var_cnt(vs->dict);
+  return  row < psppire_dict_get_var_cnt (vs->dict);

 }
 
 static
 }
 
 static

-gboolean always_true()
+gboolean always_true ()

 {
   return TRUE;
 }
 
 
 static gchar *
 {
   return TRUE;
 }
 
 
 static gchar *

-geometry_get_button_label(const GSheetRow *geom, gint unit, gpointer data)
+geometry_get_button_label (const GSheetRow *geom, glong unit, gpointer data)

 {
 {

-  gchar *label = g_strdup_printf(_("%d"), unit);
+  gchar *label = g_strdup_printf (_("%ld"), unit);

 
   return label;
 }
 
 
   return label;
 }
 

-

 static void
 psppire_var_store_sheet_row_init (GSheetRowIface *iface)
 {
 static void
 psppire_var_store_sheet_row_init (GSheetRowIface *iface)
 {


@@ -783,3 +741,6 @@ psppire_var_store_sheet_row_init (GSheetRowIface *iface)
 
   iface->get_button_label = geometry_get_button_label;
 }
 
   iface->get_button_label = geometry_get_button_label;
 }

+
+
+