Factor Dialog: Avoid populating dialog more than once

diff --git a/src/ui/gui/psppire-dialog-action-factor.c b/src/ui/gui/psppire-dialog-action-factor.c
index 8ec9e22849e4e6d001da13fca253a31a4d417e55..de33c5c5fa5a3573c89219e06d36c5fde576c1ad 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-factor.c
+++ b/src/ui/gui/psppire-dialog-action-factor.c
@@ -307,64 +307,65 @@ psppire_dialog_action_factor_activate (GtkAction *a)
     {
       xml = builder_new ("factor.ui");
       g_hash_table_insert (thing, a, xml);
-    }
 
-  pda->dialog = get_widget_assert   (xml, "factor-dialog");
-  pda->source = get_widget_assert   (xml, "dict-view");
 
-  extraction_button = get_widget_assert (xml, "button-extractions");
-  rotation_button = get_widget_assert (xml, "button-rotations");
+      pda->dialog = get_widget_assert   (xml, "factor-dialog");
+      pda->source = get_widget_assert   (xml, "dict-view");
 
-  act->extraction_dialog = get_widget_assert (xml, "extractions-dialog");
-  act->rotation_dialog = get_widget_assert (xml, "rotations-dialog");
+      extraction_button = get_widget_assert (xml, "button-extractions");
+      rotation_button = get_widget_assert (xml, "button-rotations");
 
-  act->variables = get_widget_assert   (xml, "psppire-var-view1");
+      act->extraction_dialog = get_widget_assert (xml, "extractions-dialog");
+      act->rotation_dialog = get_widget_assert (xml, "rotations-dialog");
 
-  {
-    GtkWidget *hbox = get_widget_assert (xml, "hbox6");
-    GtkWidget *eigenvalue_extraction ;
+      act->variables = get_widget_assert   (xml, "psppire-var-view1");
 
-    act->mineigen_toggle = get_widget_assert (xml, "mineigen-radiobutton");
+      {
+       GtkWidget *hbox = get_widget_assert (xml, "hbox6");
+       GtkWidget *eigenvalue_extraction ;
 
-    eigenvalue_extraction = psppire_scanf_new (_("_Eigenvalues over %4.2f times the mean eigenvalue"), &act->mineigen);
+       act->mineigen_toggle = get_widget_assert (xml, "mineigen-radiobutton");
 
-    g_object_set (eigenvalue_extraction,
-                 "use-underline", TRUE,
-                 "mnemonic-widget", act->mineigen_toggle,
-                 NULL);
+       eigenvalue_extraction = psppire_scanf_new (_("_Eigenvalues over %4.2f times the mean eigenvalue"), &act->mineigen);
 
-    act->nfactors_toggle = get_widget_assert (xml, "nfactors-radiobutton");
-    act->n_factors = get_widget_assert (xml, "spinbutton-nfactors");
-    act->extract_iterations = get_widget_assert (xml, "spinbutton-extract-iterations");
-    act->covariance_toggle = get_widget_assert (xml,  "covariance-radiobutton");
-    act->correlation_toggle = get_widget_assert (xml, "correlations-radiobutton");
+       g_object_set (eigenvalue_extraction,
+                     "use-underline", TRUE,
+                     "mnemonic-widget", act->mineigen_toggle,
+                     NULL);
 
-    act->scree_button = get_widget_assert (xml, "scree-button");
-    act->unrotated_button = get_widget_assert (xml, "unrotated-button");
-    act->extraction_combo = get_widget_assert (xml, "combobox1");
+       act->nfactors_toggle = get_widget_assert (xml, "nfactors-radiobutton");
+       act->n_factors = get_widget_assert (xml, "spinbutton-nfactors");
+       act->extract_iterations = get_widget_assert (xml, "spinbutton-extract-iterations");
+       act->covariance_toggle = get_widget_assert (xml,  "covariance-radiobutton");
+       act->correlation_toggle = get_widget_assert (xml, "correlations-radiobutton");
 
-    gtk_container_add (GTK_CONTAINER (hbox), eigenvalue_extraction);
+       act->scree_button = get_widget_assert (xml, "scree-button");
+       act->unrotated_button = get_widget_assert (xml, "unrotated-button");
+       act->extraction_combo = get_widget_assert (xml, "combobox1");
 
-    g_signal_connect (act->nfactors_toggle, "toggled", G_CALLBACK (on_extract_toggle), act);
+       gtk_container_add (GTK_CONTAINER (hbox), eigenvalue_extraction);
 
-    gtk_widget_show_all (eigenvalue_extraction);
-  }
+       g_signal_connect (act->nfactors_toggle, "toggled", G_CALLBACK (on_extract_toggle), act);
 
-  {
-    act->rotate_iterations = get_widget_assert (xml, "spinbutton-rot-iterations");
+       gtk_widget_show_all (eigenvalue_extraction);
+      }
 
-    act->display_rotated_solution = get_widget_assert (xml, "checkbutton-rotated-solution");
+      {
+       act->rotate_iterations = get_widget_assert (xml, "spinbutton-rot-iterations");
 
-    act->rotation_none      = get_widget_assert (xml, "radiobutton-none");
-    act->rotation_varimax   = get_widget_assert (xml, "radiobutton-varimax");
-    act->rotation_quartimax = get_widget_assert (xml, "radiobutton-quartimax");
-    act->rotation_equimax   = get_widget_assert (xml, "radiobutton-equimax");
-  }
+       act->display_rotated_solution = get_widget_assert (xml, "checkbutton-rotated-solution");
 
-  g_signal_connect_swapped (extraction_button, "clicked",
-                           G_CALLBACK (run_extractions_subdialog), act);
-  g_signal_connect_swapped (rotation_button, "clicked", G_CALLBACK (run_rotations_subdialog), act);
+       act->rotation_none      = get_widget_assert (xml, "radiobutton-none");
+       act->rotation_varimax   = get_widget_assert (xml, "radiobutton-varimax");
+       act->rotation_quartimax = get_widget_assert (xml, "radiobutton-quartimax");
+       act->rotation_equimax   = get_widget_assert (xml, "radiobutton-equimax");
+      }
 
+      g_signal_connect_swapped (extraction_button, "clicked",
+                               G_CALLBACK (run_extractions_subdialog), act);
+      g_signal_connect_swapped (rotation_button, "clicked", G_CALLBACK (run_rotations_subdialog), act);
+
+    }
 
   psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);