From: John Darrington Date: Sun, 4 Jan 2009 08:30:30 +0000 (+0900) Subject: Merge commit 'HEAD'; commit 'master/master' X-Git-Tag: v0.7.3~296^2~8^2~1 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6bcae693f035491ae0625f301f3e630c1335555;hp=31bd57d71cdbdc32082c32c255822122b7d69fab;p=pspp-builds.git Merge commit 'HEAD'; commit 'master/master' Conflicts: src/ui/gui/crosstabs-dialog.c src/ui/gui/goto-case-dialog.c src/ui/gui/helper.c src/ui/gui/regression-dialog.c --- diff --git a/configure.ac b/configure.ac index 1abc8043..7a67e600 100644 --- a/configure.ac +++ b/configure.ac @@ -46,9 +46,6 @@ AC_ARG_WITH( [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])]) required_gtk_version=2.12 -if test x"$enable_anachronistic_dependencies" = x"yes" ; then - required_gtk_version=2.8.20 -fi if test x"$with_gui" != x"no" ; then PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,, diff --git a/src/ui/gui/.gitignore b/src/ui/gui/.gitignore index 5ecf6695..765b529f 100644 --- a/src/ui/gui/.gitignore +++ b/src/ui/gui/.gitignore @@ -1 +1,2 @@ psppire +*.ui diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c index e743fcf6..23ae5b06 100644 --- a/src/ui/gui/about.c +++ b/src/ui/gui/about.c @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -31,7 +30,7 @@ const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL}; void about_new (GtkMenuItem *m, GtkWindow *parent) { - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *about = get_widget_assert (xml, "aboutdialog1"); diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 895723a2..dbf3a902 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -64,22 +64,36 @@ src_ui_gui_psppire_LDADD = \ src_ui_gui_psppiredir = $(pkgdatadir) -dist_src_ui_gui_psppire_DATA = \ - $(top_srcdir)/src/ui/gui/data-editor.glade \ - $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ - $(top_srcdir)/src/ui/gui/examine.glade \ +nodist_src_ui_gui_psppire_DATA = \ + $(top_srcdir)/src/ui/gui/crosstabs.ui \ + $(top_srcdir)/src/ui/gui/examine.ui \ + $(top_srcdir)/src/ui/gui/frequencies.ui \ + $(top_srcdir)/src/ui/gui/message-dialog.ui \ + $(top_srcdir)/src/ui/gui/psppire.ui \ + $(top_srcdir)/src/ui/gui/oneway.ui \ + $(top_srcdir)/src/ui/gui/rank.ui \ + $(top_srcdir)/src/ui/gui/recode.ui \ + $(top_srcdir)/src/ui/gui/regression.ui \ + $(top_srcdir)/src/ui/gui/t-test.ui + +EXTRA_DIST += \ $(top_srcdir)/src/ui/gui/crosstabs.glade \ + $(top_srcdir)/src/ui/gui/examine.glade \ $(top_srcdir)/src/ui/gui/frequencies.glade \ $(top_srcdir)/src/ui/gui/message-dialog.glade \ - $(top_srcdir)/src/ui/gui/oneway.glade \ - $(top_srcdir)/src/ui/gui/output-viewer.glade \ $(top_srcdir)/src/ui/gui/psppire.glade \ + $(top_srcdir)/src/ui/gui/oneway.glade \ $(top_srcdir)/src/ui/gui/rank.glade \ $(top_srcdir)/src/ui/gui/recode.glade \ $(top_srcdir)/src/ui/gui/regression.glade \ + $(top_srcdir)/src/ui/gui/t-test.glade + +dist_src_ui_gui_psppire_DATA = \ + $(top_srcdir)/src/ui/gui/data-editor.glade \ + $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ + $(top_srcdir)/src/ui/gui/output-viewer.glade \ $(top_srcdir)/src/ui/gui/syntax-editor.glade \ $(top_srcdir)/src/ui/gui/text-data-import.glade \ - $(top_srcdir)/src/ui/gui/t-test.glade \ $(top_srcdir)/src/ui/gui/psppicon.png \ $(top_srcdir)/src/ui/gui/pspplogo.png \ $(top_srcdir)/src/ui/gui/icons/value-labels.png \ @@ -209,8 +223,6 @@ nodist_src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-marshal.h - - yelp-check: @if ! yelp --version > /dev/null 2>&1 ; then \ echo ; \ @@ -230,6 +242,9 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list glib-genmarshal --header --prefix=psppire_marshal $< > $@ +.glade.ui: + gtk-builder-convert $< $@ + EXTRA_DIST += src/ui/gui/OChangeLog\ src/ui/gui/marshaller-list diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c index 34c9957d..49d143cb 100644 --- a/src/ui/gui/comments-dialog.c +++ b/src/ui/gui/comments-dialog.c @@ -30,7 +30,6 @@ #include "dialog-common.h" #include -#include #include @@ -40,7 +39,7 @@ struct comment_dialog { - GladeXML *xml; + GtkBuilder *xml; PsppireDict *dict; }; @@ -99,7 +98,7 @@ comments_dialog (GObject *o, gpointer data) PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); struct comment_dialog cd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "comments-dialog"); GtkWidget *textview = get_widget_assert (xml, "comments-textview1"); diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c index 96ea6630..7269ab79 100644 --- a/src/ui/gui/compute-dialog.c +++ b/src/ui/gui/compute-dialog.c @@ -47,7 +47,7 @@ static void insert_source_row_into_text_view (GtkTreeIter iter, struct compute_dialog { - GladeXML *xml; /* The xml that generated the widgets */ + GtkBuilder *xml; /* The xml that generated the widgets */ PsppireDict *dict; gboolean use_type; }; @@ -113,7 +113,7 @@ erase_selection (GtkTextBuffer *buffer) static void on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *rhs = get_widget_assert (xml, "compute-textview1"); @@ -137,7 +137,7 @@ on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data) static void erase (PsppireKeypad *kp, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *rhs = get_widget_assert (xml, "compute-textview1"); @@ -370,7 +370,7 @@ compute_dialog (GObject *o, gpointer data) PsppireVarStore *vs = NULL; struct compute_dialog scd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog"); diff --git a/src/ui/gui/compute-dialog.h b/src/ui/gui/compute-dialog.h index 8f16b5f6..3611865e 100644 --- a/src/ui/gui/compute-dialog.h +++ b/src/ui/gui/compute-dialog.h @@ -19,8 +19,6 @@ #include -#include - void compute_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c index 9654a27c..188c4aaa 100644 --- a/src/ui/gui/crosstabs-dialog.c +++ b/src/ui/gui/crosstabs-dialog.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include "helper.h" #include #include #include @@ -387,8 +387,7 @@ crosstabs_dialog (GObject *o, gpointer data) gint response; struct crosstabs_dialog cd; - GladeXML *xml = XML_NEW ("crosstabs.glade"); - + GtkBuilder *xml = builder_new ("crosstabs.ui"); PsppireVarStore *vs = NULL; PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); diff --git a/src/ui/gui/crosstabs-dialog.h b/src/ui/gui/crosstabs-dialog.h index 33349b90..11da9814 100644 --- a/src/ui/gui/crosstabs-dialog.h +++ b/src/ui/gui/crosstabs-dialog.h @@ -19,7 +19,6 @@ #include -#include void crosstabs_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/examine-dialog.c b/src/ui/gui/examine-dialog.c index 3c11a08a..171d88cf 100644 --- a/src/ui/gui/examine-dialog.c +++ b/src/ui/gui/examine-dialog.c @@ -240,9 +240,7 @@ examine_dialog (GObject *o, gpointer data) struct examine_dialog ex_d; - - GladeXML *xml = XML_NEW ("examine.glade"); - + GtkBuilder *xml = builder_new ("examine.ui"); GtkWidget *dialog = get_widget_assert (xml, "examine-dialog"); GtkWidget *source = get_widget_assert (xml, "treeview1"); diff --git a/src/ui/gui/examine-dialog.h b/src/ui/gui/examine-dialog.h index b8e70272..d8e3fb6c 100644 --- a/src/ui/gui/examine-dialog.h +++ b/src/ui/gui/examine-dialog.h @@ -19,8 +19,6 @@ #include -#include - void examine_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index ad9bf842..130b25cf 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -37,7 +37,6 @@ which match particular strings */ #include #include -#include #include #include "xalloc.h" @@ -52,7 +51,7 @@ which match particular strings */ struct find_dialog { - GladeXML *xml; + GtkBuilder *xml; PsppireDict *dict; struct datasheet *data; PsppireDataWindow *de; @@ -200,7 +199,7 @@ find_dialog (GObject *o, gpointer data) PsppireVarStore *vs ; PsppireDataStore *ds ; - fd.xml = XML_NEW ("psppire.glade"); + fd.xml = builder_new ("psppire.ui"); fd.de = de; find_button = gtk_button_new_from_stock (GTK_STOCK_FIND); diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c index 978bfcd2..37e301b8 100644 --- a/src/ui/gui/frequencies-dialog.c +++ b/src/ui/gui/frequencies-dialog.c @@ -311,7 +311,7 @@ frequencies_dialog (GObject *o, gpointer data) struct frequencies_dialog fd; - GladeXML *xml = XML_NEW ("frequencies.glade"); + GtkBuilder *xml = builder_new ("frequencies.ui"); GtkWidget *dialog = get_widget_assert (xml, "frequencies-dialog"); GtkWidget *source = get_widget_assert (xml, "dict-treeview"); diff --git a/src/ui/gui/frequencies-dialog.h b/src/ui/gui/frequencies-dialog.h index 90990a41..f4d44f35 100644 --- a/src/ui/gui/frequencies-dialog.h +++ b/src/ui/gui/frequencies-dialog.h @@ -19,8 +19,6 @@ #include -#include - void frequencies_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c index 57db5865..9a523943 100644 --- a/src/ui/gui/goto-case-dialog.c +++ b/src/ui/gui/goto-case-dialog.c @@ -24,7 +24,7 @@ static void -refresh (const PsppireDataWindow *de, GladeXML *xml) +refresh (const PsppireDataWindow *de, GtkBuilder *xml) { PsppireDataStore *ds = NULL; casenumber case_count ; @@ -43,7 +43,7 @@ void goto_case_dialog (GObject *o, gpointer data) { gint response; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); GtkWidget *dialog = get_widget_assert (xml, "goto-case-dialog"); diff --git a/src/ui/gui/goto-case-dialog.h b/src/ui/gui/goto-case-dialog.h index 536ccb08..7b3da66d 100644 --- a/src/ui/gui/goto-case-dialog.h +++ b/src/ui/gui/goto-case-dialog.h @@ -19,8 +19,6 @@ #include -#include - void goto_case_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 12003e2a..1d4ae027 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -102,14 +103,35 @@ text_to_value (const gchar *text, union value *v, } +GtkBuilder * +builder_new_real (const gchar *name) +{ + GtkBuilder *builder = gtk_builder_new (); + + GError *err = NULL; + if ( ! gtk_builder_add_from_file (builder, name, &err)) + { + g_critical ("Couldnt open user interface file %s: %s", name, err->message); + g_clear_error (&err); + } + + return builder; +} + + + GtkWidget * -get_widget_assert (GladeXML *xml, const gchar *name) +get_widget_assert (gpointer x, const gchar *name) { - GtkWidget *w; - g_assert (xml); + GObject *obj = G_OBJECT (x); + GtkWidget *w = NULL; g_assert (name); - w = glade_xml_get_widget (xml, name); + if (GTK_IS_BUILDER (obj)) + w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name)); + + if (GLADE_IS_XML (obj)) + w = glade_xml_get_widget (GLADE_XML (obj), name); if ( !w ) g_critical ("Widget \"%s\" could not be found\n", name); @@ -299,8 +321,6 @@ clone_list_store (const GtkListStore *src) } - - void paste_syntax_in_new_window (const gchar *syntax) { diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h index 25ff0aa0..d388ccb4 100644 --- a/src/ui/gui/helper.h +++ b/src/ui/gui/helper.h @@ -47,7 +47,7 @@ gchar * value_to_text (union value v, struct fmt_spec format); gboolean text_to_value (const gchar *text, union value *v, struct fmt_spec format); -GtkWidget * get_widget_assert (GladeXML *xml, const gchar *name); +GtkWidget * get_widget_assert (gpointer x, const gchar *name); /* Converts a string in the pspp locale to utf-8 */ char * pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err); @@ -64,12 +64,9 @@ gboolean execute_syntax (struct getl_interface *sss); glade_xml_new (relocate(PKGDATADIR "/" FILE), NULL, NULL) -void marshaller_VOID__INT_INT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); +#define builder_new(NAME) builder_new_real (relocate (PKGDATADIR "/" NAME)) + +GtkBuilder *builder_new_real (const gchar *name); /* Create a deep copy of SRC */ diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c index d0f02dfa..866f8c6d 100644 --- a/src/ui/gui/message-dialog.c +++ b/src/ui/gui/message-dialog.c @@ -31,7 +31,6 @@ #include -#include #include #include "helper.h" @@ -49,7 +48,7 @@ static GQueue *late_queue; static int error_cnt, warning_cnt, note_cnt; -static GladeXML *message_xml; +static GtkBuilder *message_xml; static GtkWidget *message_dialog; void @@ -60,7 +59,7 @@ message_dialog_init (struct source_stream *ss) late_queue = g_queue_new (); error_cnt = warning_cnt = note_cnt = 0; msg_init (ss, enqueue_msg); - message_xml = XML_NEW ("message-dialog.glade"); + message_xml = builder_new ("message-dialog.ui"); message_dialog = get_widget_assert (message_xml, "message-dialog"); } diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c index 45e88807..d41b2760 100644 --- a/src/ui/gui/oneway-anova-dialog.c +++ b/src/ui/gui/oneway-anova-dialog.c @@ -17,7 +17,6 @@ #include -#include #include #include "oneway-anova-dialog.h" #include "psppire-dict.h" @@ -121,6 +120,7 @@ refresh (struct oneway_anova_dialog *ow) } + /* Pops up the dialog box */ void oneway_anova_dialog (GObject *o, gpointer data) @@ -130,43 +130,43 @@ oneway_anova_dialog (GObject *o, gpointer data) PsppireVarStore *vs = NULL; - GladeXML *xml = XML_NEW ("oneway.glade"); - struct oneway_anova_dialog ow; + GtkBuilder *builder = builder_new ("oneway.ui"); + GtkWidget *dict_view = - get_widget_assert (xml, "oneway-anova-treeview1"); + get_widget_assert (builder, "oneway-anova-treeview1"); GtkWidget *selector2 = - get_widget_assert (xml, "oneway-anova-selector2"); + get_widget_assert (builder, "oneway-anova-selector2"); GtkWidget *selector1 = - get_widget_assert (xml, "oneway-anova-selector1"); + get_widget_assert (builder, "oneway-anova-selector1"); GtkWidget *contrasts_button = - get_widget_assert (xml, "contrasts-button"); + get_widget_assert (builder, "contrasts-button"); g_signal_connect_swapped (contrasts_button, "clicked", G_CALLBACK (run_contrasts_dialog), &ow); - ow.factor_entry = get_widget_assert (xml, "oneway-anova-entry"); + ow.factor_entry = get_widget_assert (builder, "oneway-anova-entry"); ow.vars_treeview = - get_widget_assert (xml, "oneway-anova-treeview2"); + get_widget_assert (builder, "oneway-anova-treeview2"); ow.descriptives = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton1")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton1")); ow.homogeneity = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton2")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton2")); g_object_get (de->data_editor, "var-store", &vs, NULL); ow.dict = vs->dict; ow.dialog = - GTK_WINDOW (get_widget_assert (xml, "oneway-anova-dialog")); + GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog")); gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de)); @@ -202,16 +202,16 @@ oneway_anova_dialog (GObject *o, gpointer data) { struct contrasts_subdialog *cd = &ow.contrasts; - GtkEntry *entry = GTK_ENTRY (get_widget_assert (xml, "entry1")); + GtkEntry *entry = GTK_ENTRY (get_widget_assert (builder, "entry1")); - cd->acr = PSPPIRE_ACR (get_widget_assert (xml, "psppire-acr1")); - cd->contrasts_dialog = get_widget_assert (xml, "contrasts-dialog"); + cd->acr = PSPPIRE_ACR (get_widget_assert (builder, "psppire-acr1")); + cd->contrasts_dialog = get_widget_assert (builder, "contrasts-dialog"); - cd->next = get_widget_assert (xml, "next-button"); - cd->prev = get_widget_assert (xml, "prev-button"); - cd->ctotal = get_widget_assert (xml, "entry2"); + cd->next = get_widget_assert (builder, "next-button"); + cd->prev = get_widget_assert (builder, "prev-button"); + cd->ctotal = get_widget_assert (builder, "entry2"); - cd->stack_label = get_widget_assert (xml, "contrast-stack-label"); + cd->stack_label = get_widget_assert (builder, "contrast-stack-label"); /* Contrasts */ ow.contrasts_array = g_array_new (FALSE, FALSE, sizeof (GtkListStore *)); @@ -253,7 +253,7 @@ oneway_anova_dialog (GObject *o, gpointer data) g_array_free (ow.contrasts_array, FALSE); - g_object_unref (xml); + g_object_unref (builder); } diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 24d90896..c0c2641f 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -19,6 +19,7 @@ #include #include +#include #include "psppire-dialog.h" #include "psppire-buttonbox.h" #include "psppire-selector.h" @@ -34,6 +35,9 @@ enum {DIALOG_REFRESH, static guint signals [n_SIGNALS]; +static void psppire_dialog_buildable_init (GtkBuildableIface *iface); + + GType psppire_dialog_get_type (void) { @@ -54,8 +58,20 @@ psppire_dialog_get_type (void) (GInstanceInitFunc) psppire_dialog_init, }; + static const GInterfaceInfo buildable_info = + { + (GInterfaceInitFunc) psppire_dialog_buildable_init, + NULL, + NULL + }; + dialog_type = g_type_register_static (GTK_TYPE_WINDOW, "PsppireDialog", &dialog_info, 0); + + g_type_add_interface_static (dialog_type, + GTK_TYPE_BUILDABLE, + &buildable_info); + } return dialog_type; @@ -475,3 +491,26 @@ psppire_dialog_set_valid_predicate (PsppireDialog *dialog, } + + + +static GObject * +get_internal_child (GtkBuildable *buildable, + GtkBuilder *builder, + const gchar *childname) +{ + PsppireDialog *dialog = PSPPIRE_DIALOG (buildable); + + if ( 0 == g_strcmp0 (childname, "hbox")) + return G_OBJECT (dialog->box); + + return NULL; +} + + + +static void +psppire_dialog_buildable_init (GtkBuildableIface *iface) +{ + iface->get_internal_child = get_internal_child; +} diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 421ae2ca..4241949e 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -493,13 +493,10 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) gtk_container_add (GTK_CONTAINER (window), box); g_object_ref (menubar); - gtk_widget_unparent (menubar); g_object_ref (sw); - gtk_widget_unparent (sw); g_object_ref (sb); - gtk_widget_unparent (sb); gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); diff --git a/src/ui/gui/psppire.glade b/src/ui/gui/psppire.glade index 16d66e8a..473d5304 100644 --- a/src/ui/gui/psppire.glade +++ b/src/ui/gui/psppire.glade @@ -1845,17 +1845,6 @@ 3 False False - - - - - - - - - - - diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c index 307e3733..8ea25a1d 100644 --- a/src/ui/gui/rank-dialog.c +++ b/src/ui/gui/rank-dialog.c @@ -224,73 +224,73 @@ rank_dialog (GObject *o, gpointer data) struct rank_dialog rd; - GladeXML *xml = XML_NEW ("rank.glade"); + GtkBuilder * builder = builder_new ("rank.ui"); - GtkWidget *vars = get_widget_assert (xml, "dict-treeview"); - GtkWidget *selector1 = get_widget_assert (xml, "psppire-selector1"); - GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector2"); + GtkWidget *vars = get_widget_assert (builder, "dict-treeview"); + GtkWidget *selector1 = get_widget_assert (builder, "psppire-selector1"); + GtkWidget *selector2 = get_widget_assert (builder, "psppire-selector2"); - GtkWidget *types_button = get_widget_assert (xml, "button1"); - GtkWidget *ties_button = get_widget_assert (xml, "button2"); + GtkWidget *types_button = get_widget_assert (builder, "button1"); + GtkWidget *ties_button = get_widget_assert (builder, "button2"); PsppireVarStore *vs = NULL; g_object_get (de->data_editor, "var-store", &vs, NULL); rd.dict = vs->dict; - rd.rank_vars = get_widget_assert (xml, "variables-treeview"); - rd.group_vars = get_widget_assert (xml, "group-vars-treeview"); - rd.dialog = get_widget_assert (xml, "rank-dialog"); + rd.rank_vars = get_widget_assert (builder, "variables-treeview"); + rd.group_vars = get_widget_assert (builder, "group-vars-treeview"); + rd.dialog = get_widget_assert (builder, "rank-dialog"); rd.ascending_togglebutton = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "radiobutton1")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "radiobutton1")); rd.summary_togglebutton = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "summary-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "summary-checkbutton")); - rd.types_dialog = get_widget_assert (xml, "rank-types-dialog"); + rd.types_dialog = get_widget_assert (builder, "rank-types-dialog"); - rd.ntiles_entry = get_widget_assert (xml, "ntiles-entry"); + rd.ntiles_entry = get_widget_assert (builder, "ntiles-entry"); rd.func_button[RANK] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "rank-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "rank-checkbutton")); rd.func_button[SAVAGE] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "savage-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "savage-checkbutton")); rd.func_button[RFRACTION] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "rfrac-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "rfrac-checkbutton")); rd.func_button[PERCENT] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "percent-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "percent-checkbutton")); rd.func_button[N] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sum-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "sum-checkbutton")); rd.func_button[NTILES] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "ntiles-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "ntiles-checkbutton")); rd.func_button[PROPORTION] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "prop-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "prop-checkbutton")); rd.func_button[NORMAL] = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "normal-checkbutton")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "normal-checkbutton")); - rd.formula_box = get_widget_assert (xml, "formula-frame"); + rd.formula_box = get_widget_assert (builder, "formula-frame"); - rd.blom = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "blom-button")); - rd.tukey = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "tukey-button")); - rd.rankit = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "rankit-button")); - rd.vw = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "vw-button")); + rd.blom = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "blom-button")); + rd.tukey = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "tukey-button")); + rd.rankit = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "rankit-button")); + rd.vw = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "vw-button")); /* Ties dialog */ - rd.ties_dialog = PSPPIRE_DIALOG (get_widget_assert (xml, "ties-dialog")); + rd.ties_dialog = PSPPIRE_DIALOG (get_widget_assert (builder, "ties-dialog")); - rd.mean = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "mean-button")); - rd.low = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "low-button")); - rd.high = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "high-button")); - rd.condense = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "condense-button")); + rd.mean = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "mean-button")); + rd.low = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "low-button")); + rd.high = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "high-button")); + rd.condense = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "condense-button")); g_signal_connect_swapped (rd.func_button[PROPORTION], "toggled", G_CALLBACK (set_sensitivity), @@ -367,7 +367,7 @@ rank_dialog (GObject *o, gpointer data) break; } - g_object_unref (xml); + g_object_unref (builder); } diff --git a/src/ui/gui/rank-dialog.h b/src/ui/gui/rank-dialog.h index a2ddace6..8a5064f5 100644 --- a/src/ui/gui/rank-dialog.h +++ b/src/ui/gui/rank-dialog.h @@ -19,8 +19,6 @@ #include -#include - void rank_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c index 642dae02..859737f6 100644 --- a/src/ui/gui/recode-dialog.c +++ b/src/ui/gui/recode-dialog.c @@ -842,28 +842,27 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) struct recode_dialog rd; - GladeXML *xml = XML_NEW ("recode.glade"); + GtkBuilder *builder = builder_new ("recode.ui"); + GtkWidget *selector = get_widget_assert (builder, "psppire-selector1"); - GtkWidget *selector = get_widget_assert (xml, "psppire-selector1"); + GtkWidget *oldandnew = get_widget_assert (builder, "button1"); - GtkWidget *oldandnew = get_widget_assert (xml, "button1"); - - GtkWidget *output_variable_box = get_widget_assert (xml,"frame4"); + GtkWidget *output_variable_box = get_widget_assert (builder,"frame4"); PsppireVarStore *vs = NULL; g_object_get (de->data_editor, "var-store", &vs, NULL); - rd.change_button = get_widget_assert (xml, "change-button"); + rd.change_button = get_widget_assert (builder, "change-button"); - rd.dialog = get_widget_assert (xml, "recode-dialog"); - rd.dict_treeview = get_widget_assert (xml, "treeview1"); - rd.variable_treeview = get_widget_assert (xml, "treeview2"); - rd.new_name_entry = get_widget_assert (xml, "dest-name-entry"); - rd.new_label_entry = get_widget_assert (xml, "dest-label-entry"); + rd.dialog = get_widget_assert (builder, "recode-dialog"); + rd.dict_treeview = get_widget_assert (builder, "treeview1"); + rd.variable_treeview = get_widget_assert (builder, "treeview2"); + rd.new_name_entry = get_widget_assert (builder, "dest-name-entry"); + rd.new_label_entry = get_widget_assert (builder, "dest-label-entry"); rd.dict = vs->dict; @@ -963,40 +962,40 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) /* Set up the Old & New Values subdialog */ { - rd.string_button = get_widget_assert (xml, "checkbutton1"); - rd.width_entry = get_widget_assert (xml, "spinbutton1"); + rd.string_button = get_widget_assert (builder, "checkbutton1"); + rd.width_entry = get_widget_assert (builder, "spinbutton1"); - rd.convert_button = get_widget_assert (xml, "checkbutton2"); + rd.convert_button = get_widget_assert (builder, "checkbutton2"); - rd.ov_range_lower_entry = get_widget_assert (xml, "entry5"); - rd.ov_range_upper_entry = get_widget_assert (xml, "entry3"); - rd.ov_low_up_entry = get_widget_assert (xml, "entry6"); - rd.ov_high_down_entry = get_widget_assert (xml, "entry7"); + rd.ov_range_lower_entry = get_widget_assert (builder, "entry5"); + rd.ov_range_upper_entry = get_widget_assert (builder, "entry3"); + rd.ov_low_up_entry = get_widget_assert (builder, "entry6"); + rd.ov_high_down_entry = get_widget_assert (builder, "entry7"); - rd.new_value_entry = get_widget_assert (xml, "entry1"); - rd.ov_value_entry = get_widget_assert (xml, "entry2"); + rd.new_value_entry = get_widget_assert (builder, "entry1"); + rd.ov_value_entry = get_widget_assert (builder, "entry2"); - rd.toggle[BUTTON_NEW_VALUE] = get_widget_assert (xml, "radiobutton1"); - rd.toggle[BUTTON_NEW_SYSMIS] = get_widget_assert (xml, "radiobutton2"); - rd.toggle[BUTTON_NEW_COPY] = get_widget_assert (xml, "radiobutton3"); - rd.toggle[BUTTON_OLD_VALUE] = get_widget_assert (xml, "radiobutton4"); - rd.toggle[BUTTON_OLD_SYSMIS] = get_widget_assert (xml, "radiobutton6"); - rd.toggle[BUTTON_OLD_MISSING]= get_widget_assert (xml, "radiobutton7"); - rd.toggle[BUTTON_OLD_RANGE] = get_widget_assert (xml, "radiobutton8"); - rd.toggle[BUTTON_OLD_LOW_UP] = get_widget_assert (xml, "radiobutton10"); - rd.toggle[BUTTON_OLD_HIGH_DOWN] = get_widget_assert (xml, "radiobutton5"); - rd.toggle[BUTTON_OLD_ELSE] = get_widget_assert (xml, "radiobutton11"); + rd.toggle[BUTTON_NEW_VALUE] = get_widget_assert (builder, "radiobutton1"); + rd.toggle[BUTTON_NEW_SYSMIS] = get_widget_assert (builder, "radiobutton2"); + rd.toggle[BUTTON_NEW_COPY] = get_widget_assert (builder, "radiobutton3"); + rd.toggle[BUTTON_OLD_VALUE] = get_widget_assert (builder, "radiobutton4"); + rd.toggle[BUTTON_OLD_SYSMIS] = get_widget_assert (builder, "radiobutton6"); + rd.toggle[BUTTON_OLD_MISSING]= get_widget_assert (builder, "radiobutton7"); + rd.toggle[BUTTON_OLD_RANGE] = get_widget_assert (builder, "radiobutton8"); + rd.toggle[BUTTON_OLD_LOW_UP] = get_widget_assert (builder, "radiobutton10"); + rd.toggle[BUTTON_OLD_HIGH_DOWN] = get_widget_assert (builder, "radiobutton5"); + rd.toggle[BUTTON_OLD_ELSE] = get_widget_assert (builder, "radiobutton11"); - rd.new_copy_label = get_widget_assert (xml, "label3"); - rd.strings_box = get_widget_assert (xml, "table3"); + rd.new_copy_label = get_widget_assert (builder, "label3"); + rd.strings_box = get_widget_assert (builder, "table3"); rd.old_and_new_dialog = - PSPPIRE_DIALOG (get_widget_assert (xml, "old-new-values-dialog")); + PSPPIRE_DIALOG (get_widget_assert (builder, "old-new-values-dialog")); gtk_window_set_transient_for (GTK_WINDOW (rd.old_and_new_dialog), GTK_WINDOW (de)); - rd.acr = PSPPIRE_ACR (get_widget_assert (xml, "psppire-acr1")); + rd.acr = PSPPIRE_ACR (get_widget_assert (builder, "psppire-acr1")); g_signal_connect_swapped (rd.toggle[BUTTON_NEW_VALUE], "toggled", G_CALLBACK (set_acr), &rd); @@ -1047,11 +1046,11 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) g_signal_connect (rd.toggle[BUTTON_OLD_RANGE], "toggled", G_CALLBACK (toggle_sensitivity), - get_widget_assert (xml, "entry3")); + get_widget_assert (builder, "entry3")); g_signal_connect (rd.toggle[BUTTON_OLD_RANGE], "toggled", G_CALLBACK (toggle_sensitivity), - get_widget_assert (xml, "entry5")); + get_widget_assert (builder, "entry5")); g_signal_connect (rd.toggle[BUTTON_OLD_LOW_UP], "toggled", G_CALLBACK (toggle_sensitivity), rd.ov_low_up_entry); @@ -1108,7 +1107,7 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) gtk_list_store_clear (GTK_LIST_STORE (rd.value_map)); g_object_unref (rd.value_map); - g_object_unref (xml); + g_object_unref (builder); } /* Initialise VAL to reflect the current status of RD */ diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c index b0c11b07..2d8aca3e 100644 --- a/src/ui/gui/regression-dialog.c +++ b/src/ui/gui/regression-dialog.c @@ -225,9 +225,8 @@ regression_dialog (GObject *o, gpointer data) gint response; struct regression_dialog rd; - GladeXML *xml = XML_NEW ("regression.glade"); + GtkBuilder *xml = builder_new ("regression.ui"); PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - PsppireVarStore *vs; GtkWidget *dialog = get_widget_assert (xml, "regression-dialog"); diff --git a/src/ui/gui/regression-dialog.h b/src/ui/gui/regression-dialog.h index ca79ba35..d34a61c9 100644 --- a/src/ui/gui/regression-dialog.h +++ b/src/ui/gui/regression-dialog.h @@ -19,8 +19,6 @@ #include -#include - void regression_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c index 58b2879d..d953308a 100644 --- a/src/ui/gui/select-cases-dialog.c +++ b/src/ui/gui/select-cases-dialog.c @@ -18,7 +18,6 @@ #include "select-cases-dialog.h" #include -#include #include "helper.h" #include "psppire-dialog.h" #include "psppire-data-window.h" @@ -42,7 +41,7 @@ struct select_cases_dialog { /* The XML that created the dialog */ - GladeXML *xml; + GtkBuilder *xml; GtkWidget *spinbutton ; GtkWidget *spinbutton1 ; @@ -247,7 +246,7 @@ select_cases_dialog (GObject *o, gpointer data) GtkWidget *button_range; GtkWidget *button_sample; - scd.xml = XML_NEW ("psppire.glade"); + scd.xml = builder_new ("psppire.ui"); g_object_get (de->data_editor, "data-store", &scd.data_store, NULL); diff --git a/src/ui/gui/select-cases-dialog.h b/src/ui/gui/select-cases-dialog.h index 533992e0..b585b096 100644 --- a/src/ui/gui/select-cases-dialog.h +++ b/src/ui/gui/select-cases-dialog.h @@ -19,7 +19,6 @@ #include -#include void select_cases_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c index 6da083be..d9c665e6 100644 --- a/src/ui/gui/sort-cases-dialog.c +++ b/src/ui/gui/sort-cases-dialog.c @@ -95,7 +95,7 @@ sort_cases_dialog (GObject *o, gpointer data) struct sort_cases_dialog scd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog"); diff --git a/src/ui/gui/sort-cases-dialog.h b/src/ui/gui/sort-cases-dialog.h index badcdd60..000d2c00 100644 --- a/src/ui/gui/sort-cases-dialog.h +++ b/src/ui/gui/sort-cases-dialog.h @@ -19,8 +19,6 @@ #include -#include - void sort_cases_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c index c44d5591..8708b33f 100644 --- a/src/ui/gui/split-file-dialog.c +++ b/src/ui/gui/split-file-dialog.c @@ -27,7 +27,6 @@ #include #include -#include #include "dialog-common.h" @@ -39,7 +38,7 @@ struct split_file_dialog { /* The XML that created the dialog */ - GladeXML *xml; + GtkBuilder *xml; /* The dictionary to which this dialog pertains */ PsppireDict *dict; @@ -109,7 +108,7 @@ static void on_off_toggled (GtkToggleButton *togglebutton, gpointer user_data) { - GladeXML *xml = user_data; + GtkBuilder *xml = user_data; GtkWidget *dest = get_widget_assert (xml, "split-file-grouping-vars"); GtkWidget *selector = get_widget_assert (xml, "split-file-selector"); GtkWidget *source = get_widget_assert (xml, "split-file-dict-treeview"); @@ -177,7 +176,7 @@ split_file_dialog (GObject *o, gpointer data) GtkWidget *selector ; GtkWidget *on_off ; - sfd.xml = XML_NEW ("psppire.glade"); + sfd.xml = builder_new ("psppire.ui"); dialog = get_widget_assert (sfd.xml, "split-file-dialog"); source = get_widget_assert (sfd.xml, "split-file-dict-treeview"); diff --git a/src/ui/gui/syntax-editor.glade b/src/ui/gui/syntax-editor.glade index 8895c8f3..8f565e12 100644 --- a/src/ui/gui/syntax-editor.glade +++ b/src/ui/gui/syntax-editor.glade @@ -3,31 +3,6 @@ - - 640 - 480 - True - Psppire Syntax Editor - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - True GTK_PACK_DIRECTION_LTR @@ -275,14 +250,8 @@ - - 0 - False - False - - - - + + True True @@ -311,26 +280,10 @@ - - 0 - True - True - - - - + True True - - 0 - False - False - - - - - diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c index 4ceab4d8..392867ad 100644 --- a/src/ui/gui/t-test-independent-samples-dialog.c +++ b/src/ui/gui/t-test-independent-samples-dialog.c @@ -17,7 +17,6 @@ #include -#include #include #include "t-test-independent-samples-dialog.h" #include "psppire-dict.h" @@ -91,7 +90,7 @@ tt_groups_dialog_destroy (struct tt_groups_dialog *grps) } static struct tt_groups_dialog * -tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent) +tt_groups_dialog_create (GtkBuilder *xml, GtkWindow *parent) { struct tt_groups_dialog *grps = xmalloc (sizeof (*grps)); @@ -127,7 +126,7 @@ tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent) struct tt_indep_samples_dialog { - GladeXML *xml; /* The xml that generated the widgets */ + GtkBuilder *xml; /* The xml that generated the widgets */ GtkWidget *dialog; PsppireDict *dict; GtkWidget *define_groups_button; @@ -396,7 +395,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) PsppireVarStore *vs = NULL; - GladeXML *xml = XML_NEW ("t-test.glade"); + GtkBuilder *xml = builder_new ("t-test.ui"); GtkWidget *dict_view = get_widget_assert (xml, "indep-samples-t-test-treeview1"); diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c index 98584501..3cdc91c3 100644 --- a/src/ui/gui/t-test-one-sample.c +++ b/src/ui/gui/t-test-one-sample.c @@ -17,7 +17,6 @@ #include -#include #include #include "t-test-one-sample.h" #include "psppire-dict.h" @@ -127,7 +126,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data) PsppireVarStore *vs = NULL; - GladeXML *xml = XML_NEW ("t-test.glade"); + GtkBuilder *xml = builder_new ("t-test.ui"); GtkWidget *dict_view = get_widget_assert (xml, "one-sample-t-test-treeview2"); diff --git a/src/ui/gui/t-test-options.c b/src/ui/gui/t-test-options.c index eaf7c43f..ed8ac042 100644 --- a/src/ui/gui/t-test-options.c +++ b/src/ui/gui/t-test-options.c @@ -52,7 +52,7 @@ struct tt_options_dialog }; struct tt_options_dialog * -tt_options_dialog_create (GladeXML *xml, GtkWindow *parent) +tt_options_dialog_create (GtkBuilder *xml, GtkWindow *parent) { struct tt_options_dialog *tto = xmalloc (sizeof (*tto)); diff --git a/src/ui/gui/t-test-options.h b/src/ui/gui/t-test-options.h index fdb2d87c..e80ef444 100644 --- a/src/ui/gui/t-test-options.h +++ b/src/ui/gui/t-test-options.h @@ -24,7 +24,7 @@ struct tt_options_dialog; void tt_options_dialog_run (struct tt_options_dialog *); -struct tt_options_dialog * tt_options_dialog_create (GladeXML *, GtkWindow *); +struct tt_options_dialog * tt_options_dialog_create (GtkBuilder *, GtkWindow *); void tt_options_dialog_destroy (struct tt_options_dialog *); diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c index 58b68b2f..ca1d776a 100644 --- a/src/ui/gui/t-test-paired-samples.c +++ b/src/ui/gui/t-test-paired-samples.c @@ -17,7 +17,6 @@ #include #include -#include #include #include "psppire-data-window.h" @@ -185,7 +184,7 @@ t_test_paired_samples_dialog (GObject *o, gpointer data) PsppireVarStore *vs = NULL; - GladeXML *xml = XML_NEW ("t-test.glade"); + GtkBuilder *xml = builder_new ("t-test.ui"); GtkWidget *dict_view = get_widget_assert (xml, "paired-samples-t-test-treeview1"); diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c index 9e8c18f4..09756d37 100644 --- a/src/ui/gui/transpose-dialog.c +++ b/src/ui/gui/transpose-dialog.c @@ -28,7 +28,6 @@ #include "dialog-common.h" #include -#include #include @@ -40,12 +39,12 @@ #include "psppire-var-store.h" -static gchar * generate_syntax (PsppireDict *dict, GladeXML *xml); +static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml); static void refresh (PsppireDialog *dialog, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *dest = get_widget_assert (xml, "variables-treeview"); GtkWidget *entry = get_widget_assert (xml, "new-name-entry"); GtkTreeModel *dmodel = gtk_tree_view_get_model (GTK_TREE_VIEW (dest)); @@ -57,7 +56,7 @@ refresh (PsppireDialog *dialog, gpointer data) static gboolean dialog_state_valid (gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *tv = get_widget_assert (xml, "variables-treeview"); GtkWidget *entry = get_widget_assert (xml, "new-name-entry"); @@ -82,7 +81,7 @@ transpose_dialog (GObject *o, gpointer data) gint response ; PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); PsppireVarStore *vs = NULL; @@ -156,7 +155,7 @@ transpose_dialog (GObject *o, gpointer data) FLIP /VARIABLES=var_list /NEWNAMES=var_name. */ static gchar * -generate_syntax (PsppireDict *dict, GladeXML *xml) +generate_syntax (PsppireDict *dict, GtkBuilder *xml) { const gchar *text; GString *string = g_string_new ("FLIP"); diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c index 43a3832c..2f5495f1 100644 --- a/src/ui/gui/variable-info-dialog.c +++ b/src/ui/gui/variable-info-dialog.c @@ -16,7 +16,6 @@ #include #include -#include #include "dict-display.h" #include "var-display.h" @@ -168,7 +167,7 @@ variable_info_dialog (GObject *o, gpointer data) gint response ; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "variable-info-dialog"); GtkWidget *treeview = get_widget_assert (xml, "treeview2"); diff --git a/src/ui/gui/variable-info-dialog.h b/src/ui/gui/variable-info-dialog.h index 25a0aded..e775506f 100644 --- a/src/ui/gui/variable-info-dialog.h +++ b/src/ui/gui/variable-info-dialog.h @@ -17,9 +17,7 @@ #ifndef __VARIABLE_DIALOG_H #define __VARIABLE_DIALOG_H - #include -#include void variable_info_dialog (GObject *o, gpointer data); diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c index 9d103e1c..a464646f 100644 --- a/src/ui/gui/weight-cases-dialog.c +++ b/src/ui/gui/weight-cases-dialog.c @@ -26,7 +26,6 @@ #include "helper.h" #include -#include #include #define _(msgid) gettext (msgid) @@ -107,7 +106,7 @@ weight_cases_dialog (GObject *o, gpointer data) PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); struct weight_cases_dialog wcd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog"); GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");