Separated psppire_selector_set_subjects into two individual functions

[pspp-builds.git] / src / ui / gui / transpose-dialog.c

diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index 09756d3738919bc40f2f314b3d4d924a7a287499..2bc7e7b38073d145b75c6b05c9a0f288a24b59b4 100644 (file)
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -19,7 +19,7 @@
 #include "transpose-dialog.h"
 #include "psppire-selector.h"
 #include "psppire-dialog.h"
-#include "helper.h"
+#include "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
 #include <language/syntax-string-source.h>
@@ -80,6 +80,7 @@ transpose_dialog (GObject *o, gpointer data)
 {
   gint response ;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+  PsppireDict *dict = NULL;
 
   GtkBuilder *xml = builder_new ("psppire.ui");
 
@@ -90,29 +91,26 @@ transpose_dialog (GObject *o, gpointer data)
   GtkWidget *dest = get_widget_assert (xml, "variables-treeview");
   GtkWidget *selector1 = get_widget_assert (xml, "psppire-selector2");
   GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3");
-  GtkWidget *new_name_entry = get_widget_assert (xml, "new-name-entry");
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-                                vs->dict,
-                                GTK_SELECTION_MULTIPLE, NULL);
+  g_object_get (vs, "dictionary", &dict, NULL);
+  g_object_set (source, "model", dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (dest), dict);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-                                source, dest,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector1),
                                 insert_source_row_into_tree_view,
-                                NULL,
                                 NULL);
 
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-                                source, new_name_entry,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector2),
                                 insert_source_row_into_entry,
-                                is_currently_in_entry,
                                 NULL);
 
+  psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
+                                is_currently_in_entry);
+
 
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  xml);
 
@@ -127,7 +125,7 @@ transpose_dialog (GObject *o, gpointer data)
     {
     case GTK_RESPONSE_OK:
       {
-       gchar *syntax = generate_syntax (vs->dict, xml);
+       gchar *syntax = generate_syntax (dict, xml);
 
        struct getl_interface *sss = create_syntax_string_source (syntax);
        execute_syntax (sss);
@@ -137,7 +135,7 @@ transpose_dialog (GObject *o, gpointer data)
       break;
     case PSPPIRE_RESPONSE_PASTE:
       {
-       gchar *syntax = generate_syntax (vs->dict, xml);
+       gchar *syntax = generate_syntax (dict, xml);
         paste_syntax_in_new_window (syntax);
 
        g_free (syntax);