/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#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 "psppire-var-view.h"
-#include <language/syntax-string-source.h>
#include "helper.h"
static void
struct sort_cases_dialog
{
- GtkTreeView *tv;
+ PsppireVarView *tv;
PsppireDict *dict;
GtkToggleButton *ascending;
};
dialog_state_valid (gpointer data)
{
struct sort_cases_dialog *scd = data;
- GtkTreeModel *model = gtk_tree_view_get_model (scd->tv);
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (scd->tv));
gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
{
gchar *text;
GString *string = g_string_new ("SORT CASES BY ");
- gint n_vars = append_variable_names (string,
- scd->dict, GTK_TREE_VIEW (scd->tv), 0);
+
+ gint n_vars = psppire_var_view_append_names (scd->tv, 0, string);
if ( n_vars == 0 )
g_string_assign (string, "");
/* Pops up the Sort Cases dialog box */
void
-sort_cases_dialog (GObject *o, gpointer data)
+sort_cases_dialog (PsppireDataWindow *de)
{
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct sort_cases_dialog scd;
- GtkBuilder *xml = builder_new ("psppire.ui");
+ GtkBuilder *xml = builder_new ("sort.ui");
GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "sort-cases-treeview1");
- GtkWidget *selector = get_widget_assert (xml, "sort-cases-selector");
GtkWidget *dest = get_widget_assert (xml, "sort-cases-treeview2");
-
PsppireVarStore *vs = NULL;
g_object_get (de->data_editor, "var-store", &vs, NULL);
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), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+ g_object_set (source, "model", scd.dict, NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest);
- scd.tv = GTK_TREE_VIEW (dest);
- scd.dict = vs->dict;
+ scd.tv = PSPPIRE_VAR_VIEW (dest);
scd.ascending =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
- paste_syntax_in_new_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;