#include "checkbox-treeview.h"
#include "crosstabs-dialog.h"
+#include "psppire-var-view.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 "executor.h"
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/syntax-editor.h>
+#include <ui/gui/helper.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
GString *string = g_string_new ("CROSSTABS");
g_string_append (string, "\n\t/TABLES=");
- append_variable_names (string, cd->dict, GTK_TREE_VIEW (cd->row_vars), 0);
+ psppire_var_view_append_names (PSPPIRE_VAR_VIEW (cd->row_vars), 0, string);
g_string_append (string, "\tBY\t");
- append_variable_names (string, cd->dict, GTK_TREE_VIEW (cd->col_vars), 0);
+ psppire_var_view_append_names (PSPPIRE_VAR_VIEW (cd->col_vars), 0, string);
g_string_append (string, "\n\t/FORMAT=");
crosstabs_dialog (GObject *o, gpointer data)
{
gint response;
- struct data_editor *de = data;
-
struct crosstabs_dialog cd;
- GladeXML *xml = XML_NEW ("crosstabs.glade");
- GtkSheet *var_sheet;
- PsppireVarStore *vs;
+ GtkBuilder *xml = builder_new ("crosstabs.ui");
+ PsppireVarStore *vs = NULL;
+ PsppireDict *dict = NULL;
+
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+
GtkWidget *dialog = get_widget_assert (xml, "crosstabs-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-treeview");
GtkWidget *dest_rows = get_widget_assert (xml, "rows");
GtkWidget *dest_cols = get_widget_assert (xml, "cols");
- GtkWidget *row_selector = get_widget_assert (xml, "row-selector");
- GtkWidget *col_selector = get_widget_assert (xml, "col-selector");
GtkWidget *format_button = get_widget_assert (xml, "format-button");
GtkWidget *stat_button = get_widget_assert (xml, "stats-button");
GtkWidget *cell_button = get_widget_assert (xml, "cell-button");
cd.stat_view = get_widget_assert (xml, "stats-view");
cd.cell_view = get_widget_assert (xml, "cell-view");
- var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
- vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
put_checkbox_items_in_treeview (GTK_TREE_VIEW(cd.stat_view),
B_CS_STATS_DEFAULT,
cells
);
- 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);
-
- set_dest_model (GTK_TREE_VIEW (dest_rows), vs->dict);
- set_dest_model (GTK_TREE_VIEW (dest_cols), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (row_selector),
- source,
- dest_rows,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (col_selector),
- source,
- dest_cols,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ g_object_get (vs, "dictionary", &dict, NULL);
+ g_object_set (source, "model", dict, NULL);
cd.row_vars = GTK_TREE_VIEW (dest_rows);
cd.col_vars = GTK_TREE_VIEW (dest_cols);
- cd.dict = vs->dict;
+ g_object_get (vs, "dictionary", &cd.dict, NULL);
cd.format_dialog = get_widget_assert (xml, "format-dialog");
cd.table_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "print-tables"));
cd.pivot_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "pivot"));
cd.current_opts.table = TRUE;
cd.current_opts.pivot = TRUE;
- gtk_window_set_transient_for (GTK_WINDOW (cd.format_dialog), de->parent.window);
- gtk_window_set_transient_for (GTK_WINDOW (cd.cell_dialog), de->parent.window);
- gtk_window_set_transient_for (GTK_WINDOW (cd.stat_dialog), de->parent.window);
+ gtk_window_set_transient_for (GTK_WINDOW (cd.format_dialog), GTK_WINDOW (de));
+ gtk_window_set_transient_for (GTK_WINDOW (cd.cell_dialog), GTK_WINDOW (de));
+ gtk_window_set_transient_for (GTK_WINDOW (cd.stat_dialog), GTK_WINDOW (de));
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &cd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
{
gchar *syntax = generate_syntax (&cd);
- 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);
}