#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 "executor.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
rank_dialog (GObject *o, gpointer data)
{
gint response;
- struct data_editor *de = data;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct rank_dialog rd;
g_object_get (de->data_editor, "var-store", &vs, NULL);
- rd.dict = vs->dict;
+ g_object_get (vs, "dictionary", &rd.dict, NULL);
rd.rank_vars = get_widget_assert (builder, "variables-treeview");
rd.group_vars = get_widget_assert (builder, "group-vars-treeview");
rd.dialog = get_widget_assert (builder, "rank-dialog");
G_CALLBACK (on_ntiles_toggle),
rd.ntiles_entry);
- gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), de->parent.window);
+ gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), GTK_WINDOW (de));
- attach_dictionary_to_treeview (GTK_TREE_VIEW (vars),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_set (vars, "dictionary", rd.dict, NULL);
-
- set_dest_model (GTK_TREE_VIEW (rd.rank_vars), vs->dict);
+ set_dest_model (GTK_TREE_VIEW (rd.rank_vars), rd.dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
vars,
NULL,
NULL);
- set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict);
+ set_dest_model (GTK_TREE_VIEW (rd.group_vars), rd.dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
vars,
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
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);
}
break;