From 83477e8021833536509416fc98179546e4cfb6a7 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 24 Feb 2009 10:00:30 +0900 Subject: [PATCH] Convert descriptives dialog to GtkBuilder --- src/ui/gui/automake.mk | 3 ++- src/ui/gui/descriptives-dialog.c | 3 ++- src/ui/gui/descriptives-dialog.glade | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index b743124d..9ae69bf1 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -68,6 +68,7 @@ src_ui_gui_psppiredir = $(pkgdatadir) nodist_src_ui_gui_psppire_DATA = \ $(top_builddir)/src/ui/gui/crosstabs.ui \ + $(top_builddir)/src/ui/gui/descriptives-dialog.ui \ $(top_builddir)/src/ui/gui/data-editor.ui \ $(top_builddir)/src/ui/gui/examine.ui \ $(top_builddir)/src/ui/gui/frequencies.ui \ @@ -83,6 +84,7 @@ nodist_src_ui_gui_psppire_DATA = \ EXTRA_DIST += \ $(top_srcdir)/src/ui/gui/crosstabs.glade \ + $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ $(top_srcdir)/src/ui/gui/data-editor.glade \ $(top_srcdir)/src/ui/gui/examine.glade \ $(top_srcdir)/src/ui/gui/frequencies.glade \ @@ -98,7 +100,6 @@ EXTRA_DIST += \ dist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/text-data-import.glade \ - $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ $(top_srcdir)/src/ui/gui/psppicon.png \ $(top_srcdir)/src/ui/gui/pspplogo.png \ $(top_srcdir)/src/ui/gui/icons/value-labels.png \ diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c index aaed7eee..e3a6d505 100644 --- a/src/ui/gui/descriptives-dialog.c +++ b/src/ui/gui/descriptives-dialog.c @@ -206,7 +206,7 @@ descriptives_dialog (GObject *o, gpointer data) struct descriptives_dialog scd; - GladeXML *xml = XML_NEW ("descriptives-dialog.glade"); + GtkBuilder *xml = builder_new ("descriptives-dialog.ui"); GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog"); @@ -229,6 +229,7 @@ descriptives_dialog (GObject *o, gpointer data) set_dest_model (GTK_TREE_VIEW (dest), vs->dict); + psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector), source, dest, diff --git a/src/ui/gui/descriptives-dialog.glade b/src/ui/gui/descriptives-dialog.glade index dff7078a..6ce00df8 100644 --- a/src/ui/gui/descriptives-dialog.glade +++ b/src/ui/gui/descriptives-dialog.glade @@ -13,7 +13,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- 2.30.2