const gchar *var_name = gtk_entry_get_text (GTK_ENTRY (rd->variable));
const struct variable *var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name);
- if ( var == NULL)
+ if (var == NULL)
return FALSE;
gtk_entry_set_text (GTK_ENTRY (rd->variable), "");
}
-static void
-psppire_dialog_action_histogram_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_histogram_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("histogram.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("histogram.ui");
pda->dialog = get_widget_assert (xml, "histogram-dialog");
pda->source = get_widget_assert (xml, "dict-view");
+ g_object_set (pda->source,
+ "predicate", var_is_numeric, NULL);
+
act->variable = get_widget_assert (xml, "entry1");
act->curve = get_widget_assert (xml, "curve");
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
+ return xml;
}
static void
psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class)
{
- psppire_dialog_action_set_activation (class, psppire_dialog_action_histogram_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_histogram_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
psppire_dialog_action_histogram_init (PsppireDialogActionHistogram *act)
{
}
-