X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fregression-dialog.c;h=eaca17e074e49aef32c5cbbb7447ef3c012b94b8;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=2036fa7c2dbbb8a36117a44de569afff52606f16;hpb=4d688b2e05945b3e3c733a005fb2775110ebb78b;p=pspp-builds.git

diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index 2036fa7c..eaca17e0 100644
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -18,19 +18,19 @@
 
 #include "checkbox-treeview.h"
 #include "regression-dialog.h"
+#include "executor.h"
 
 #include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
 #include <stdlib.h>
 
 #include <language/syntax-string-source.h>
-#include <ui/gui/data-editor.h>
+#include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
 #include <ui/gui/helper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
-#include <ui/gui/syntax-editor.h>
+
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -93,7 +93,7 @@ refresh (PsppireDialog *dialog, struct regression_dialog *rd)
 {
   GtkTreeModel *liststore = gtk_tree_view_get_model (rd->dep_vars);
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
-  
+
   liststore = gtk_tree_view_get_model (rd->indep_vars);
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
 }
@@ -215,7 +215,7 @@ dialog_state_valid (gpointer data)
 
   GtkTreeIter notused;
 
-  return (gtk_tree_model_get_iter_first (dep_vars, &notused) 
+  return (gtk_tree_model_get_iter_first (dep_vars, &notused)
     && gtk_tree_model_get_iter_first (indep_vars, &notused));
 }
 
@@ -224,12 +224,10 @@ void
 regression_dialog (GObject *o, gpointer data)
 {
   gint response;
-  struct data_editor *de = data;
-
   struct regression_dialog rd;
 
-  GladeXML *xml = XML_NEW ("regression.glade");
-  GtkSheet *var_sheet;
+  GtkBuilder *xml = builder_new ("regression.ui");
+  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "regression-dialog");
@@ -244,9 +242,8 @@ regression_dialog (GObject *o, gpointer data)
 
   rd.stat_view = get_widget_assert (xml, "stat-view");
 
-  var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
   put_checkbox_items_in_treeview (GTK_TREE_VIEW(rd.stat_view),
 				  B_RG_STATS_DEFAULT,
@@ -254,14 +251,13 @@ regression_dialog (GObject *o, gpointer data)
 				  stats
 				  );
 
-  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 (source),
-				 vs->dict,
-				 GTK_SELECTION_MULTIPLE, NULL);
+  g_object_get (vs, "dictionary", &rd.dict, NULL);
+  g_object_set (source, "dictionary", rd.dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (dest_dep), vs->dict);
-  set_dest_model (GTK_TREE_VIEW (dest_indep), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (dest_dep), rd.dict);
+  set_dest_model (GTK_TREE_VIEW (dest_indep), rd.dict);
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (dep_selector),
 				 source,
@@ -279,7 +275,8 @@ regression_dialog (GObject *o, gpointer data)
 
   rd.dep_vars = GTK_TREE_VIEW (dest_dep);
   rd.indep_vars = GTK_TREE_VIEW (dest_indep);
-  rd.dict = vs->dict;
+
+
   rd.save_dialog = get_widget_assert (xml, "save-dialog");
   rd.pred_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "pred-button"));
   rd.resid_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "resid-button"));
@@ -289,8 +286,8 @@ regression_dialog (GObject *o, gpointer data)
   rd.current_opts.pred = FALSE;
   rd.current_opts.resid = FALSE;
 
-  gtk_window_set_transient_for (GTK_WINDOW (rd.save_dialog), de->parent.window);
-  gtk_window_set_transient_for (GTK_WINDOW (rd.stat_dialog), de->parent.window);
+  gtk_window_set_transient_for (GTK_WINDOW (rd.save_dialog), GTK_WINDOW (de));
+  gtk_window_set_transient_for (GTK_WINDOW (rd.stat_dialog), GTK_WINDOW (de));
 
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  &rd);
 
@@ -310,6 +307,7 @@ regression_dialog (GObject *o, gpointer data)
     case GTK_RESPONSE_OK:
       {
 	gchar *syntax = generate_syntax (&rd);
+
 	struct getl_interface *sss = create_syntax_string_source (syntax);
 	execute_syntax (sss);
 
@@ -319,11 +317,7 @@ regression_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (&rd);
-
-	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);
       }