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
/
descriptives-dialog.c
diff --git
a/src/ui/gui/descriptives-dialog.c
b/src/ui/gui/descriptives-dialog.c
index 9d8502de058b34b2cfa301338978ccc69267f4e2..c6343d5bbb7ccfc57d90bc64a6049a51594a5de5 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 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
@@
-23,7
+23,6
@@
#include <gtk/gtk.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <stdlib.h>
-#include <language/syntax-string-source.h>
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
@@
-177,6
+176,9
@@
generate_syntax (const struct descriptives_dialog *scd)
g_string_append (string, ".");
g_string_append (string, ".");
+ if (gtk_toggle_button_get_active (scd->save_z_scores))
+ g_string_append (string, "\nEXECUTE.");
+
text = string->str;
g_string_free (string, FALSE);
text = string->str;
g_string_free (string, FALSE);
@@
-200,10
+202,9
@@
dialog_state_valid (gpointer data)
/* Pops up the Descriptives dialog box */
void
/* Pops up the Descriptives dialog box */
void
-descriptives_dialog (
GObject *o, gpointer data
)
+descriptives_dialog (
PsppireDataWindow *de
)
{
gint response;
{
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct descriptives_dialog scd;
struct descriptives_dialog scd;
@@
-256,21
+257,10
@@
descriptives_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
- paste_syntax_in_new_window (syntax);
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;
break;
default:
break;