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-paired-samples.c
diff --git
a/src/ui/gui/t-test-paired-samples.c
b/src/ui/gui/t-test-paired-samples.c
index 6b5a6e9e20c92b2320cae84a4a28c656ed816d14..a021ce2c3897e19368a3b87468d3f4ce80c4479b 100644
(file)
--- a/
src/ui/gui/t-test-paired-samples.c
+++ b/
src/ui/gui/t-test-paired-samples.c
@@
-17,22
+17,20
@@
#include <config.h>
#include <gtk/gtk.h>
#include <config.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <language/syntax-string-source.h>
#include <language/syntax-string-source.h>
-#include <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-data-window.h"
+#include "psppire-selector.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "t-test-paired-samples.h"
#include "t-test-options.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "t-test-paired-samples.h"
#include "t-test-options.h"
-#include "dict-display.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
-#include "
syntax-edi
tor.h"
+#include "
execu
tor.h"
#include "helper.h"
#include "helper.h"
@@
-184,38
+182,34
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
{
struct tt_paired_samples_dialog tt_d;
gint response;
{
struct tt_paired_samples_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, "paired-samples-t-test-treeview1");
GtkWidget *dict_view =
get_widget_assert (xml, "paired-samples-t-test-treeview1");
- GtkWidget *options_button = get_widget_assert (xml, "options-button");
+ GtkWidget *options_button = get_widget_assert (xml, "
paired-samples-t-test-
options-button");
GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
GtkWidget *dialog = get_widget_assert (xml, "t-test-paired-samples-dialog");
GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
GtkWidget *dialog = get_widget_assert (xml, "t-test-paired-samples-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
;
+
g_object_get (vs, "dictionary", &tt_d.dict, NULL)
;
tt_d.pairs_treeview =
get_widget_assert (xml, "paired-samples-t-test-treeview2");
tt_d.pairs_treeview =
get_widget_assert (xml, "paired-samples-t-test-treeview2");
- 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);
{
tt_d.list_store =
{
tt_d.list_store =
@@
-234,13
+228,9
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
}
}
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- dict_view,
- tt_d.pairs_treeview,
- select_as_pair_member,
- NULL,
- &tt_d);
-
+ psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
+ select_as_pair_member,
+ &tt_d);
g_signal_connect_swapped (dialog, "refresh",
G_CALLBACK (refresh), &tt_d);
g_signal_connect_swapped (dialog, "refresh",
G_CALLBACK (refresh), &tt_d);
@@
-259,6
+249,7
@@
t_test_paired_samples_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);
@@
-268,11
+259,7
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
case PSPPIRE_RESPONSE_PASTE:
{
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);
}