Paired Samples Dialog: Fix broken logic

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

diff --git a/src/ui/gui/psppire-dialog-action-paired.c b/src/ui/gui/psppire-dialog-action-paired.c
index 558e86f52c70688cff95474142228f669f2eafd2..fdd9a2b34df352fa412507214b6b5c5ab32ef3bc 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-paired.c
+++ b/src/ui/gui/psppire-dialog-action-paired.c
@@ -161,34 +161,41 @@ psppire_dialog_action_paired_activate (GtkAction *a)
     {
       xml = builder_new ("paired-samples.ui");
       g_hash_table_insert (thing, a, xml);
-    }
+      
+      GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
+      GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+      GtkWidget *button = gtk_button_new_with_mnemonic (_("O_ptions..."));
+      GtkWidget *box = get_widget_assert (xml, "dynamic-populate");
 
-  GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
-  GtkWidget *button = get_widget_assert (xml, "option-button");
+      pda->dialog = get_widget_assert   (xml, "t-test-paired-samples-dialog");
+      pda->source = get_widget_assert   (xml, "paired-samples-t-test-treeview1");
 
-  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), _("Paired Samples T Test"));
 
-  gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Paired Samples T Test"));
+      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)));
 
-  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)));
+      act->opt = tt_options_dialog_create (GTK_WINDOW (pda->toplevel));
 
-  act->opt = tt_options_dialog_create (GTK_WINDOW (pda->toplevel));
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (tt_options_dialog_run), act->opt);
 
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (tt_options_dialog_run), act->opt);
 
+      gtk_box_pack_start (GTK_BOX (bb), button, TRUE, TRUE, 5);
+      gtk_box_pack_start (GTK_BOX (box), bb, FALSE, FALSE, 5);
+      gtk_widget_show_all (box);
  
-  psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
-  psppire_dialog_action_set_refresh (pda, refresh);
 
-  g_object_set (pda->source,
-               "predicate", var_is_numeric,
-               NULL);
+      psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
+      psppire_dialog_action_set_refresh (pda, refresh);
+
+      g_object_set (pda->source,
+                   "predicate", var_is_numeric,
+                   NULL);
 
-  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
-                                   select_as_pair_member,
-                                   act);
+      psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
+                                       select_as_pair_member,
+                                       act);
+    }
   
   if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate)
     PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate (pda);