X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftranspose-dialog.c;h=2bc7e7b38073d145b75c6b05c9a0f288a24b59b4;hb=b94025a12799b6826a772731b8f58907dca2cf5c;hp=beed72d731590eb4089d442a41e684545e2be6da;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c index beed72d7..2bc7e7b3 100644 --- a/src/ui/gui/transpose-dialog.c +++ b/src/ui/gui/transpose-dialog.c @@ -80,6 +80,7 @@ transpose_dialog (GObject *o, gpointer data) { gint response ; PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + PsppireDict *dict = NULL; GtkBuilder *xml = builder_new ("psppire.ui"); @@ -90,27 +91,26 @@ transpose_dialog (GObject *o, gpointer data) GtkWidget *dest = get_widget_assert (xml, "variables-treeview"); GtkWidget *selector1 = get_widget_assert (xml, "psppire-selector2"); GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3"); - GtkWidget *new_name_entry = get_widget_assert (xml, "new-name-entry"); g_object_get (de->data_editor, "var-store", &vs, NULL); - g_object_set (source, "dictionary", vs->dict, NULL); + g_object_get (vs, "dictionary", &dict, NULL); + g_object_set (source, "model", dict, NULL); - set_dest_model (GTK_TREE_VIEW (dest), vs->dict); + set_dest_model (GTK_TREE_VIEW (dest), dict); - psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1), - source, dest, + psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector1), insert_source_row_into_tree_view, - NULL, NULL); - psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2), - source, new_name_entry, + psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector2), insert_source_row_into_entry, - is_currently_in_entry, NULL); + psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2), + is_currently_in_entry); + g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml); @@ -125,7 +125,7 @@ transpose_dialog (GObject *o, gpointer data) { case GTK_RESPONSE_OK: { - gchar *syntax = generate_syntax (vs->dict, xml); + gchar *syntax = generate_syntax (dict, xml); struct getl_interface *sss = create_syntax_string_source (syntax); execute_syntax (sss); @@ -135,7 +135,7 @@ transpose_dialog (GObject *o, gpointer data) break; case PSPPIRE_RESPONSE_PASTE: { - gchar *syntax = generate_syntax (vs->dict, xml); + gchar *syntax = generate_syntax (dict, xml); paste_syntax_in_new_window (syntax); g_free (syntax);