#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-
+#include <libpspp/i18n.h>
#include <gobject/gvaluecollector.h>
-#include <gtksheet/gsheetmodel.h>
+#include <ui/gui/sheet/psppire-sheetmodel.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"
enum
{
- PSPPIRE_VAR_STORE_TRAILING_ROWS = 1,
+ PROP_0,
PSPPIRE_VAR_STORE_FORMAT_TYPE
};
static void psppire_var_store_init (PsppireVarStore *var_store);
static void psppire_var_store_class_init (PsppireVarStoreClass *class);
-static void psppire_var_store_sheet_model_init (GSheetModelIface *iface);
+static void psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface);
static void psppire_var_store_finalize (GObject *object);
-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 gchar *psppire_var_store_get_string (const PsppireSheetModel *sheet_model, glong row, glong column);
-static gboolean psppire_var_store_clear (GSheetModel *model, glong row, glong col);
+static gboolean psppire_var_store_clear (PsppireSheetModel *model, glong row, glong col);
-static gboolean psppire_var_store_set_string (GSheetModel *model,
+static gboolean psppire_var_store_set_string (PsppireSheetModel *model,
const gchar *text, glong row, glong column);
-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 void psppire_var_store_sheet_row_init (GSheetRowIface *iface);
+static glong psppire_var_store_get_row_count (const PsppireSheetModel * model);
+static glong psppire_var_store_get_column_count (const PsppireSheetModel * model);
+static gchar *text_for_column (PsppireVarStore *vs, const struct variable *pv,
+ gint c, GError **err);
static GObjectClass *parent_class = NULL;
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,
+ PSPPIRE_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;
switch (property_id)
{
- case PSPPIRE_VAR_STORE_TRAILING_ROWS:
- self->trailing_rows = g_value_get_int (value);
- break;
-
case PSPPIRE_VAR_STORE_FORMAT_TYPE:
self->format_type = g_value_get_enum (value);
break;
switch (property_id)
{
- case PSPPIRE_VAR_STORE_TRAILING_ROWS:
- g_value_set_int (value, self->trailing_rows);
- break;
-
case PSPPIRE_VAR_STORE_FORMAT_TYPE:
g_value_set_enum (value, self->format_type);
break;
object_class->set_property = psppire_var_store_set_property;
object_class->get_property = psppire_var_store_get_property;
- /* The minimum value for trailing-rows is 1 to prevent the
- var-store from ever having 0 rows, which breaks invariants
- in gtksheet. */
- pspec = g_param_spec_int ("trailing-rows",
- "Trailing rows",
- "Number of rows displayed after last variable",
- 1 /* minimum value */,
- 100 /* maximum value */,
- 40 /* default value */,
- G_PARAM_READWRITE);
- g_object_class_install_property (object_class,
- PSPPIRE_VAR_STORE_TRAILING_ROWS,
- pspec);
-
pspec = g_param_spec_enum ("format-type",
"Variable format type",
("Whether variables have input or output "
"formats"),
- G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE,
+ PSPPIRE_TYPE_VAR_STORE_FORMAT_TYPE,
PSPPIRE_VAR_STORE_OUTPUT_FORMATS,
G_PARAM_READWRITE);
+
g_object_class_install_property (object_class,
PSPPIRE_VAR_STORE_FORMAT_TYPE,
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;
var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS;
}
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);
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:
}
static gboolean
-psppire_var_store_is_editable (const GSheetModel *model, glong row, glong column)
+psppire_var_store_is_editable (const PsppireSheetModel *model, glong row, glong column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
return psppire_var_store_item_editable (store, row, column);
}
-static const GdkColor *
-psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column)
+static GdkColor *
+psppire_var_store_get_foreground (const PsppireSheetModel *model, glong row, glong column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
}
-const PangoFontDescription *
-psppire_var_store_get_font_desc (const GSheetModel *model,
- glong row, glong column)
-{
- PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
-
- return store->font_desc;
-}
-
-
-
+static gchar *get_column_title (const PsppireSheetModel *model, gint col);
+static gchar *get_row_title (const PsppireSheetModel *model, gint row);
+static gboolean get_row_sensitivity (const PsppireSheetModel *model, gint row);
static void
-psppire_var_store_sheet_model_init (GSheetModelIface *iface)
+psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface)
{
iface->get_row_count = psppire_var_store_get_row_count;
iface->get_column_count = psppire_var_store_get_column_count;
iface->set_string = psppire_var_store_set_string;
iface->clear_datum = psppire_var_store_clear;
iface->is_editable = psppire_var_store_is_editable;
- iface->is_visible = NULL;
iface->get_foreground = psppire_var_store_get_foreground;
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;
+
+ iface->get_row_overstrike = NULL;
+}
/**
* psppire_var_store_new:
static void
var_change_callback (GtkWidget *w, gint n, gpointer data)
{
- GSheetModel *model = G_SHEET_MODEL (data);
+ PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
- g_sheet_model_range_changed (model,
- n, 0, n, n_COLS);
+ psppire_sheet_model_range_changed (model,
+ n, 0, n, PSPPIRE_VAR_STORE_n_COLS);
}
static void
var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, gpointer data)
{
- GSheetModel *model = G_SHEET_MODEL (data);
+ PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
- g_sheet_model_rows_deleted (model, dict_idx, 1);
+ psppire_sheet_model_rows_deleted (model, dict_idx, 1);
}
static void
var_insert_callback (GtkWidget *w, glong row, gpointer data)
{
- GSheetModel *model = G_SHEET_MODEL (data);
+ PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
- g_sheet_model_rows_inserted (model, row, 1);
+ psppire_sheet_model_rows_inserted (model, row, 1);
}
static void
{
PsppireVarStore *vs = data;
- g_sheet_model_range_changed (G_SHEET_MODEL (vs), -1, -1, -1, -1);
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (vs), -1, -1, -1, -1);
}
/**
var_store);
/* The entire model has changed */
- g_sheet_model_range_changed (G_SHEET_MODEL (var_store), -1, -1, -1, -1);
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (var_store), -1, -1, -1, -1);
}
static void
}
static gchar *
-psppire_var_store_get_string (const GSheetModel *model, glong row, glong column)
+psppire_var_store_get_string (const PsppireSheetModel *model,
+ glong row, glong column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
pv = psppire_dict_get_variable (store->dict, row);
- return text_for_column (pv, column, 0);
+ return text_for_column (store, pv, column, 0);
}
Returns true if anything was updated, false otherwise.
*/
static gboolean
-psppire_var_store_clear (GSheetModel *model, glong row, glong col)
+psppire_var_store_clear (PsppireSheetModel *model, glong row, glong col)
{
struct variable *pv ;
switch (col)
{
- case COL_LABEL:
+ case PSPPIRE_VAR_STORE_COL_LABEL:
var_set_label (pv, 0);
return TRUE;
break;
Returns true if anything was updated, false otherwise.
*/
static gboolean
-psppire_var_store_set_string (GSheetModel *model,
+psppire_var_store_set_string (PsppireSheetModel *model,
const gchar *text, glong row, glong col)
{
struct variable *pv ;
switch (col)
{
- case COL_NAME:
- return psppire_dict_rename_var (var_store->dict, pv, text);
- break;
- case COL_COLUMNS:
+ case PSPPIRE_VAR_STORE_COL_NAME:
+ {
+ gboolean ok;
+ char *s = recode_string (psppire_dict_encoding (var_store->dict),
+ UTF8,
+ text, -1);
+
+ ok = psppire_dict_rename_var (var_store->dict, pv, s);
+
+ free (s);
+ return ok;
+ }
+ 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;
return TRUE;
}
break;
- case COL_DECIMALS:
+ case PSPPIRE_VAR_STORE_COL_DECIMALS:
{
bool for_input
= var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS;
return TRUE;
}
break;
- case COL_LABEL:
- var_set_label (pv, text);
- return TRUE;
+ case PSPPIRE_VAR_STORE_COL_LABEL:
+ {
+ gchar *s = recode_string (psppire_dict_encoding (var_store->dict),
+ UTF8,
+ text, -1);
+ var_set_label (pv, s);
+ free (s);
+ 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;
}
-const static gchar none[] = N_("None");
+static const gchar none[] = N_("None");
static gchar *
-text_for_column (const struct variable *pv, gint c, GError **err)
+text_for_column (PsppireVarStore *vs,
+ const struct variable *pv, gint c, GError **err)
{
+ PsppireDict *dict = vs->dict;
static const gchar *const type_label[] =
{
N_("Numeric"),
switch (c)
{
- case COL_NAME:
- return pspp_locale_to_utf8 ( var_get_name (pv), -1, err);
+ case PSPPIRE_VAR_STORE_COL_NAME:
+ return recode_string (UTF8, psppire_dict_encoding (dict),
+ var_get_name (pv), -1);
break;
- case COL_TYPE:
+ case PSPPIRE_VAR_STORE_COL_TYPE:
{
switch ( write_spec->type )
{
}
}
break;
- case COL_WIDTH:
+ case PSPPIRE_VAR_STORE_COL_WIDTH:
{
gchar *s;
GString *gstr = g_string_sized_new (10);
return s;
}
break;
- case COL_DECIMALS:
+ case PSPPIRE_VAR_STORE_COL_DECIMALS:
{
gchar *s;
GString *gstr = g_string_sized_new (10);
return s;
}
break;
- case COL_COLUMNS:
+ case PSPPIRE_VAR_STORE_COL_COLUMNS:
{
gchar *s;
GString *gstr = g_string_sized_new (10);
return s;
}
break;
- case COL_LABEL:
- return pspp_locale_to_utf8 (var_get_label (pv), -1, err);
+ case PSPPIRE_VAR_STORE_COL_LABEL:
+ return recode_string (UTF8, psppire_dict_encoding (dict),
+ var_get_label (pv), -1);
break;
- case COL_MISSING:
+ case PSPPIRE_VAR_STORE_COL_MISSING:
{
- return missing_values_to_string (pv, err);
+ return missing_values_to_string (dict, 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);
val_labs_done (&ip);
- ss = pspp_locale_to_utf8 (gstr->str, gstr->len, err);
+ ss = recode_string (UTF8, psppire_dict_encoding (dict),
+ gstr->str, gstr->len);
g_string_free (gstr, TRUE);
return ss;
}
}
break;
- case COL_ALIGN:
+ case PSPPIRE_VAR_STORE_COL_ALIGN:
{
const gint align = var_get_alignment (pv);
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);
}
}
-void
-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_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1);
-}
-
-
static glong
-psppire_var_store_get_row_count (const GSheetModel * model)
+psppire_var_store_get_row_count (const PsppireSheetModel * model)
{
gint rows = 0;
PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);
}
static glong
-psppire_var_store_get_column_count (const GSheetModel * model)
+psppire_var_store_get_column_count (const PsppireSheetModel * model)
{
- return n_COLS ;
+ return PSPPIRE_VAR_STORE_n_COLS ;
}
+\f
/* 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 PsppireSheetModel *model, gint row)
{
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
+ PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);
if ( ! vs->dict)
return FALSE;
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 PsppireSheetModel *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;
-}
+\f
+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 PsppireSheetModel *model, gint col)
+{
+ if ( col >= 10)
+ return NULL;
+ return g_strdup (gettext (column_titles[col]));
+}
projects / pspp-builds.git / blobdiff