X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ft-test-one-sample.c;h=02d3eff345d780631500ea0419b460b958406fb8;hb=e8fb3677342a64a1d93825e5f158d1612561a033;hp=f92a32f92eaf3c3dcd39e71e01368a641cf24518;hpb=0bd0098aec2ee31d9460c8d4c1263d0b5ccc4324;p=pspp

diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index f92a32f92e..02d3eff345 100644
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -17,22 +17,21 @@
 
 
 #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 <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-var-view.h"
+#include "builder-wrapper.h"
+#include "psppire-data-window.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 "syntax-editor.h"
+#include "helper.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -60,7 +59,7 @@ generate_syntax (const struct tt_one_sample_dialog *d)
 
   g_string_append (str, "\n\t/VARIABLES=");
 
-  append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview), 0);
+  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (d->vars_treeview), 0, str);
 
   tt_options_dialog_append_syntax (d->opt, str);
 
@@ -121,18 +120,14 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the dialog box */
 void
-t_test_one_sample_dialog (GObject *o, gpointer data)
+t_test_one_sample_dialog (PsppireDataWindow *de)
 {
   struct tt_one_sample_dialog tt_d;
   gint response;
-  struct data_editor *de = data;
-
-  PsppireVarStore *vs;
 
-  GladeXML *xml = XML_NEW ("t-test.glade");
+  PsppireVarStore *vs = NULL;
 
-  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");
@@ -140,33 +135,21 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
   GtkWidget *options_button =
     get_widget_assert (xml, "button1");
 
-  GtkWidget *selector = get_widget_assert (xml, "psppire-selector1");
-
   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;
+  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.opt = tt_options_dialog_create (xml, de->parent.window);
-
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
-
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
-				 vs->dict,
-				 GTK_SELECTION_MULTIPLE,
-				 var_is_numeric);
+  tt_d.opt = tt_options_dialog_create (GTK_WINDOW (de));
 
-  set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), vs->dict);
-
-
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
-				 dict_view, tt_d.vars_treeview,
-				 insert_source_row_into_tree_view,
-				 NULL,
-				 NULL);
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
+  g_object_set (dict_view, "model",
+		tt_d.dict,
+		"predicate",
+		var_is_numeric, NULL);
 
   g_signal_connect_swapped (dialog, "refresh",
 			    G_CALLBACK (refresh),  &tt_d);
@@ -183,25 +166,10 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-	gchar *syntax = generate_syntax (&tt_d);
-	struct getl_interface *sss = create_syntax_string_source (syntax);
-	execute_syntax (sss);
-
-	g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&tt_d)));
       break;
     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);
-
-	g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&tt_d)));
       break;
     default:
       break;