/* 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/psppire-marshal.h"
#include "ui/gui/psppire-var-ptr.h"
-#include "ui/gui/efficient-sheet/jmd-datum.h"
+#include <ssw-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,
static GType
git (GListModel *list)
{
- return JMD_TYPE_DATUM;
+ return SSW_TYPE_DATUM;
}
static gpointer
gi (GListModel *list, guint id)
{
- JmdDatum *gd = JMD_DATUM (g_object_new (JMD_TYPE_DATUM, NULL));
+ SswDatum *gd = SSW_DATUM (g_object_new (SSW_TYPE_DATUM, NULL));
PsppireDict *dict = PSPPIRE_DICT (list);
-
+
if (id >= psppire_dict_get_var_cnt (dict))
{
gd->text = g_strdup (_("Var"));
static void
-jmd_init_iface (GListModelInterface *iface)
+ssw_init_iface (GListModelInterface *iface)
{
iface->get_n_items = gni;
iface->get_item = gi;
};
static const GInterfaceInfo list_model_info = {
- (GInterfaceInitFunc) jmd_init_iface,
+ (GInterfaceInitFunc) ssw_init_iface,
NULL,
NULL
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"PsppireDict",
&object_info, 0);
-
+
g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL,
&tree_model_info);
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
{
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);
}
- The string may not contain whitespace.
- The first character may not be '$'
- The first character may not be a digit
- - The final charactor may not be '.' or '_'
+ - The final character may not be '.' or '_'
*/
len = snprintf (name, size, _("Var%04d"), d);
if (len + 1 >= size)
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;
}
}
-/* Return true is NAME would be a valid name of a variable to add to the
+/* Return true if NAME would be a valid name of a variable to add to the
dictionary. False otherwise.
If REPORT is true, then invalid names will be reported as such as errors
*/
{
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);
var = iter->user_data;
const struct fmt_spec *fs = var_get_write_format (var);
-
+
switch (column)
{
case DICT_TVM_COL_NAME:
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;
projects / pspp / blobdiff