X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=1f963cabc03c9d8af58921443c40c2651d67ffb2;hb=e59613aae24bbddcaba25415a67dcf2010ebb55c;hp=6bf5c55007e761e391291abb10b7a3ae3acde371;hpb=8802135d750fdee1002c7e8bcaeda74a10e26d26;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index 6bf5c550..1f963cab 100644
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -28,11 +28,11 @@
 #include <gtksheet/gsheetmodel.h>
 
 #include "psppire-var-store.h"
-#include "var-sheet.h"
 #include "helper.h"
 
 #include <data/dictionary.h>
 #include <data/variable.h>
+#include <data/format.h>
 #include <data/missing-values.h>
 
 #include "val-labs-dialog.h"
@@ -70,10 +70,6 @@ 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 void psppire_var_store_sheet_row_init (GSheetRowIface *iface);
-
-
-
 static GObjectClass *parent_class = NULL;
 
 GType
@@ -127,24 +123,11 @@ psppire_var_store_get_type (void)
 	NULL
       };
 
-      static const GInterfaceInfo sheet_row_info =
-      {
-	(GInterfaceInitFunc) psppire_var_store_sheet_row_init,
-	NULL,
-	NULL
-      };
-
       var_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireVarStore", &var_store_info, 0);
 
       g_type_add_interface_static (var_store_type,
 				   G_TYPE_SHEET_MODEL,
 				   &sheet_model_info);
-
-      g_type_add_interface_static (var_store_type,
-				   G_TYPE_SHEET_ROW,
-				   &sheet_row_info);
-
-
     }
 
   return var_store_type;
@@ -238,14 +221,13 @@ psppire_var_store_class_init (PsppireVarStoreClass *class)
                                    pspec);
 }
 
+#define DISABLED_COLOR "gray"
+
 static void
 psppire_var_store_init (PsppireVarStore *var_store)
 {
-  GdkColormap *colormap = gdk_colormap_get_system ();
-
-  g_assert (gdk_color_parse ("gray", &var_store->disabled));
-
-  gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE);
+  if ( ! gdk_color_parse (DISABLED_COLOR, &var_store->disabled))
+	g_critical ("Could not parse color \"%s\"", DISABLED_COLOR);
 
   var_store->dict = 0;
   var_store->trailing_rows = 40;
@@ -262,7 +244,7 @@ psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co
   if ( !pv )
     return TRUE;
 
-  if ( var_is_alpha (pv) && column == COL_DECIMALS )
+  if ( var_is_alpha (pv) && column == PSPPIRE_VAR_STORE_COL_DECIMALS )
     return FALSE;
 
   write_spec = var_get_print_format (pv);
@@ -282,7 +264,7 @@ psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co
     case FMT_DTIME:
     case FMT_WKDAY:
     case FMT_MONTH:
-      if ( column == COL_DECIMALS || column == COL_WIDTH)
+      if ( column == PSPPIRE_VAR_STORE_COL_DECIMALS || column == PSPPIRE_VAR_STORE_COL_WIDTH)
 	return FALSE;
       break;
     default:
@@ -307,7 +289,7 @@ psppire_var_store_is_editable (const GSheetModel *model, glong row, glong column
 }
 
 
-static const GdkColor *
+static GdkColor *
 psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column)
 {
   PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
@@ -328,8 +310,9 @@ psppire_var_store_get_font_desc (const GSheetModel *model,
   return store->font_desc;
 }
 
-
-
+static gchar *get_column_title (const GSheetModel *model, gint col);
+static gchar *get_row_title (const GSheetModel *model, gint row);
+static gboolean get_row_sensitivity (const GSheetModel *model, gint row);
 
 static void
 psppire_var_store_sheet_model_init (GSheetModelIface *iface)
@@ -346,9 +329,13 @@ psppire_var_store_sheet_model_init (GSheetModelIface *iface)
   iface->get_background = NULL;
   iface->get_font_desc = psppire_var_store_get_font_desc;
   iface->get_cell_border = NULL;
-}
+  iface->get_justification = NULL;
 
+  iface->get_column_title = get_column_title;
 
+  iface->get_row_title = get_row_title;
+  iface->get_row_sensitivity = get_row_sensitivity;
+}
 
 /**
  * psppire_var_store_new:
@@ -375,7 +362,7 @@ var_change_callback (GtkWidget *w, gint n, gpointer data)
   GSheetModel *model = G_SHEET_MODEL (data);
 
   g_sheet_model_range_changed (model,
-				 n, 0, n, n_COLS);
+				 n, 0, n, PSPPIRE_VAR_STORE_n_COLS);
 }
 
 
@@ -480,7 +467,7 @@ psppire_var_store_clear (GSheetModel *model,  glong row, glong col)
 
   switch (col)
     {
-    case COL_LABEL:
+    case PSPPIRE_VAR_STORE_COL_LABEL:
       var_set_label (pv, 0);
       return TRUE;
       break;
@@ -511,15 +498,15 @@ psppire_var_store_set_string (GSheetModel *model,
 
   switch (col)
     {
-    case COL_NAME:
+    case PSPPIRE_VAR_STORE_COL_NAME:
       return psppire_dict_rename_var (var_store->dict, pv, text);
       break;
-    case COL_COLUMNS:
+    case PSPPIRE_VAR_STORE_COL_COLUMNS:
       if ( ! text) return FALSE;
       var_set_display_width (pv, atoi (text));
       return TRUE;
       break;
-    case COL_WIDTH:
+    case PSPPIRE_VAR_STORE_COL_WIDTH:
       {
 	int width = atoi (text);
 	if ( ! text) return FALSE;
@@ -545,7 +532,7 @@ psppire_var_store_set_string (GSheetModel *model,
 	return TRUE;
       }
       break;
-    case COL_DECIMALS:
+    case PSPPIRE_VAR_STORE_COL_DECIMALS:
       {
         bool for_input
           = var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS;
@@ -566,15 +553,15 @@ psppire_var_store_set_string (GSheetModel *model,
 	return TRUE;
       }
       break;
-    case COL_LABEL:
+    case PSPPIRE_VAR_STORE_COL_LABEL:
       var_set_label (pv, text);
       return TRUE;
       break;
-    case COL_TYPE:
-    case COL_VALUES:
-    case COL_MISSING:
-    case COL_ALIGN:
-    case COL_MEASURE:
+    case PSPPIRE_VAR_STORE_COL_TYPE:
+    case PSPPIRE_VAR_STORE_COL_VALUES:
+    case PSPPIRE_VAR_STORE_COL_MISSING:
+    case PSPPIRE_VAR_STORE_COL_ALIGN:
+    case PSPPIRE_VAR_STORE_COL_MEASURE:
       /* These can be modified only by their respective dialog boxes */
       return FALSE;
       break;
@@ -610,10 +597,10 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 
   switch (c)
     {
-    case COL_NAME:
+    case PSPPIRE_VAR_STORE_COL_NAME:
       return pspp_locale_to_utf8 ( var_get_name (pv), -1, err);
       break;
-    case COL_TYPE:
+    case PSPPIRE_VAR_STORE_COL_TYPE:
       {
 	switch ( write_spec->type )
 	  {
@@ -667,7 +654,7 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 	  }
       }
       break;
-    case COL_WIDTH:
+    case PSPPIRE_VAR_STORE_COL_WIDTH:
       {
 	gchar *s;
 	GString *gstr = g_string_sized_new (10);
@@ -677,7 +664,7 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 	return s;
       }
       break;
-    case COL_DECIMALS:
+    case PSPPIRE_VAR_STORE_COL_DECIMALS:
       {
 	gchar *s;
 	GString *gstr = g_string_sized_new (10);
@@ -687,7 +674,7 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 	return s;
       }
       break;
-    case COL_COLUMNS:
+    case PSPPIRE_VAR_STORE_COL_COLUMNS:
       {
 	gchar *s;
 	GString *gstr = g_string_sized_new (10);
@@ -697,16 +684,16 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 	return s;
       }
       break;
-    case COL_LABEL:
+    case PSPPIRE_VAR_STORE_COL_LABEL:
       return pspp_locale_to_utf8 (var_get_label (pv), -1, err);
       break;
 
-    case COL_MISSING:
+    case PSPPIRE_VAR_STORE_COL_MISSING:
       {
 	return missing_values_to_string (pv, err);
       }
       break;
-    case COL_VALUES:
+    case PSPPIRE_VAR_STORE_COL_VALUES:
       {
 	if ( ! var_has_value_labels (pv))
 	  return g_locale_to_utf8 (gettext (none), -1, 0, 0, err);
@@ -735,7 +722,7 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 	  }
       }
       break;
-    case COL_ALIGN:
+    case PSPPIRE_VAR_STORE_COL_ALIGN:
       {
 	const gint align = var_get_alignment (pv);
 
@@ -743,7 +730,7 @@ text_for_column (const struct variable *pv, gint c, GError **err)
 	return g_locale_to_utf8 (gettext (alignments[align]), -1, 0, 0, err);
       }
       break;
-    case COL_MEASURE:
+    case PSPPIRE_VAR_STORE_COL_MEASURE:
       {
 	return measure_to_string (pv, err);
       }
@@ -789,36 +776,18 @@ psppire_var_store_get_row_count (const GSheetModel * model)
 static glong
 psppire_var_store_get_column_count (const GSheetModel * model)
 {
-  return n_COLS ;
+  return PSPPIRE_VAR_STORE_n_COLS ;
 }
 
+
 
 /* Row related funcs */
 
-static glong
-geometry_get_row_count (const GSheetRow *geom, gpointer data)
-{
-  gint rows = 0;
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
-
-  if (vs->dict)
-    rows =  psppire_dict_get_var_cnt (vs->dict);
-
-  return rows + vs->trailing_rows;
-}
-
-
-static gint
-geometry_get_height (const GSheetRow *geom, glong row, gpointer data)
-{
-  return 25;
-}
-
 
 static gboolean
-geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data)
+get_row_sensitivity (const GSheetModel *model, gint row)
 {
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
+  PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);
 
   if ( ! vs->dict)
     return FALSE;
@@ -826,32 +795,34 @@ geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data)
   return  row < psppire_dict_get_var_cnt (vs->dict);
 }
 
-static
-gboolean always_true ()
-{
-  return TRUE;
-}
-
 
 static gchar *
-geometry_get_button_label (const GSheetRow *geom, glong unit, gpointer data)
+get_row_title (const GSheetModel *model, gint unit)
 {
-  gchar *label = g_strdup_printf (_("%ld"), unit + 1);
-
-  return label;
+  return g_strdup_printf (_("%d"), unit + 1);
 }
 
-static void
-psppire_var_store_sheet_row_init (GSheetRowIface *iface)
-{
-  iface->get_row_count =     geometry_get_row_count;
-  iface->get_height =        geometry_get_height;
-  iface->set_height =        0;
-  iface->get_visibility =    always_true;
-  iface->get_sensitivity =   geometry_is_sensitive;
 
-  iface->get_button_label = geometry_get_button_label;
-}
+
 
+static const gchar *column_titles[] = {
+  N_("Name"),
+  N_("Type"),
+  N_("Width"),
+  N_("Decimals"),
+  N_("Label"),
+  N_("Values"),
+  N_("Missing"),
+  N_("Columns"),
+  N_("Align"),
+  N_("Measure"),
+};
 
 
+static gchar *
+get_column_title (const GSheetModel *model, gint col)
+{
+  if ( col >= 10)
+    return NULL;
+  return g_strdup (gettext (column_titles[col]));
+}