Convert descriptives dialog to GtkBuilder

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index b743124d3289008ff005d14e52b019237b5dfb75..9ae69bf1fb51d0383093779fe1c8b09ef9041fc4 100644 (file)
--- 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 aaed7eee2c8b2dd7fd04e265b183e5521eae3f38..e3a6d505115c25ad4b85b7bc259ca7fb88e450e3 100644 (file)
--- 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 dff7078ae51652c36ebd8bc825ee2c55cbd0f666..6ce00df808567786c552a68809a73381a1dad7e3 100644 (file)
--- a/src/ui/gui/descriptives-dialog.glade
+++ b/src/ui/gui/descriptives-dialog.glade
@@ -13,7 +13,7 @@
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox30">
+          <widget class="GtkVBox" id="vbox29">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>