parallel members to arrays

[pspp] / src / ui / gui / psppire-dialog-action-1sks.c

diff --git a/src/ui/gui/psppire-dialog-action-1sks.c b/src/ui/gui/psppire-dialog-action-1sks.c
index c79ebc577930eb248b95124fba6af364a36e8608..f0654c6b714f0c8a400ad18b8a9fe6a0d6bd22b1 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-1sks.c
+++ b/src/ui/gui/psppire-dialog-action-1sks.c
@@ -43,32 +43,32 @@ append_fragment (GString *string, const gchar *dist, PsppireVarView *vv)
 {
   g_string_append (string, "\n\t/KOLMOGOROV-SMIRNOV");
 
-  g_string_append (string, " ( ");
+  g_string_append (string, " (");
   g_string_append (string, dist);
-  g_string_append (string, " ) = ");
+  g_string_append (string, ") = ");
 
   psppire_var_view_append_names (vv, 0, string);
 }
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogAction1sks *rd = PSPPIRE_DIALOG_ACTION_1SKS (act);
   gchar *text;
 
   GString *string = g_string_new ("NPAR TEST");
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_NORMAL])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_NORMAL])))
     append_fragment (string, "NORMAL", PSPPIRE_VAR_VIEW (rd->variables));
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_UNIFORM])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_UNIFORM])))
     append_fragment (string, "UNIFORM", PSPPIRE_VAR_VIEW (rd->variables));
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_POISSON])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_POISSON])))
     append_fragment (string, "POISSON", PSPPIRE_VAR_VIEW (rd->variables));
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_EXPONENTIAL])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_EXPONENTIAL])))
     append_fragment (string, "EXPONENTIAL", PSPPIRE_VAR_VIEW (rd->variables));
 
   g_string_append (string, ".\n");
@@ -94,10 +94,10 @@ dialog_state_valid (gpointer data)
 
   for (i = 0; i < 4; ++i)
     {
-      if ( TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i])))
+      if (TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i])))
        break;
     }
-  if ( i >= 4)
+  if (i >= 4)
     return FALSE;
 
   return TRUE;
@@ -116,19 +116,13 @@ refresh (PsppireDialogAction *rd_)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->cb[i]), FALSE);
 }
 
-static void
-psppire_dialog_action_1sks_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_1sks_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("ks-one-sample.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
+  GtkBuilder *xml = builder_new ("ks-one-sample.ui");
 
   pda->dialog = get_widget_assert   (xml, "ks-one-sample-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
@@ -142,15 +136,13 @@ psppire_dialog_action_1sks_activate (PsppireDialogAction *a)
 
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_1sks_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_1sks_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_1sks_class_init (PsppireDialogAction1sksClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_1sks_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_1sks_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }