Rename psppire_dialog_action_get_pointer -> psppire_dialog_action_get_hash_table

[pspp] / src / ui / gui / psppire-dialog-action-two-sample.c

diff --git a/src/ui/gui/psppire-dialog-action-two-sample.c b/src/ui/gui/psppire-dialog-action-two-sample.c
index 0dd8d65048bbb7c0b63d8242b48947174cb13366..b10ee4c137a8b0cb5f04b875064af325274dcdc2 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-two-sample.c
+++ b/src/ui/gui/psppire-dialog-action-two-sample.c
@@ -174,42 +174,49 @@ psppire_dialog_action_two_sample_activate (GtkAction *a)
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionTwoSample *act = PSPPIRE_DIALOG_ACTION_TWO_SAMPLE (a);
 
-  GtkBuilder *xml = builder_new ("paired-samples.ui");
-  GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("paired-samples.ui");
+      g_hash_table_insert (thing, a, xml);
 
-  pda->dialog = get_widget_assert   (xml, "t-test-paired-samples-dialog");
-  pda->source = get_widget_assert   (xml, "paired-samples-t-test-treeview1");
 
-  gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Two-Related-Samples Tests"));
+      /* NPAR Specific options */
+      GtkWidget *frame = gtk_frame_new (_("Test Type"));
+      GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+      GtkWidget *box = get_widget_assert (xml, "dynamic-populate");
 
-  act->pairs_treeview = get_widget_assert (xml, "paired-samples-t-test-treeview2");
-  act->list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (act->pairs_treeview)));
 
-  {
-    /* NPAR Specific options */
-    GtkWidget *frame = gtk_frame_new (_("Test Type"));
-    GtkWidget *bb = gtk_vbutton_box_new ();
-    GtkWidget *box = get_widget_assert (xml, "vbox3");
+      strcpy (act->nts[NT_WILCOXON].syntax, "/WILCOXON");
+      strcpy (act->nts[NT_SIGN].syntax, "/SIGN");
+      strcpy (act->nts[NT_MCNEMAR].syntax, "/MCNEMAR");
 
+      act->nts[NT_WILCOXON].button = gtk_check_button_new_with_mnemonic (_("_Wilcoxon"));
+      act->nts[NT_SIGN].button = gtk_check_button_new_with_mnemonic (_("_Sign"));
+      act->nts[NT_MCNEMAR].button = gtk_check_button_new_with_mnemonic (_("_McNemar"));
 
-    strcpy (act->nts[NT_WILCOXON].syntax, "/WILCOXON");
-    strcpy (act->nts[NT_SIGN].syntax, "/SIGN");
-    strcpy (act->nts[NT_MCNEMAR].syntax, "/MCNEMAR");
+      gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_WILCOXON].button, FALSE, FALSE, 5);
+      gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_SIGN].button,     FALSE, FALSE, 5);
+      gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_MCNEMAR].button,  FALSE, FALSE, 5);
 
-    act->nts[NT_WILCOXON].button = gtk_check_button_new_with_mnemonic (_("_Wilcoxon"));
-    act->nts[NT_SIGN].button = gtk_check_button_new_with_mnemonic (_("_Sign"));
-    act->nts[NT_MCNEMAR].button = gtk_check_button_new_with_mnemonic (_("_McNemar"));
+      gtk_container_add (GTK_CONTAINER (frame), bb);
 
-    gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_WILCOXON].button, FALSE, FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_SIGN].button,     FALSE, FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_MCNEMAR].button,  FALSE, FALSE, 5);
+      gtk_widget_show_all (frame);
 
-    gtk_container_add (GTK_CONTAINER (frame), bb);
+      gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE,  5);
+    }
 
-    gtk_widget_show_all (frame);
+  GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
+
+  pda->dialog = get_widget_assert   (xml, "t-test-paired-samples-dialog");
+  pda->source = get_widget_assert   (xml, "paired-samples-t-test-treeview1");
+
+  gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Two-Related-Samples Tests"));
+
+  act->pairs_treeview = get_widget_assert (xml, "paired-samples-t-test-treeview2");
+  act->list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (act->pairs_treeview)));
 
-    gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE,  5);
-  }
 
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
@@ -222,8 +229,6 @@ psppire_dialog_action_two_sample_activate (GtkAction *a)
                                    select_as_pair_member,
                                    act);
   
-  g_object_unref (xml);
-
   if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate)
     PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate (pda);
 }
@@ -231,9 +236,7 @@ psppire_dialog_action_two_sample_activate (GtkAction *a)
 static void
 psppire_dialog_action_two_sample_class_init (PsppireDialogActionTwoSampleClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_two_sample_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_two_sample_activate);
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }