$(top_builddir)/src/ui/gui/message-dialog.ui \
$(top_builddir)/src/ui/gui/psppire.ui \
$(top_builddir)/src/ui/gui/oneway.ui \
+ $(top_builddir)/src/ui/gui/output-viewer.ui \
$(top_builddir)/src/ui/gui/rank.ui \
$(top_builddir)/src/ui/gui/recode.ui \
$(top_builddir)/src/ui/gui/regression.ui \
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem3">
+ <widget class="GtkMenuItem" id="windows_menuitem">
<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>
<property name="label" translatable="yes">_Windows</property>
#include <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
-#include <glade/glade.h>
#include "helper.h"
#include <libpspp/message.h>
static void
psppire_output_window_init (PsppireOutputWindow *window)
{
- GladeXML *xml = XML_NEW ("output-viewer.glade");
+ GtkBuilder *xml = builder_new ("output-viewer.ui");
GtkWidget *box = gtk_vbox_new (FALSE, 0);
gtk_widget_show_all (box);
- connect_help (xml);
+ // connect_help (xml);
window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (window->textview));
window->fp = NULL;
- g_signal_connect (get_widget_assert (xml,"help_about"),
+ g_signal_connect (get_object_assert (xml,"help_about"),
"activate",
G_CALLBACK (about_new),
window);
- g_signal_connect (get_widget_assert (xml,"help_reference"),
+ g_signal_connect (get_object_assert (xml,"help_reference"),
"activate",
G_CALLBACK (reference_manual),
NULL);
- g_signal_connect (get_widget_assert (xml,"windows_minimise-all"),
+ g_signal_connect (get_object_assert (xml,"windows_minimise-all"),
"activate",
G_CALLBACK (psppire_window_minimise_all),
NULL);
- PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (get_widget_assert (xml,"windows_menu"));
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1"));
+ PSPPIRE_WINDOW (window)->menu =
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent);
g_object_unref (xml);
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1"));
PSPPIRE_WINDOW (window)->menu =
- GTK_MENU_SHELL (GTK_WIDGET (gtk_ui_manager_get_widget (uim,"/ui/menubar2/windows/windows_minimise_all"))->parent);
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar2/windows/windows_minimise_all")->parent);
g_object_unref (xml);