projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Fix temporary filtering by a variable's value.
[pspp]
/
src
/
ui
/
gui
/
reliability-dialog.c
diff --git
a/src/ui/gui/reliability-dialog.c
b/src/ui/gui/reliability-dialog.c
index 9831ab7f66ce7ae20c974cdcdc1593b31a459763..c60f0df504968e25b66c0b670141e38b155b4fa3 100644
(file)
--- 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.
/* 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
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 <config.h>
#include "dialog-common.h"
#include <config.h>
#include "dialog-common.h"
-#include <language/syntax-string-source.h>
#include "reliability-dialog.h"
#include "psppire-selector.h"
#include "psppire-dictview.h"
#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 *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_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);
}
}
@@
-110,13
+113,12
@@
dialog_state_valid (gpointer data)
/* Pops up the Reliability dialog box */
void
/* Pops up the Reliability dialog box */
void
-reliability_dialog (
GObject *o, gpointer data
)
+reliability_dialog (
PsppireDataWindow *de
)
{
struct reliability rd;
gint response;
GtkBuilder *xml = builder_new ("reliability.ui");
{
struct reliability rd;
gint response;
GtkBuilder *xml = builder_new ("reliability.ui");
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "reliability-dialog");
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "reliability-dialog");
@@
-129,6
+131,8
@@
reliability_dialog (GObject *o, gpointer data)
rd.model_combo = get_widget_assert (xml, "combobox1");
rd.split_spinbutton = get_widget_assert (xml, "spinbutton1");
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);
g_signal_connect_swapped (rd.model_combo, "changed",
G_CALLBACK (on_method_change), &rd);
@@
-162,22
+166,10
@@
reliability_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
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:
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;
break;
default:
break;
@@
-208,6
+200,9
@@
generate_syntax (const struct reliability *rd)
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rd->split_spinbutton))
);
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;
g_string_append (string, ".\n");
text = string->str;