X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=4cdc295886009a7961b2832daf7f2d02ee12a338;hb=b64685d06f8db1aff292ec409abe25f8a483d775;hp=dfae46b1e443464ab5f26166f812a7449e1b18c5;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index dfae46b1..4cdc2958 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -22,25 +22,29 @@ #include #include #include +#include +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + + #include -#include "gsheetmodel.h" +#include #include "psppire-variable.h" #include "psppire-var-store.h" #include "var-sheet.h" +#include "helper.h" -#include "dictionary.h" -#include "variable.h" -#include "missing-values.h" +#include +#include +#include #include "val-labs-dialog.h" #include "missing-val-dialog.h" -#include "value-labels.h" +#include -#define _(A) A -#define N_(A) A static void psppire_var_store_init (PsppireVarStore *var_store); @@ -48,7 +52,7 @@ 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 const gchar *const psppire_var_store_get_string(GSheetModel *sheet_model, gint row, gint column); +static gchar *psppire_var_store_get_string(GSheetModel *sheet_model, gint row, gint column); static gboolean psppire_var_store_clear(GSheetModel *model, gint row, gint col); @@ -57,7 +61,7 @@ static gboolean psppire_var_store_set_string(GSheetModel *model, const gchar *text, gint row, gint column); -static const gchar *const text_for_column(const struct PsppireVariable *pv, gint c); +static gchar *text_for_column(const struct PsppireVariable *pv, gint c, GError **err); static GObjectClass *parent_class = NULL; @@ -115,11 +119,10 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) static void psppire_var_store_init (PsppireVarStore *var_store) { + GdkColormap *colormap = gdk_colormap_get_system(); g_assert(gdk_color_parse("gray", &var_store->disabled)); - GdkColormap *colormap = gdk_colormap_get_system(); - gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE); var_store->dict = 0; @@ -128,6 +131,7 @@ psppire_var_store_init (PsppireVarStore *var_store) static gboolean psppire_var_store_item_editable(PsppireVarStore *var_store, gint row, gint column) { + const struct fmt_spec *write_spec ; struct PsppireVariable *pv = psppire_var_store_get_variable(var_store, row); @@ -137,7 +141,7 @@ psppire_var_store_item_editable(PsppireVarStore *var_store, gint row, gint colum if ( ALPHA == psppire_variable_get_type(pv) && column == COL_DECIMALS ) return FALSE; - const struct fmt_spec *write_spec = psppire_variable_get_write_spec(pv); + write_spec = psppire_variable_get_write_spec(pv); switch ( write_spec->type ) { @@ -198,6 +202,7 @@ psppire_var_store_get_font_desc(GSheetModel *model, static void psppire_var_store_sheet_model_init (GSheetModelIface *iface) { + 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; @@ -295,7 +300,7 @@ psppire_var_store_finalize (GObject *object) (* parent_class->finalize) (object); } -static const gchar *const +static gchar * psppire_var_store_get_string(GSheetModel *model, gint row, gint column) { PsppireVarStore *store = PSPPIRE_VAR_STORE(model); @@ -307,9 +312,7 @@ psppire_var_store_get_string(GSheetModel *model, gint row, gint column) pv = psppire_dict_get_variable (store->dict, row); - const gchar *s = text_for_column(pv, column); - - return s; + return text_for_column(pv, column, 0); } @@ -332,12 +335,14 @@ psppire_var_store_get_variable(PsppireVarStore *store, gint row) static gboolean psppire_var_store_clear(GSheetModel *model, gint row, gint col) { + struct PsppireVariable *pv ; + PsppireVarStore *var_store = PSPPIRE_VAR_STORE(model); if ( row >= psppire_dict_get_var_cnt(var_store->dict)) return FALSE; - struct PsppireVariable *pv = psppire_var_store_get_variable(var_store, row); + pv = psppire_var_store_get_variable(var_store, row); if ( !pv ) return FALSE; @@ -361,13 +366,14 @@ static gboolean psppire_var_store_set_string(GSheetModel *model, const gchar *text, gint row, gint col) { + struct PsppireVariable *pv ; + PsppireVarStore *var_store = PSPPIRE_VAR_STORE(model); if ( row >= psppire_dict_get_var_cnt(var_store->dict)) return FALSE; - struct PsppireVariable *pv = psppire_var_store_get_variable(var_store, row); - + pv = psppire_var_store_get_variable(var_store, row); if ( !pv ) return FALSE; @@ -409,25 +415,21 @@ psppire_var_store_set_string(GSheetModel *model, } -#define MAX_CELL_TEXT_LEN 255 - -static const gchar *const -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}; @@ -437,23 +439,23 @@ text_for_column(const struct PsppireVariable *pv, gint c) 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: @@ -468,20 +470,20 @@ text_for_column(const struct PsppireVariable *pv, gint c) 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", @@ -492,114 +494,143 @@ text_for_column(const struct PsppireVariable *pv, gint c) 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); + { + gchar *const vstr = value_to_text(vl->value, *write_spec); - g_free(vstr); + 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; @@ -616,7 +647,7 @@ psppire_var_store_get_var_cnt(PsppireVarStore *store) 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)); @@ -628,3 +659,4 @@ psppire_var_store_set_font(PsppireVarStore *store, PangoFontDescription *fd) +