G_DEFINE_TYPE (PsppireDialogActionKRelated, psppire_dialog_action_k_related, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionKRelated *krd = PSPPIRE_DIALOG_ACTION_K_RELATED (act);
gchar *text;
GString *string = g_string_new ("NPAR TEST");
- if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman)))
{
g_string_append (string, "\n\t/FRIEDMAN = ");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
}
- if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal)))
{
g_string_append (string, "\n\t/KENDALL = ");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
}
- if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran)))
{
g_string_append (string, "\n\t/COCHRAN = ");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
return FALSE;
/* At least one checkbutton must be active */
- if (
+ if (
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))
- &&
+ &&
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))
- &&
+ &&
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))
- )
+)
return FALSE;
return TRUE;
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (krd->cochran), FALSE);
}
-static void
-psppire_dialog_action_k_related_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_k_related_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("k-related.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("k-related.ui");
pda->dialog = get_widget_assert (xml, "k-related-dialog");
pda->source = get_widget_assert (xml, "dict-view");
"predicate", var_is_numeric,
NULL);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
{
- psppire_dialog_action_set_activation (class, psppire_dialog_action_k_related_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_k_related_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}