/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation
+ Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012,
+ 2016, 2017 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "ui/gui/efficient-sheet/jmd-datum.h"
+#include <gobject/genums.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-enum {
- BACKEND_CHANGED,
+
+GType align_enum_type;
+GType measure_enum_type;
+GType role_enum_type;
+
+
+enum {
VARIABLE_CHANGED,
VARIABLE_INSERTED,
VARIABLE_DELETED,
parent_class = g_type_class_peek_parent (class);
object_class->dispose = psppire_dict_dispose;
-
- signals [BACKEND_CHANGED] =
- g_signal_new ("backend-changed",
- G_TYPE_FROM_CLASS (class),
- G_SIGNAL_RUN_FIRST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-
-
+
signals [VARIABLE_CHANGED] =
g_signal_new ("variable-changed",
G_TYPE_FROM_CLASS (class),
PsppireDict *dict = PSPPIRE_DICT (pd);
if ( ! dict->disable_insert_signal)
- g_signal_emit (dict, signals [VARIABLE_INSERTED], 0, idx);
+ {
+ g_signal_emit (dict, signals [VARIABLE_INSERTED], 0, idx);
+ g_signal_emit_by_name (dict, "items-changed", idx, 1, 1);
+ }
}
static void
{
g_signal_emit (pd, signals [VARIABLE_DELETED], 0,
var, dict_idx, case_idx);
+ g_signal_emit_by_name (pd, "items-changed", dict_idx, 1, 0);
}
static void
mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd)
{
g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx, what, oldvar);
+ g_signal_emit_by_name (pd, "items-changed", idx, 1, 1);
}
static void
{
PsppireDict *new_dict = g_object_new (PSPPIRE_TYPE_DICT, NULL);
new_dict->dict = d;
-
+
dict_set_callbacks (new_dict->dict, &gui_callbacks, new_dict);
return new_dict;
{
struct variable *var = dict_get_weight (d);
+ guint old_n = dict_get_var_cnt (dict->dict);
+ guint new_n = dict_get_var_cnt (d);
+
dict->dict = d;
weight_changed_callback (d, var ? var_get_dict_index (var) : -1, dict);
dict_set_callbacks (dict->dict, &gui_callbacks, dict);
- g_signal_emit (dict, signals [BACKEND_CHANGED], 0);
+ g_signal_emit_by_name (dict, "items-changed", 0, old_n, new_n);
}
d->disable_insert_signal = FALSE;
g_signal_emit (d, signals[VARIABLE_INSERTED], 0, idx);
-
+ g_signal_emit_by_name (d, "items-changed", idx, 0, 1);
+
return var;
}
{
g_return_val_if_fail (PSPPIRE_IS_DICT (model), (GType) 0);
+ GType t = 0;
+
switch (index)
{
case DICT_TVM_COL_NAME:
- return G_TYPE_STRING;
+ case DICT_TVM_COL_LABEL:
+ t = G_TYPE_STRING;
+ break;
+ case DICT_TVM_COL_DECIMAL:
+ case DICT_TVM_COL_WIDTH:
+ case DICT_TVM_COL_COLUMNS:
+ t = G_TYPE_INT;
break;
case DICT_TVM_COL_VAR:
- return PSPPIRE_VAR_PTR_TYPE;
+ t = PSPPIRE_VAR_PTR_TYPE;
break;
- case DICT_TVM_COL_LABEL:
- return G_TYPE_STRING;
+ case DICT_TVM_COL_ALIGNMENT:
+ t = align_enum_type;
break;
- default:
- g_return_val_if_reached ((GType)0);
+ case DICT_TVM_COL_MEASURE:
+ t = measure_enum_type;
+ break;
+ case DICT_TVM_COL_ROLE:
+ t = role_enum_type;
break;
}
- g_assert_not_reached ();
- return ((GType)0);
+ return t;
}
static gboolean
struct variable *var;
gint idx;
- g_return_val_if_fail (iter->stamp == dict->stamp, FALSE);
-
if ( iter == NULL || iter->user_data == NULL)
return FALSE;
+ g_return_val_if_fail (iter->stamp == dict->stamp, FALSE);
+
var = iter->user_data;
idx = var_get_dict_index (var);
g_value_set_int (value, var_get_display_width (var));
break;
case DICT_TVM_COL_ALIGNMENT:
- g_value_init (value, G_TYPE_INT);
- g_value_set_int (value, var_get_alignment (var));
+ g_value_init (value, align_enum_type);
+ g_value_set_enum (value, var_get_alignment (var));
break;
case DICT_TVM_COL_MEASURE:
- g_value_init (value, G_TYPE_INT);
- g_value_set_int (value, var_get_measure (var));
+ g_value_init (value, measure_enum_type);
+ g_value_set_enum (value, var_get_measure (var));
break;
case DICT_TVM_COL_ROLE:
- g_value_init (value, G_TYPE_INT);
- g_value_set_int (value, var_get_role (var));
+ g_value_init (value, role_enum_type);
+ g_value_set_enum (value, var_get_role (var));
break;
case DICT_TVM_COL_VAR:
g_value_init (value, PSPPIRE_VAR_PTR_TYPE);
{
PsppireDict *dict = PSPPIRE_DICT (model);
- if ( iter == NULL )
+ if (iter == NULL)
return psppire_dict_get_var_cnt (dict);
return 0;