for (l = 0; l < layer->n_layers; ++l)
{
- gboolean ok;
GtkTreeIter iter;
- PsppireVarView *vv = PSPPIRE_VAR_VIEW (layer->var_view);
- psppire_var_view_set_current_model (vv, l);
- g_string_append (string, "\n\tBY");
- for (ok = psppire_var_view_get_iter_first (vv, &iter);
- ok;
- ok = psppire_var_view_get_iter_next (vv, &iter))
+
+ GtkTreeModel *m = psppire_means_layer_get_model_n (layer, l);
+ gboolean ok = gtk_tree_model_get_iter_first (m, &iter);
+ if (ok)
+ g_string_append (string, "\n\tBY");
+ for (; ok; ok = gtk_tree_model_iter_next (m, &iter))
{
- const struct variable *var = psppire_var_view_get_variable (vv, 0, &iter);
+ const struct variable *var = psppire_var_view_get_var_from_model (m, 0, &iter);
g_string_append (string, " ");
g_string_append (string, var_get_name (var));
}
}
- g_string_append (string, ".");
+ g_string_append (string, ".\n");
text = string->str;
g_string_free (string, FALSE);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a);
- GtkBuilder *xml = builder_new ("means.ui");
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("means.ui");
+ g_hash_table_insert (thing, a, xml);
- GtkWidget *vb = get_widget_assert (xml, "alignment3");
- act->layer = psppire_means_layer_new ();
- gtk_container_add (GTK_CONTAINER (vb), act->layer);
- gtk_widget_show (act->layer);
+ GtkWidget *vb = get_widget_assert (xml, "frame2");
+ act->layer = psppire_means_layer_new ();
+ gtk_container_add (GTK_CONTAINER (vb), act->layer);
+ gtk_widget_show (act->layer);
+ }
+
+ GtkWidget *selector = get_widget_assert (xml, "layer-selector");
- pda->dialog = get_widget_assert (xml, "means-dialog");
- pda->source = get_widget_assert (xml, "all-variables");
- act->variables = get_widget_assert (xml, "stat-variables");
+ pda->dialog = get_widget_assert (xml, "means-dialog");
+ pda->source = get_widget_assert (xml, "all-variables");
+ act->variables = get_widget_assert (xml, "stat-variables");
g_object_set (pda->source,
"predicate", var_is_numeric,
NULL);
- psppire_means_layer_set_source (PSPPIRE_MEANS_LAYER (act->layer), pda->source);
+ g_object_set (selector,
+ "dest-widget", act->layer,
+ NULL);
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
-
- g_object_unref (xml);
}
static void
psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
{
- GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_means_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_means_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}