X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffactor-dialog.c;h=3385505fc388a676a7ada1ae3ef721dd55b17ab6;hb=refs%2Fbuilds%2F20120213030503%2Fpspp;hp=e0b9f4fa381aeef158fd549f900dfdf5fb47d56b;hpb=0c5217288cb57d0994d4c99997f5341e2c3a6871;p=pspp diff --git a/src/ui/gui/factor-dialog.c b/src/ui/gui/factor-dialog.c index e0b9f4fa38..3385505fc3 100644 --- a/src/ui/gui/factor-dialog.c +++ b/src/ui/gui/factor-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009, 2010 Free Software Foundation + Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,10 +28,11 @@ #include "psppire-data-window.h" #include "psppire-var-view.h" -#include "widget-io.h" +#include "psppire-scanf.h" #include "executor.h" #include "helper.h" +#include "builder-wrapper.h" #include @@ -340,10 +341,18 @@ factor_dialog (PsppireDataWindow *dw) { GtkWidget *hbox = get_widget_assert (fd.xml, "hbox6"); - GtkWidget *eigenvalue_extraction = widget_scanf (_("Eigenvalues over %4.2f times the mean eigenvalue"), &fd.mineigen); + GtkWidget *eigenvalue_extraction ; - fd.nfactors_toggle = get_widget_assert (fd.xml, "nfactors-radiobutton"); fd.mineigen_toggle = get_widget_assert (fd.xml, "mineigen-radiobutton"); + + eigenvalue_extraction = psppire_scanf_new (_("_Eigenvalues over %4.2f times the mean eigenvalue"), &fd.mineigen); + + g_object_set (eigenvalue_extraction, + "use-underline", TRUE, + "mnemonic-widget", fd.mineigen_toggle, + NULL); + + fd.nfactors_toggle = get_widget_assert (fd.xml, "nfactors-radiobutton"); fd.n_factors = get_widget_assert (fd.xml, "spinbutton-nfactors"); fd.extract_iterations = get_widget_assert (fd.xml, "spinbutton-extract-iterations"); fd.covariance_toggle = get_widget_assert (fd.xml, "covariance-radiobutton"); @@ -399,7 +408,7 @@ factor_dialog (PsppireDataWindow *dw) switch (response) { case GTK_RESPONSE_OK: - g_free (execute_syntax_string (generate_syntax (&fd))); + g_free (execute_syntax_string (dw, generate_syntax (&fd))); break; case PSPPIRE_RESPONSE_PASTE: g_free (paste_syntax_to_window (generate_syntax (&fd)));