Add "dictionary" property to PsppireVarStore and use it.

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

diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index 9e294861fe210a295346da63a5cf6b36e1623580..4e7ac61f5ca94ddd2670ccd8baadfeb65c0529e7 100644 (file)
--- a/src/ui/gui/sort-cases-dialog.c
+++ b/src/ui/gui/sort-cases-dialog.c
@@ -17,15 +17,16 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include "sort-cases-dialog.h"
-#include "helper.h"
+#include "executor.h"
 #include "psppire-dialog.h"
 #include "psppire-data-window.h"
 #include "psppire-var-store.h"
 #include "dialog-common.h"
+#include "psppire-selector.h"
 #include "dict-display.h"
 
 #include <language/syntax-string-source.h>
-#include "psppire-syntax-window.h"
+#include "helper.h"
 
 static void
 refresh (PsppireDialog *dialog, GtkTreeView *dest)
@@ -95,7 +96,7 @@ sort_cases_dialog (GObject *o, gpointer data)
 
   struct sort_cases_dialog scd;
 
-  GladeXML *xml = XML_NEW ("psppire.glade");
+  GtkBuilder *xml = builder_new ("psppire.ui");
 
   GtkWidget *dialog = get_widget_assert   (xml, "sort-cases-dialog");
 
@@ -110,11 +111,10 @@ sort_cases_dialog (GObject *o, gpointer data)
 
   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", &scd.dict, NULL);
+  g_object_set (source, "dictionary", scd.dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (dest), scd.dict);
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
                                 source,
@@ -126,7 +126,6 @@ sort_cases_dialog (GObject *o, gpointer data)
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  dest);
 
   scd.tv = GTK_TREE_VIEW (dest);
-  scd.dict = vs->dict;
   scd.ascending =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));
 
@@ -143,6 +142,7 @@ sort_cases_dialog (GObject *o, gpointer data)
     case GTK_RESPONSE_OK:
       {
        gchar *syntax = generate_syntax (&scd);
+
        struct getl_interface *sss = create_syntax_string_source (syntax);
        execute_syntax (sss);
 
@@ -152,12 +152,7 @@ sort_cases_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
        gchar *syntax = generate_syntax (&scd);
-
-        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);
       }