convert labels and missing values dialogs to GtkBuilder

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 0176108d385e3b36923e60e1a51bca78c946084f..e9677386536a96b09fb71d40042f5898857caec9 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/data-editor.ui \
        $(top_builddir)/src/ui/gui/examine.ui \
        $(top_builddir)/src/ui/gui/frequencies.ui \
        $(top_builddir)/src/ui/gui/message-dialog.ui \

diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c
index 4e9682f73544bcdcfae24cf26453b51d3482d8e6..e8027bf8982ca807759ff6f3a461171f862bbb37 100644 (file)
--- a/src/ui/gui/missing-val-dialog.c
+++ b/src/ui/gui/missing-val-dialog.c
@@ -32,7 +32,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <string.h>
 
@@ -221,11 +220,11 @@ on_delete (GtkWidget *w, GdkEvent *e, gpointer data)
 
 /* Creates the dialog structure from the xml */
 struct missing_val_dialog *
-missing_val_dialog_create (GladeXML *xml)
+missing_val_dialog_create (GtkBuilder *xml)
 {
   struct missing_val_dialog *dialog = g_malloc (sizeof (*dialog));
 
-  connect_help (xml);
+  //  connect_help (xml);
 
   dialog->window = get_widget_assert (xml, "missing_values_dialog");
 

diff --git a/src/ui/gui/missing-val-dialog.h b/src/ui/gui/missing-val-dialog.h
index b7fab934aed838fe762bed1f3659bb4ced1690fa..c6a09fc6ca72d1b15a0fbb4fb9b0361e0da682e3 100644 (file)
--- a/src/ui/gui/missing-val-dialog.h
+++ b/src/ui/gui/missing-val-dialog.h
@@ -48,7 +48,7 @@ struct missing_val_dialog
   GtkWidget *discrete;
 };
 
-struct missing_val_dialog * missing_val_dialog_create (GladeXML *xml);
+struct missing_val_dialog * missing_val_dialog_create (GtkBuilder *xml);
 
 void missing_val_dialog_show (struct missing_val_dialog *dialog);
 

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index d914866658b67ca6982505d4aa72f888e5899482..a36bf6f933ddf30c77e83be06dd8d005933283ba 100644 (file)
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -18,7 +18,6 @@
 #include "psppire-var-sheet.h"
 #include <ui/gui/sheet/psppire-axis-impl.h>
 
-#include <glade/glade.h>
 #include "helper.h"
 
 #include "customentry.h"
@@ -486,13 +485,13 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 static void
 psppire_var_sheet_init (PsppireVarSheet *vs)
 {
-  GladeXML *xml = XML_NEW ("data-editor.glade");
+  GtkBuilder *builder = builder_new ("data-editor.ui");
 
-  vs->val_labs_dialog = val_labs_dialog_create (xml);
-  vs->missing_val_dialog = missing_val_dialog_create (xml);
-  vs->var_type_dialog = var_type_dialog_create (xml);
+  vs->val_labs_dialog = val_labs_dialog_create (builder);
+  vs->missing_val_dialog = missing_val_dialog_create (builder);
+  vs->var_type_dialog = var_type_dialog_create (builder);
 
-  g_object_unref (xml);
+  g_object_unref (builder);
 
   vs->dispose_has_run = FALSE;
   vs->may_create_vars = TRUE;

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index d5228e04f4f1f48a72ac7321fcc123345961f706..6cddeb3eba23c7e09aaf54a955bdede63cea9998 100644 (file)
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -364,7 +364,7 @@ on_select_row                  (GtkTreeView *treeview,
 /* Create a new dialog box
    (there should  normally be only one)*/
 struct val_labs_dialog *
-val_labs_dialog_create (GladeXML *xml)
+val_labs_dialog_create (GtkBuilder *xml)
 {
   GtkTreeViewColumn *column;
 
@@ -372,7 +372,7 @@ val_labs_dialog_create (GladeXML *xml)
 
   struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
 
-  connect_help (xml);
+  //  connect_help (xml);
 
   dialog->window = get_widget_assert (xml,"val_labs_dialog");
   dialog->value_entry = get_widget_assert (xml,"value_entry");

diff --git a/src/ui/gui/val-labs-dialog.h b/src/ui/gui/val-labs-dialog.h
index ffe3ed9b85e701f757ccf4ed829e366d00b7dba4..af2cd7117e40093790a5db6dcd847c602d167aff 100644 (file)
--- a/src/ui/gui/val-labs-dialog.h
+++ b/src/ui/gui/val-labs-dialog.h
@@ -32,7 +32,7 @@
 struct val_labs;
 
 
-struct val_labs_dialog * val_labs_dialog_create (GladeXML *);
+struct val_labs_dialog * val_labs_dialog_create (GtkBuilder *);
 
 void val_labs_dialog_show (struct val_labs_dialog *);
 

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index db2e85b5f792bc5b4c5ee96daed8891ae8b0de19..44afc84e816dd47d18f8264e76a9cf9d1d5a462d 100644 (file)
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -324,7 +323,7 @@ set_format_type_from_treeview (GtkTreeView *treeview, gpointer data)
 
 /* Create the structure from the XML definitions */
 struct var_type_dialog *
-var_type_dialog_create (GladeXML *xml)
+var_type_dialog_create (GtkBuilder *xml)
 {
   gint i;
   struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));

diff --git a/src/ui/gui/var-type-dialog.h b/src/ui/gui/var-type-dialog.h
index cab34096c3b812fbb748ad5da676be3bc174746f..536ba465ae6ebd4d4f1a2954fcc6ceb55ca1db9c 100644 (file)
--- a/src/ui/gui/var-type-dialog.h
+++ b/src/ui/gui/var-type-dialog.h
@@ -84,7 +84,7 @@ struct var_type_dialog
 };
 
 
-struct var_type_dialog * var_type_dialog_create (GladeXML *xml);
+struct var_type_dialog * var_type_dialog_create (GtkBuilder *xml);
 
 
 void var_type_dialog_set_variable (struct var_type_dialog *dialog,