#include <config.h>
#include <string.h>
#include <stdlib.h>
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
#include <gobject/gvaluecollector.h>
#include "missing-val-dialog.h"
#include <data/value-labels.h>
-#define _(A) A
-#define N_(A) A
+#define TRAILING_ROWS 40
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_finalize (GObject *object);
-static const gchar *psppire_var_store_get_string(GSheetModel *sheet_model, gint row, gint column);
+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);
static gboolean psppire_var_store_set_string(GSheetModel *model,
const gchar *text, gint row, gint column);
+static gint psppire_var_store_get_row_count(const GSheetModel * model);
+
+static gchar *text_for_column(const struct PsppireVariable *pv, gint c, GError **err);
+
+
+static void psppire_var_store_sheet_row_init (GSheetRowIface *iface);
-static const gchar *text_for_column(const struct PsppireVariable *pv, gint c);
static GObjectClass *parent_class = NULL;
NULL
};
- var_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireVarStore",
- &var_store_info, 0);
+ 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;
}
static gboolean
-psppire_var_store_is_editable(GSheetModel *model, gint row, gint column)
+psppire_var_store_is_editable(const GSheetModel *model, gint row, gint column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
return psppire_var_store_item_editable(store, row, column);
static const GdkColor *
-psppire_var_store_get_foreground(GSheetModel *model, gint row, gint column)
+psppire_var_store_get_foreground(const GSheetModel *model, gint row, gint column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
const PangoFontDescription *
-psppire_var_store_get_font_desc(GSheetModel *model,
+psppire_var_store_get_font_desc(const GSheetModel *model,
gint row, gint column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
static void
psppire_var_store_sheet_model_init (GSheetModelIface *iface)
{
+ iface->get_row_count = psppire_var_store_get_row_count;
+ iface->free_strings = TRUE;
iface->get_string = psppire_var_store_get_string;
iface->set_string = psppire_var_store_set_string;
iface->clear_datum = psppire_var_store_clear;
(* parent_class->finalize) (object);
}
-static const gchar *
-psppire_var_store_get_string(GSheetModel *model, gint row, gint column)
+static gchar *
+psppire_var_store_get_string(const GSheetModel *model, gint row, gint column)
{
- const gchar *s ;
-
PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
struct PsppireVariable *pv;
pv = psppire_dict_get_variable (store->dict, row);
- s = text_for_column(pv, column);
-
- return g_locale_to_utf8(s, -1, 0,0,0);
+ return text_for_column(pv, column, 0);
}
}
-#define MAX_CELL_TEXT_LEN 255
-
-static const gchar *
-text_for_column(const struct PsppireVariable *pv, gint c)
+static gchar *
+text_for_column(const struct PsppireVariable *pv, gint c, GError **err)
{
- static gchar buf[MAX_CELL_TEXT_LEN];
-
- static gchar none[]=_("None");
+ static gchar none[] = N_("None");
static const gchar *const type_label[] =
{
- _("Numeric"),
- _("Comma"),
- _("Dot"),
- _("Scientific"),
- _("Date"),
- _("Dollar"),
- _("Custom"),
- _("String")
+ N_("Numeric"),
+ N_("Comma"),
+ N_("Dot"),
+ N_("Scientific"),
+ N_("Date"),
+ N_("Dollar"),
+ N_("Custom"),
+ N_("String")
};
enum {VT_NUMERIC, VT_COMMA, VT_DOT, VT_SCIENTIFIC, VT_DATE, VT_DOLLAR,
VT_CUSTOM, VT_STRING};
switch (c)
{
case COL_NAME:
- return psppire_variable_get_name(pv);
+ return pspp_locale_to_utf8(psppire_variable_get_name(pv), -1, err);
break;
case COL_TYPE:
{
switch ( write_spec->type )
{
case FMT_F:
- return type_label[VT_NUMERIC];
+ return g_locale_to_utf8(gettext(type_label[VT_NUMERIC]), -1, 0, 0, err);
break;
case FMT_COMMA:
- return type_label[VT_COMMA];
+ return g_locale_to_utf8(gettext(type_label[VT_COMMA]), -1, 0, 0, err);
break;
case FMT_DOT:
- return type_label[VT_DOT];
+ return g_locale_to_utf8(gettext(type_label[VT_DOT]), -1, 0, 0, err);
break;
case FMT_E:
- return type_label[VT_SCIENTIFIC];
+ return g_locale_to_utf8(gettext(type_label[VT_SCIENTIFIC]), -1, 0, 0, err);
break;
case FMT_DATE:
case FMT_EDATE:
case FMT_DTIME:
case FMT_WKDAY:
case FMT_MONTH:
- return type_label[VT_DATE];
+ return g_locale_to_utf8(type_label[VT_DATE], -1, 0, 0, err);
break;
case FMT_DOLLAR:
- return type_label[VT_DOLLAR];
+ 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:
- return type_label[VT_CUSTOM];
+ return g_locale_to_utf8(gettext(type_label[VT_CUSTOM]), -1, 0, 0, err);
break;
case FMT_A:
- return type_label[VT_STRING];
+ return g_locale_to_utf8(gettext(type_label[VT_STRING]), -1, 0, 0, err);
break;
- default:
- g_warning("Unknown format: \"%s\"\n",
- fmt_to_string(write_spec));
+ default:
+ {
+ char str[FMT_STRING_LEN_MAX + 1];
+ g_warning("Unknown format: \"%s\"\n",
+ fmt_to_string(write_spec, str));
+ }
break;
}
}
break;
case COL_WIDTH:
{
- g_snprintf(buf, MAX_CELL_TEXT_LEN, "%d", write_spec->w);
- return buf;
+ 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);
+ return s;
}
break;
case COL_DECIMALS:
{
- g_snprintf(buf, MAX_CELL_TEXT_LEN, "%d", write_spec->d);
- return buf;
+ 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);
+ return s;
}
break;
case COL_COLUMNS:
{
- g_snprintf(buf, MAX_CELL_TEXT_LEN,
- "%d", psppire_variable_get_columns(pv));
- return buf;
+ gchar *s;
+ GString *gstr = g_string_sized_new(10);
+ g_string_printf(gstr, _("%d"), psppire_variable_get_columns(pv));
+ s = g_locale_to_utf8(gstr->str, gstr->len, 0, 0, err);
+ g_string_free(gstr, TRUE);
+ return s;
}
break;
case COL_LABEL:
- return psppire_variable_get_label(pv);
+ return pspp_locale_to_utf8(psppire_variable_get_label(pv), -1, err);
break;
+
case COL_MISSING:
{
- const struct missing_values *miss = psppire_variable_get_missing(pv);
- if ( mv_is_empty(miss))
- return none;
- else
- {
- if ( ! mv_has_range (miss))
- {
- 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);
- }
- g_stpcpy(buf, "");
- for(i = 0 ; i < n; ++i )
- {
- if ( i > 0)
- g_strlcat(buf, ", ", MAX_CELL_TEXT_LEN);
- g_strlcat(buf, mv[i], MAX_CELL_TEXT_LEN);
- g_free(mv[i]);
- }
- }
- else
- {
- gchar *l, *h;
- union value low, high;
- mv_peek_range(miss, &low.f, &high.f);
+ gchar *s;
+ const struct missing_values *miss = psppire_variable_get_missing(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_snprintf(buf, MAX_CELL_TEXT_LEN, "%s - %s", l, h);
- g_free(l);
- g_free(h);
-
- if ( mv_has_value(miss))
- {
- gchar buf2[MAX_CELL_TEXT_LEN];
- gchar *s = 0;
- union value v;
- mv_peek_value(miss, &v, 0);
-
- s = value_to_text(v, *write_spec);
-
- g_snprintf(buf2, MAX_CELL_TEXT_LEN, "%s, %s", buf, s);
- free(s);
- g_stpcpy(buf, buf2);
- }
- }
-
- return buf;
- }
+ 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;
+ }
}
break;
case COL_VALUES:
{
const struct val_labs *vls = psppire_variable_get_value_labels(pv);
- if ( ! vls || 0 == val_labs_count(vls))
- return none;
+ if ( ! vls || 0 == val_labs_count(vls) )
+ return g_locale_to_utf8(gettext(none), -1, 0, 0, err);
else
{
- struct val_labs_iterator *ip=0;
+ gchar *ss;
+ GString *gstr = g_string_sized_new(10);
+ struct val_labs_iterator *ip = 0;
struct val_lab *vl = val_labs_first_sorted (vls, &ip);
g_assert(vl);
{
gchar *const vstr = value_to_text(vl->value, *write_spec);
- g_snprintf(buf, MAX_CELL_TEXT_LEN, "{%s,\"%s\"}_", vstr, vl->label);
+ g_string_printf(gstr, "{%s,\"%s\"}_", vstr, vl->label);
g_free(vstr);
}
val_labs_done(&ip);
-
- return buf;
+
+ ss = pspp_locale_to_utf8(gstr->str, gstr->len, err);
+ g_string_free(gstr, TRUE);
+ return ss;
}
}
break;
case COL_ALIGN:
- return alignments[psppire_variable_get_alignment(pv)];
+ {
+ const gint align = psppire_variable_get_alignment(pv);
+
+ g_assert(align < n_ALIGNMENTS);
+ return g_locale_to_utf8(gettext(alignments[align]), -1, 0, 0, err);
+ }
break;
case COL_MEASURE:
- return measures[psppire_variable_get_measure(pv)];
+ {
+ const gint measure = psppire_variable_get_measure(pv);
+
+ g_assert(measure < n_MEASURES);
+ return g_locale_to_utf8(gettext(measures[measure]), -1, 0, 0, err);
+ }
break;
}
return 0;
void
-psppire_var_store_set_font(PsppireVarStore *store, 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));
}
+static gint
+psppire_var_store_get_row_count(const GSheetModel * model)
+{
+ gint rows = 0;
+ PsppireVarStore *vs = PSPPIRE_VAR_STORE(model);
+
+ if (vs->dict)
+ rows = psppire_dict_get_var_cnt(vs->dict);
+
+ return rows ;
+}
+
+/* Row related funcs */
+
+static gint
+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 + TRAILING_ROWS;
+}
+
+
+static gint
+geometry_get_height(const GSheetRow *geom, gint row, gpointer data)
+{
+ return 25;
+}
+
+static gboolean
+geometry_is_sensitive(const GSheetRow *geom, gint row, gpointer data)
+{
+ PsppireVarStore *vs = PSPPIRE_VAR_STORE(geom);
+
+ 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, gint unit, gpointer data)
+{
+ gchar *label = g_strdup_printf(_("%d"), unit);
+
+ return label;
+}
+
+
+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;
+}