projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug encodig missing value keys in gui
[pspp]
/
src
/
ui
/
gui
/
t-test-one-sample.c
diff --git
a/src/ui/gui/t-test-one-sample.c
b/src/ui/gui/t-test-one-sample.c
index ba27cf2ddddcb0ae94626076fae3474fe9999422..18bdbb5dd3003f506a73a3b265a449a679541d77 100644
(file)
--- a/
src/ui/gui/t-test-one-sample.c
+++ b/
src/ui/gui/t-test-one-sample.c
@@
-17,22
+17,20
@@
#include <config.h>
#include <config.h>
-#include <glade/glade.h>
#include <gtk/gtk.h>
#include "t-test-one-sample.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
#include <gtk/gtk.h>
#include "t-test-one-sample.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
-#include <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
+#include "executor.h"
#include "t-test-options.h"
#include <language/syntax-string-source.h>
#include "t-test-options.h"
#include <language/syntax-string-source.h>
-#include "syntax-editor.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include <gettext.h>
#define _(msgid) gettext (msgid)
@@
-60,7
+58,7
@@
generate_syntax (const struct tt_one_sample_dialog *d)
g_string_append (str, "\n\t/VARIABLES=");
g_string_append (str, "\n\t/VARIABLES=");
- append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview));
+ append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview)
, 0
);
tt_options_dialog_append_syntax (d->opt, str);
tt_options_dialog_append_syntax (d->opt, str);
@@
-125,14
+123,11
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
{
struct tt_one_sample_dialog tt_d;
gint response;
{
struct tt_one_sample_dialog tt_d;
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
- PsppireVarStore *vs;
+ PsppireVarStore *vs
= NULL
;
- GladeXML *xml = XML_NEW ("t-test.glade");
-
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ GtkBuilder *xml = builder_new ("t-test.ui");
GtkWidget *dict_view =
get_widget_assert (xml, "one-sample-t-test-treeview2");
GtkWidget *dict_view =
get_widget_assert (xml, "one-sample-t-test-treeview2");
@@
-144,19
+139,19
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
-
vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)
);
+
g_object_get (de->data_editor, "var-store", &vs, NULL
);
tt_d.dict = vs->dict;
tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
tt_d.dict = vs->dict;
tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
- tt_d.opt = tt_options_dialog_create (xml,
de->parent.window
);
+ tt_d.opt = tt_options_dialog_create (xml,
GTK_WINDOW (de)
);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
-
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view)
,
+
g_object_set (dict_view, "dictionary"
,
vs->dict,
vs->dict,
-
GTK_SELECTION_MULTIPLE
,
- var_is_numeric);
+
"predicate"
,
+ var_is_numeric
, NULL
);
set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), vs->dict);
set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), vs->dict);
@@
-164,6
+159,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
dict_view, tt_d.vars_treeview,
insert_source_row_into_tree_view,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
dict_view, tt_d.vars_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
NULL);
@@
-184,6
+180,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-194,10
+191,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&tt_d);
{
gchar *syntax = generate_syntax (&tt_d);
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}