X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=7edc665a21cee5cd843e990d312d28648889ae30;hb=f82952d22e200e1b35cea23545857a2cf2f02c66;hp=f9b2d081fbb21c897fdc3bac2afb60ab097cce41;hpb=ddf093b6f8428a45a14a24aaf17417d30777d9a3;p=pspp-builds.git diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index f9b2d081..7edc665a 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -28,7 +28,7 @@ #include #include "psppire-var-store.h" -#include "var-sheet.h" +#include #include "helper.h" #include @@ -41,7 +41,11 @@ #include "var-display.h" -#define TRAILING_ROWS 40 +enum + { + PSPPIRE_VAR_STORE_TRAILING_ROWS = 1, + PSPPIRE_VAR_STORE_FORMAT_TYPE + }; static void psppire_var_store_init (PsppireVarStore *var_store); static void psppire_var_store_class_init (PsppireVarStoreClass *class); @@ -72,6 +76,30 @@ static void psppire_var_store_sheet_row_init (GSheetRowIface *iface); static GObjectClass *parent_class = NULL; +GType +psppire_var_store_format_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) + { + static const GEnumValue values[] = + { + { PSPPIRE_VAR_STORE_INPUT_FORMATS, + "PSPPIRE_VAR_STORE_INPUT_FORMATS", + "input" }, + { PSPPIRE_VAR_STORE_OUTPUT_FORMATS, + "PSPPIRE_VAR_STORE_OUTPUT_FORMATS", + "output" }, + { 0, NULL, NULL } + }; + + etype = g_enum_register_static + (g_intern_static_string ("PsppireVarStoreFormatType"), values); + + } + return etype; +} + GType psppire_var_store_get_type (void) { @@ -122,18 +150,94 @@ psppire_var_store_get_type (void) return var_store_type; } +static void +psppire_var_store_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + PsppireVarStore *self = (PsppireVarStore *) object; + + 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; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void +psppire_var_store_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + PsppireVarStore *self = (PsppireVarStore *) object; + + 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; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + + static void psppire_var_store_class_init (PsppireVarStoreClass *class) { GObjectClass *object_class; + GParamSpec *pspec; parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; object_class->finalize = psppire_var_store_finalize; + 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_VAR_STORE_OUTPUT_FORMATS, + G_PARAM_READWRITE); + g_object_class_install_property (object_class, + PSPPIRE_VAR_STORE_FORMAT_TYPE, + pspec); } - static void psppire_var_store_init (PsppireVarStore *var_store) { @@ -144,6 +248,8 @@ psppire_var_store_init (PsppireVarStore *var_store) gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE); var_store->dict = 0; + var_store->trailing_rows = 40; + var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS; } static gboolean @@ -156,7 +262,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); @@ -176,7 +282,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: @@ -269,7 +375,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); } @@ -374,7 +480,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; @@ -405,15 +511,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; @@ -421,15 +527,17 @@ psppire_var_store_set_string (GSheetModel *model, var_set_width (pv, width); else { + bool for_input + = var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS; struct fmt_spec fmt ; fmt = *var_get_write_format (pv); - if ( width < fmt_min_output_width (fmt.type) + if ( width < fmt_min_width (fmt.type, for_input) || - width > fmt_max_output_width (fmt.type)) + width > fmt_max_width (fmt.type, for_input)) return FALSE; fmt.w = width; - fmt.d = MIN (fmt_max_output_decimals (fmt.type, width), fmt.d); + fmt.d = MIN (fmt_max_decimals (fmt.type, width, for_input), fmt.d); var_set_both_formats (pv, &fmt); } @@ -437,17 +545,20 @@ 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; int decimals; struct fmt_spec fmt; if ( ! text) return FALSE; decimals = atoi (text); fmt = *var_get_write_format (pv); if ( decimals > - fmt_max_output_decimals (fmt.type, - fmt.w - )) + fmt_max_decimals (fmt.type, + fmt.w, + for_input + )) return FALSE; fmt.d = decimals; @@ -455,15 +566,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; @@ -499,10 +610,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 ) { @@ -556,7 +667,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); @@ -566,7 +677,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); @@ -576,7 +687,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); @@ -586,16 +697,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); @@ -624,7 +735,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); @@ -632,7 +743,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); } @@ -678,7 +789,7 @@ 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 ; } @@ -693,7 +804,7 @@ geometry_get_row_count (const GSheetRow *geom, gpointer data) if (vs->dict) rows = psppire_dict_get_var_cnt (vs->dict); - return rows + TRAILING_ROWS; + return rows + vs->trailing_rows; } @@ -725,7 +836,7 @@ gboolean always_true () static gchar * geometry_get_button_label (const GSheetRow *geom, glong unit, gpointer data) { - gchar *label = g_strdup_printf (_("%ld"), unit); + gchar *label = g_strdup_printf (_("%ld"), unit + 1); return label; }