#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/psppire-var-view.h>
+#include "executor.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
GString *str = g_string_new ("RANK VARIABLES=");
- append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars), 0);
+ psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->rank_vars), 0, str);
g_string_append_printf (str, " (%c)",
gtk_toggle_button_get_active (rd->ascending_togglebutton)
{
g_string_append (str, "\n\tBY ");
- append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars), 0);
+ psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->group_vars), 0, str);
}
g_string_append (str, "\n\t/PRINT = ");
/* Pops up the Rank dialog box */
void
-rank_dialog (GObject *o, gpointer data)
+rank_dialog (PsppireDataWindow *de)
{
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct rank_dialog rd;
GtkBuilder * builder = builder_new ("rank.ui");
GtkWidget *vars = get_widget_assert (builder, "dict-treeview");
- GtkWidget *selector1 = get_widget_assert (builder, "psppire-selector1");
- GtkWidget *selector2 = get_widget_assert (builder, "psppire-selector2");
-
GtkWidget *types_button = get_widget_assert (builder, "button1");
GtkWidget *ties_button = get_widget_assert (builder, "button2");
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");
gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), GTK_WINDOW (de));
- g_object_set (vars, "dictionary", vs->dict, NULL);
-
- set_dest_model (GTK_TREE_VIEW (rd.rank_vars), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
- vars,
- rd.rank_vars,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
- set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
- vars,
- rd.group_vars,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
+ g_object_set (vars, "model", rd.dict, NULL);
g_signal_connect (types_button, "clicked",
G_CALLBACK (run_types_dialog), &rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
- paste_syntax_in_new_window (syntax);
+ paste_syntax_to_window (syntax);
g_free (syntax);
}
break;