#include "ui/gui/psppire-marshal.h"
#include "ui/gui/psppire-var-ptr.h"
+#include "ui/gui/efficient-sheet/jmd-datum.h"
+
+
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
BACKEND_CHANGED,
VARIABLE_CHANGED,
- VARIABLE_RESIZED,
VARIABLE_INSERTED,
VARIABLE_DELETED,
- VARIABLE_DISPLAY_WIDTH_CHANGED,
WEIGHT_CHANGED,
FILTER_CHANGED,
static void dictionary_tree_model_init (GtkTreeModelIface *iface);
+
+static guint
+gni (GListModel *list)
+{
+ PsppireDict *dict = PSPPIRE_DICT (list);
+
+ return psppire_dict_get_var_cnt (dict);
+}
+
+static GType
+git (GListModel *list)
+{
+ return JMD_TYPE_DATUM;
+}
+
+static gpointer
+gi (GListModel *list, guint id)
+{
+ JmdDatum *gd = JMD_DATUM (g_object_new (JMD_TYPE_DATUM, NULL));
+
+ PsppireDict *dict = PSPPIRE_DICT (list);
+
+ if (id >= psppire_dict_get_var_cnt (dict))
+ {
+ gd->text = g_strdup (_("Var"));
+ }
+ else
+ {
+ const struct variable *v = psppire_dict_get_variable (dict, id);
+
+ gd->text = g_strdup (var_get_name (v));
+ gd->label = g_strdup (var_get_label (v));
+ }
+
+ return gd;
+}
+
+
+static void
+jmd_init_iface (GListModelInterface *iface)
+{
+ iface->get_n_items = gni;
+ iface->get_item = gi;
+ iface->get_item_type = git;
+}
+
+
/* --- variables --- */
static GObjectClass *parent_class = NULL;
NULL
};
+ static const GInterfaceInfo list_model_info = {
+ (GInterfaceInitFunc) jmd_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);
+
+ g_type_add_interface_static (object_type, G_TYPE_LIST_MODEL,
+ &list_model_info);
}
return object_type;
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__INT,
+ psppire_marshal_VOID__INT_UINT_POINTER,
G_TYPE_NONE,
- 1,
- G_TYPE_INT);
+ 3,
+ G_TYPE_INT,
+ G_TYPE_UINT,
+ G_TYPE_POINTER
+ );
G_TYPE_INT);
- signals [VARIABLE_RESIZED] =
- g_signal_new ("dict-size-changed",
- G_TYPE_FROM_CLASS (class),
- G_SIGNAL_RUN_FIRST,
- 0,
- NULL, NULL,
- psppire_marshal_VOID__INT_INT,
- G_TYPE_NONE,
- 2,
- G_TYPE_INT,
- G_TYPE_INT);
-
- signals [VARIABLE_DISPLAY_WIDTH_CHANGED] =
- g_signal_new ("variable-display-width-changed",
- G_TYPE_FROM_CLASS (class),
- G_SIGNAL_RUN_FIRST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__INT,
- G_TYPE_NONE,
- 1,
- G_TYPE_INT);
-
-
signals [WEIGHT_CHANGED] =
g_signal_new ("weight-changed",
G_TYPE_FROM_CLASS (class),
}
static void
-mutcb (struct dictionary *d, int idx, void *pd)
+mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd)
{
- g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx);
-}
-
-static void
-resize_cb (struct dictionary *d, int idx, int old_width, void *pd)
-{
- g_signal_emit (pd, signals [VARIABLE_RESIZED], 0, idx, old_width);
+ g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx, what, oldvar);
}
static void
g_signal_emit (pd, signals [SPLIT_CHANGED], 0);
}
-static void
-variable_display_width_callback (struct dictionary *d, int idx, void *pd)
-{
- g_signal_emit (pd, signals [VARIABLE_DISPLAY_WIDTH_CHANGED], 0, idx);
-}
-
-
-
static const struct dict_callbacks gui_callbacks =
{
addcb,
delcb,
mutcb,
- resize_cb,
weight_changed_callback,
filter_changed_callback,
- split_changed_callback,
- variable_display_width_callback
+ split_changed_callback
};
static void
}
-void
-psppire_dict_resize_variable (PsppireDict *d, const struct variable *pv,
- gint old_size, gint new_size)
-{
- g_return_if_fail (d);
- g_return_if_fail (d->dict);
-
- if ( old_size == new_size )
- return ;
-
- g_signal_emit (d, signals [VARIABLE_RESIZED], 0,
- var_get_dict_index (pv),
- new_size - old_size );
-}
-
-
/* Tree Model Stuff */
static GtkTreeModelFlags tree_model_get_flags (GtkTreeModel *model);
case DICT_TVM_COL_VAR:
return PSPPIRE_VAR_PTR_TYPE;
break;
+ case DICT_TVM_COL_LABEL:
+ return G_TYPE_STRING;
+ break;
default:
g_return_val_if_reached ((GType)0);
break;
return path;
}
+const struct fmt_spec *var_get_write_format (const struct variable *);
static void
tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter,
g_return_if_fail (iter->stamp == dict->stamp);
- var = iter->user_data;
+ var = iter->user_data;
+ const struct fmt_spec *fs = var_get_write_format (var);
+
switch (column)
{
case DICT_TVM_COL_NAME:
- {
- g_value_init (value, G_TYPE_STRING);
- g_value_set_string (value, var_get_name (var));
- }
+ g_value_init (value, G_TYPE_STRING);
+ g_value_set_string (value, var_get_name (var));
+ break;
+ case DICT_TVM_COL_WIDTH:
+ g_value_init (value, G_TYPE_INT);
+ g_value_set_int (value, fs->w);
+ break;
+ case DICT_TVM_COL_DECIMAL:
+ g_value_init (value, G_TYPE_INT);
+ g_value_set_int (value, fs->d);
+ break;
+ case DICT_TVM_COL_LABEL:
+ g_value_init (value, G_TYPE_STRING);
+ g_value_set_string (value, var_get_label (var));
+ break;
+ case DICT_TVM_COL_COLUMNS:
+ g_value_init (value, G_TYPE_INT);
+ 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));
+ break;
+ case DICT_TVM_COL_MEASURE:
+ g_value_init (value, G_TYPE_INT);
+ g_value_set_int (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));
break;
case DICT_TVM_COL_VAR:
g_value_init (value, PSPPIRE_VAR_PTR_TYPE);
g_value_set_boxed (value, var);
break;
default:
- g_return_if_reached ();
+ g_value_init (value, G_TYPE_STRING);
+ g_value_set_string (value, "????");
break;
}
}