X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Freliability-dialog.c;h=8587b723f023eea6234aaadf344e3d075c53905e;hb=8f69116a2c31b8aed0527e225c368b3466da6c8d;hp=3d661a5c50695a76929ba2191b809256e5cf80a6;hpb=c81ed3d3c60ca7d576ef9d3d9c9d6863d6f11bf5;p=pspp diff --git a/src/ui/gui/reliability-dialog.c b/src/ui/gui/reliability-dialog.c index 3d661a5c50..8587b723f0 100644 --- a/src/ui/gui/reliability-dialog.c +++ b/src/ui/gui/reliability-dialog.c @@ -24,6 +24,7 @@ #include "psppire-dialog.h" #include "psppire-data-window.h" +#include "psppire-var-view.h" #include "executor.h" #include "helper.h" @@ -109,20 +110,17 @@ dialog_state_valid (gpointer data) /* Pops up the Reliability dialog box */ void -reliability_dialog (GObject *o, gpointer data) +reliability_dialog (PsppireDataWindow *de) { struct reliability rd; gint response; GtkBuilder *xml = builder_new ("reliability.ui"); - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); PsppireVarStore *vs; GtkWidget *dialog = get_widget_assert (xml, "reliability-dialog"); GtkWidget *source = get_widget_assert (xml, "dict-view"); - GtkWidget *selector = get_widget_assert (xml, "psppire-selector1"); - rd.split_point_hbox = get_widget_assert (xml, "split-point-hbox"); rd.variables = get_widget_assert (xml, "treeview2"); @@ -140,12 +138,6 @@ reliability_dialog (GObject *o, gpointer data) g_object_get (vs, "dictionary", &rd.dict, NULL); g_object_set (source, "model", rd.dict, NULL); - set_dest_model (GTK_TREE_VIEW (rd.variables), rd.dict); - - psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), - insert_source_row_into_tree_view, - NULL); - { GtkTreeModel *tm = gtk_tree_view_get_model (GTK_TREE_VIEW (rd.variables)); @@ -181,7 +173,7 @@ reliability_dialog (GObject *o, gpointer data) case PSPPIRE_RESPONSE_PASTE: { gchar *syntax = generate_syntax (&rd); - paste_syntax_in_new_window (syntax); + paste_syntax_to_window (syntax); g_free (syntax); } @@ -203,7 +195,7 @@ generate_syntax (const struct reliability *rd) GString *string = g_string_new ("RELIABILITY"); g_string_append (string, "\n\t/VARIABLES="); - append_variable_names (string, rd->dict, GTK_TREE_VIEW (rd->variables), 0); + psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->variables), 0, string); g_string_append (string, "\n\t/MODEL=");