X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Freliability-dialog.c;h=c60f0df504968e25b66c0b670141e38b155b4fa3;hb=1aa87f10e686eb09df296411d8ebfa28fa151860;hp=e701956b60135ca56dc4404add88333ff9d9cbf2;hpb=64a18d9cb2657b541ebf39c9a064edc92101f2f3;p=pspp-builds.git diff --git a/src/ui/gui/reliability-dialog.c b/src/ui/gui/reliability-dialog.c index e701956b..c60f0df5 100644 --- a/src/ui/gui/reliability-dialog.c +++ b/src/ui/gui/reliability-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009 Free Software Foundation + Copyright (C) 2009, 2010, 2011 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 @@ -17,7 +17,6 @@ #include #include "dialog-common.h" -#include #include "reliability-dialog.h" #include "psppire-selector.h" #include "psppire-dictview.h" @@ -43,6 +42,7 @@ struct reliability GtkWidget *variables; GtkWidget *split_point_hbox; GtkWidget *split_spinbutton; + GtkWidget *scale_if_item_deleted_checkbutton; }; @@ -93,6 +93,9 @@ refresh (PsppireDialog *dialog, struct reliability *rd) gtk_spin_button_set_range (GTK_SPIN_BUTTON (rd->split_spinbutton), 0, 0); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton), + FALSE); } @@ -128,6 +131,8 @@ reliability_dialog (PsppireDataWindow *de) rd.model_combo = get_widget_assert (xml, "combobox1"); rd.split_spinbutton = get_widget_assert (xml, "spinbutton1"); + rd.scale_if_item_deleted_checkbutton = get_widget_assert (xml, "totals-checkbutton"); + g_signal_connect_swapped (rd.model_combo, "changed", G_CALLBACK (on_method_change), &rd); @@ -161,22 +166,10 @@ reliability_dialog (PsppireDataWindow *de) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&rd); - - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&rd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&rd); - paste_syntax_in_new_window (syntax); - - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&rd))); break; default: break; @@ -207,6 +200,9 @@ generate_syntax (const struct reliability *rd) gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rd->split_spinbutton)) ); + if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton))) + g_string_append (string, "\n\t/SUMMARY = TOTAL"); + g_string_append (string, ".\n"); text = string->str;