X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=19b50028a68566079f0eae03dc5fb6eef9814797;hb=3785800c7a660f059857b66ec36efec99af0d052;hp=4575bd3bcb90fc6c1d60a4c6ba7fb72574f72275;hpb=ddd7c113f3e50c8d87f6a677856799d05a1f40c7;p=pspp-builds.git diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index 4575bd3b..19b50028 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -28,7 +28,6 @@ #include #include "psppire-var-store.h" -#include #include "helper.h" #include @@ -44,7 +43,7 @@ enum { - PSPPIRE_VAR_STORE_TRAILING_ROWS = 1, + PROP_0, PSPPIRE_VAR_STORE_FORMAT_TYPE }; @@ -71,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 @@ -128,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; @@ -161,10 +143,6 @@ psppire_var_store_set_property (GObject *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; @@ -185,10 +163,6 @@ psppire_var_store_get_property (GObject *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; @@ -213,20 +187,6 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) 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 " @@ -234,6 +194,7 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) 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); @@ -248,7 +209,6 @@ psppire_var_store_init (PsppireVarStore *var_store) 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; } @@ -319,17 +279,9 @@ psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong col } -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 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) @@ -341,14 +293,14 @@ psppire_var_store_sheet_model_init (GSheetModelIface *iface) 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; } /** @@ -763,18 +715,6 @@ psppire_var_store_get_var_cnt (PsppireVarStore *store) } -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) { @@ -793,33 +733,15 @@ psppire_var_store_get_column_count (const GSheetModel * model) return PSPPIRE_VAR_STORE_n_COLS ; } + /* Row related funcs */ -static glong -geometry_get_row_count (const GSheetRow *geom) -{ - 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) -{ - return 25; -} - static gboolean -geometry_is_sensitive (const GSheetRow *geom, glong row) +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; @@ -827,23 +749,11 @@ geometry_is_sensitive (const GSheetRow *geom, glong row) return row < psppire_dict_get_var_cnt (vs->dict); } -static gchar * -geometry_get_button_label (const GSheetRow *geom, glong unit) -{ - gchar *label = g_strdup_printf (_("%ld"), unit + 1); - - return label; -} -static void -psppire_var_store_sheet_row_init (GSheetRowIface *iface) +static gchar * +get_row_title (const GSheetModel *model, gint unit) { - iface->get_row_count = geometry_get_row_count; - iface->get_height = geometry_get_height; - iface->set_height = NULL; - iface->get_sensitivity = geometry_is_sensitive; - - iface->get_button_label = geometry_get_button_label; + return g_strdup_printf (_("%d"), unit + 1); }