projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separated psppire_selector_set_subjects into two individual functions
[pspp-builds.git]
/
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 db08576f5dd1adac3e45348def6cb4fdecf3f43a..1161db5b8d28edc1fc08f672a605ed32894f336f 100644
(file)
--- a/
src/ui/gui/t-test-one-sample.c
+++ b/
src/ui/gui/t-test-one-sample.c
@@
-17,21
+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 "
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 "psppire-syntax-window.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include <gettext.h>
#define _(msgid) gettext (msgid)
@@
-124,11
+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 = NULL;
PsppireVarStore *vs = NULL;
- G
ladeXML *xml = XML_NEW ("t-test.glade
");
+ G
tkBuilder *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");
@@
-142,25
+141,23
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
-
tt_d.dict = vs->dict
;
+
g_object_get (vs, "dictionary", &tt_d.dict, NULL)
;
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.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)
,
-
vs->
dict,
-
GTK_SELECTION_MULTIPLE
,
-
var_is_numeric
);
+
g_object_set (dict_view, "model"
,
+
tt_d.
dict,
+
"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),
tt_d.
dict);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- dict_view, tt_d.vars_treeview,
+ psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
insert_source_row_into_tree_view,
insert_source_row_into_tree_view,
- NULL,
NULL);
NULL);
@@
-181,6
+178,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);
@@
-191,11
+189,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&tt_d);
{
gchar *syntax = generate_syntax (&tt_d);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}