make check
or for a more thorough test:
make distcheck
+
+Glade UI Design
+---------------
+
+The ui files in src/ui/gui may be viewed (maybe changed) with Glade. For this
+you need
+
+ * libgladeui 2.0 or later
+
+Then you need to run
+
+ configure --with-gui-tools
+ make
+ make install
+
+psppire uses some self defined widgets. To use glade these widgets have
+to be announced to glade such that you can view the interface.
+The install process will install the psppire glade library, icons and
+psppire.xml files in the appropiate system locations. You cannot override
+this with --prefix. After that you can run "glade" and open the ui files.
gui_tools,
[AS_HELP_STRING([--with-gui-tools], [build the gui developer tools. For DEVELOPERS only! There is no reason why users will need this flag.])])
if test x"$with_gui_tools" = x"yes" ; then
- PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
+ PKG_CHECK_MODULES(GLADE_UI, gladeui-2.0)
fi
AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
+++ /dev/null
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "psppire-acr.h"
-
-#include <gladeui/glade.h>
-
-
-void
-glade_psppire_acr_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *widget ;
-
- PsppireAcr *acr = PSPPIRE_ACR (object);
-
- g_return_if_fail (PSPPIRE_IS_ACR (acr));
-
- widget = glade_widget_get_from_gobject (GTK_WIDGET (acr));
- if (!widget)
- return;
-
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG complient border-width defaults on acrs */
- glade_widget_property_set (widget, "border-width", 5);
- }
-}
-
-
-GtkWidget *
-glade_psppire_acr_get_internal_child (GladeWidgetAdaptor *adaptor,
- PsppireAcr *acr,
- const gchar *name)
-{
-#if DEBUGGING
- g_print ("%s\n", __FUNCTION__);
-#endif
- return GTK_WIDGET (acr);
-}
-
-
-
-void
-glade_psppire_acr_set_property (GladeWidgetAdaptor *adaptor,
- GObject *object,
- const gchar *id,
- const GValue *value)
-{
-#if DEBUGGING
- g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object,
- G_OBJECT_TYPE_NAME( object ),
- id);
-#endif
-
- GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object,
- id, value);
-}
-
-
-
-GList *
-glade_psppire_acr_get_children (GladeWidgetAdaptor *adaptor,
- PsppireAcr *acr)
-{
- GList *list = NULL;
-
- g_return_val_if_fail (PSPPIRE_IS_ACR (acr), NULL);
-
- list = glade_util_container_get_all_children (GTK_CONTAINER (acr));
-
- return list;
-}
module_LTLIBRARIES = libglade-psppire.la
-moduledir = `pkg-config --variable=moduledir gladeui-1.0`
-catalogdir = `pkg-config --variable=catalogdir gladeui-1.0`
-pixmapdir = `pkg-config --variable=pixmapdir gladeui-1.0`
+moduledir = `pkg-config --variable=moduledir gladeui-2.0`
+catalogdir = `pkg-config --variable=catalogdir gladeui-2.0`
+pixmapdir = `pkg-config --variable=pixmapdir gladeui-2.0`
-small_pixmapdir = $(pixmapdir)/16x16
-large_pixmapdir = $(pixmapdir)/22x22
+small_pixmapdir = $(pixmapdir)/hicolor/16x16/actions
+large_pixmapdir = $(pixmapdir)/hicolor/22x22/actions
+
+# format.c for psppire-value-entry.c
libglade_psppire_la_SOURCES = \
- glade/dialog.c \
- glade/bbox.c \
- glade/selector.c \
- glade/acr.c \
- glade/dictview.c \
- glade/var-view.c \
src/ui/gui/helper.c \
+ src/ui/gui/dialog-common.c \
+ src/ui/gui/psppire-var-ptr.c \
+ src/data/format.c \
+ src/ui/gui/psppire-format.c \
+ src/data/value-labels.c \
src/ui/gui/psppire-conf.c \
src/ui/gui/psppire-acr.c \
src/ui/gui/psppire-buttonbox.c \
src/ui/gui/psppire-selector.c \
src/ui/gui/psppire-select-dest.c \
src/ui/gui/psppire-var-view.c \
+ src/ui/gui/psppire-checkbox-treeview.c \
+ src/ui/gui/psppire-val-chooser.c \
+ src/ui/gui/psppire-value-entry.c \
src/ui/gui/psppire-window-base.c
dist_catalog_DATA = \
glade/psppire.xml
dist_small_pixmap_DATA = \
- glade/icons/16x16/psppire-acr.png \
- glade/icons/16x16/psppire-hbuttonbox.png \
- glade/icons/16x16/psppire-vbuttonbox.png \
- glade/icons/16x16/psppire-dialog.png \
- glade/icons/16x16/psppire-keypad.png \
- glade/icons/16x16/psppire-selector.png
+ glade/icons/16x16/widget-psppire-psppire-acr.png \
+ glade/icons/16x16/widget-psppire-psppire-hbuttonbox.png \
+ glade/icons/16x16/widget-psppire-psppire-vbuttonbox.png \
+ glade/icons/16x16/widget-psppire-psppire-dialog.png \
+ glade/icons/16x16/widget-psppire-psppire-keypad.png \
+ glade/icons/16x16/widget-psppire-psppire-selector.png
dist_large_pixmap_DATA = \
- glade/icons/22x22/psppire-acr.png \
- glade/icons/22x22/psppire-hbuttonbox.png \
- glade/icons/22x22/psppire-vbuttonbox.png \
- glade/icons/22x22/psppire-dialog.png \
- glade/icons/22x22/psppire-keypad.png \
- glade/icons/22x22/psppire-selector.png
+ glade/icons/22x22/widget-psppire-psppire-acr.png \
+ glade/icons/22x22/widget-psppire-psppire-hbuttonbox.png \
+ glade/icons/22x22/widget-psppire-psppire-vbuttonbox.png \
+ glade/icons/22x22/widget-psppire-psppire-dialog.png \
+ glade/icons/22x22/widget-psppire-psppire-keypad.png \
+ glade/icons/22x22/widget-psppire-psppire-selector.png
libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \
+++ /dev/null
-#include <config.h>
-#include <gladeui/glade.h>
-#include <gtk/gtk.h>
-
-#include "psppire-buttonbox.h"
-
-void
-glade_psppire_button_box_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *box_widget;
-
- PsppireButtonBox *bbox = PSPPIRE_BUTTONBOX (object);
-
- g_return_if_fail (PSPPIRE_IS_BUTTONBOX (bbox));
-
- box_widget = glade_widget_get_from_gobject (GTK_WIDGET (bbox));
- if (!box_widget)
- return;
-
-
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG complient border-width defaults on dialogs */
- glade_widget_property_set (box_widget, "border-width", 5);
- }
-
-}
-
-
-GtkWidget *
-glade_psppire_button_box_get_internal_child (GladeWidgetAdaptor *adaptor,
- PsppireButtonBox *bbox,
- const gchar *name)
-{
-#if DEBUGGING
- g_print ("%s\n", __FUNCTION__);
-#endif
-
- return GTK_WIDGET (bbox);
-}
-
-
-
-
-void
-glade_psppire_button_box_set_property (GladeWidgetAdaptor *adaptor,
- GObject *object,
- const gchar *id,
- const GValue *value)
-{
-#if DEBUGGING
- g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object,
- G_OBJECT_TYPE_NAME( object ),
- id);
-#endif
-
- GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object,
- id, value);
-}
-
-
-
-
-GList *
-glade_psppire_button_box_get_children (GladeWidgetAdaptor *adaptor,
- PsppireButtonBox *bbox)
-{
- GList *list = NULL;
-
- g_return_val_if_fail (PSPPIRE_IS_BUTTONBOX (bbox), NULL);
-
- list = glade_util_container_get_all_children (GTK_CONTAINER (bbox));
-
- return list;
-}
+++ /dev/null
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "psppire-dialog.h"
-#include <string.h>
-#include <assert.h>
-#include <gladeui/glade.h>
-
-
-void
-glade_psppire_dialog_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *widget ;
-
- GladeWidget *box_widget;
-
- PsppireDialog *dialog = PSPPIRE_DIALOG (object);
-
- g_return_if_fail (PSPPIRE_IS_DIALOG (dialog));
-
- widget = glade_widget_get_from_gobject (GTK_WIDGET (dialog));
- if (!widget)
- return;
-
-
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG compliant border-width defaults on dialogs */
- glade_widget_property_set (widget, "border-width", 5);
- }
-
- box_widget = glade_widget_adaptor_create_internal
- (widget, G_OBJECT(dialog->box),
- "hbox", "dialog", FALSE, reason);
-
- /* These properties are controlled by the GtkDialog style properties:
- * "content-area-border", "button-spacing" and "action-area-border",
- * so we must disable their use.
- */
- glade_widget_remove_property (box_widget, "border-width");
-
- /* Only set these on the original create. */
- if (reason == GLADE_CREATE_USER)
- {
-
- /* HIG compliant spacing defaults on dialogs */
- glade_widget_property_set (box_widget, "spacing", 2);
-
- glade_widget_property_set (box_widget, "size", 2);
-
- }
-}
-
-
-GtkWidget *
-glade_psppire_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
- PsppireDialog *dialog,
- const gchar *name)
-{
-#if DEBUGGING
- g_print ("%s\n", __FUNCTION__);
-#endif
-
- g_assert (0 == strcmp (name, "hbox"));
-
- return dialog->box;
-}
-
-
-
-void
-glade_psppire_dialog_set_property (GladeWidgetAdaptor *adaptor,
- GObject *object,
- const gchar *id,
- const GValue *value)
-{
-#if DEBUGGING
- g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object,
- G_OBJECT_TYPE_NAME( object ),
- id);
-#endif
-
- assert ( GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property );
-
- GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object,
- id, value);
-}
-
-
-
-GList *
-glade_psppire_dialog_get_children (GladeWidgetAdaptor *adaptor,
- PsppireDialog *dialog)
-{
- GList *list = NULL;
-
- g_return_val_if_fail (PSPPIRE_IS_DIALOG (dialog), NULL);
-
- list = glade_util_container_get_all_children (GTK_CONTAINER (dialog));
-
- return list;
-}
+++ /dev/null
-#include <config.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "psppire-dictview.h"
-
-#include <gladeui/glade.h>
-
-
-GType
-psppire_dict_get_type ()
-{
- return 0;
-}
-
-
-
-void
-glade_psppire_dictview_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *widget ;
-
- PsppireDictView *dictview = PSPPIRE_DICT_VIEW (object);
-
- g_return_if_fail (PSPPIRE_IS_DICT_VIEW (dictview));
-
- widget = glade_widget_get_from_gobject (GTK_WIDGET (dictview));
- if (!widget)
- return;
-
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG complient border-width defaults on dictviews */
- glade_widget_property_set (widget, "border-width", 5);
- }
-}
-
-
-GtkWidget *
-glade_psppire_dictview_get_internal_child (GladeWidgetAdaptor *adaptor,
- PsppireDictView *dictview,
- const gchar *name)
-{
-#if DEBUGGING
- g_print ("%s\n", __FUNCTION__);
-#endif
- return GTK_WIDGET (dictview);
-}
-
-
-
-void
-glade_psppire_dictview_set_property (GladeWidgetAdaptor *adaptor,
- GObject *object,
- const gchar *id,
- const GValue *value)
-{
-#if DEBUGGING
- g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object,
- G_OBJECT_TYPE_NAME( object ),
- id);
-#endif
-
- GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object,
- id, value);
-}
-
-
-GList *
-glade_psppire_dictview_get_children (GladeWidgetAdaptor *adaptor,
- PsppireDictView *dv)
-{
- GList *list = NULL;
-
- g_return_val_if_fail (PSPPIRE_IS_DICT_VIEW (dv), NULL);
-
- list = glade_util_container_get_all_children (GTK_CONTAINER (dv));
-
- return list;
-}
default-height="260"
title="Dialog Box">
- <post-create-function>glade_psppire_dialog_post_create</post-create-function>
- <get-internal-child-function>glade_psppire_dialog_get_internal_child</get-internal-child-function>
-
- <get-children-function>glade_psppire_dialog_get_children</get-children-function>
-
-
<properties>
<property id="accept-focus" disabled="True" />
<property id="allow-grow" disabled="True" />
<property id="resize-mode" disabled="True" />
<property id="border-width" disabled="True" />
-
<property id="modal" ignore="True" default="True" />
<property id="visible" ignore="True" default="False" />
</properties>
<glade-widget-class name="PsppireVButtonBox" generic-name="psppire-vbuttonbox" title="Vertical Button Box">
- <post-create-function>glade_psppire_button_box_post_create</post-create-function>
- <get-children-function>glade_psppire_button_box_get_children</get-children-function>
-
- <get-internal-child-function>glade_psppire_button_box_get_internal_child</get-internal-child-function>
-
<properties>
<property id="child" disabled="True" />
<property id="visible" ignore="True" default="True" />
-
+ <property id="border-width" default="5" optional-default="True"/>
<property id="buttons">
<displayable-values>
<value id="PSPPIRE_BUTTON_OK_MASK" name="OK"></value>
<glade-widget-class name="PsppireHButtonBox" generic-name="psppire-hbuttonbox" title="Horizontal Button Box">
- <post-create-function>glade_psppire_button_box_post_create</post-create-function>
- <get-children-function>glade_psppire_button_box_get_children</get-children-function>
-
- <get-internal-child-function>glade_psppire_button_box_get_internal_child</get-internal-child-function>
-
<properties>
<property id="child" disabled="True" />
-
<property id="visible" ignore="True" default="True" />
+ <property id="border-width" default="5" optional-default="True"/>
</properties>
-
<packing-defaults>
<parent-class name="GtkVBox">
<child-property id="expand" default="False"/>
</glade-widget-class>
-
-
<glade-widget-class name="PsppireKeypad"
get-type-function="psppire_keypad_get_type"
generic-name="psppire-keypad"
fixed="True"
title="Keypad">
-
<properties>
<property id="child" disabled="True"/>
<property id="homogeneous" disabled="True"/>
<glade-widget-class name="PsppireSelector" generic-name="psppire-selector" title="Selector Button">
- <post-create-function>glade_psppire_selector_post_create</post-create-function>
- <get-children-function>glade_psppire_selector_get_children</get-children-function>
-
- <get-internal-child-function>glade_psppire_selector_get_internal_child</get-internal-child-function>
-
-
<properties>
<property id="child" disabled="True"/>
<property id="label" disabled="True"/>
<property id="xalign" disabled="True"/>
<property id="yalign" disabled="True"/>
<property id="resize-mode" disabled="True"/>
-
+ <property id="border-width" default="5" optional-default="True"/>
<property id="orientation">
<displayable-values>
<value id="PSPPIRE_SOURCE_BEFORE_DEST"
</glade-widget-class>
-
-
<glade-widget-class name="PsppireAcr" generic-name="psppire-acr" title="Add-Change-Remove">
- <post-create-function>glade_psppire_acr_post_create</post-create-function>
- <get-children-function>glade_psppire_acr_get_children</get-children-function>
-
- <get-internal-child-function>glade_psppire_acr_get_internal_child</get-internal-child-function>
-
-
<properties>
<property id="child" disabled="True" />
<property id="homogeneous" disabled="True" />
<property id="visible" ignore="True" default="True" />
+ <property id="border-width" default="5" optional-default="True"/>
</properties>
</glade-widget-class>
- <glade-widget-class name="PsppireDictView" generic-name="psppire-dictview" title="Dictionary Treeview">
-
- <post-create-function>glade_psppire_dictview_post_create</post-create-function>
- <get-children-function>glade_psppire_dictview_get_children</get-children-function>
- <get-internal-child-function>glade_psppire_dictview_get_internal_child</get-internal-child-function>
-
+ <glade-widget-class name="PsppireDictView"
+ generic-name="psppire-dictview"
+ title="Dictionary Treeview">
<properties>
<property id="child" disabled="True" />
<property id="homogeneous" disabled="True" />
<property id="visible" ignore="True" default="True" />
<property id="model" visible="False" query="False" />
+ <property id="border-width" default="5" optional-default="True"/>
</properties>
</glade-widget-class>
- <glade-widget-class name="PsppireVarView" generic-name="psppire-var-view" title="Variable Treeview">
-
- <post-create-function>glade_psppire_var_view_post_create</post-create-function>
- <get-children-function>glade_psppire_var_view_get_children</get-children-function>
- <get-internal-child-function>glade_psppire_var_view_get_internal_child</get-internal-child-function>
-
+ <glade-widget-class name="PsppireVarView"
+ generic-name="psppire-var-view"
+ title="Variable Treeview">
<properties>
<property id="child" disabled="True" />
<property id="visible" ignore="True" default="True" />
<property id="model" visible="False" query="False" disabled="True" />
<property id="n-cols" ignore="True" />
-
+ <property id="border-width" default="5" optional-default="True"/>
</properties>
</glade-widget-class>
+ <glade-widget-class name="PsppireCheckboxTreeview"
+ generic-name="psppire-checkbox-treeview"
+ title="Checkbox Treeview">
+ <properties>
+ <property id="child" disabled="True" />
+ <property id="homogeneous" disabled="True" />
+ <property id="visible" ignore="True" default="True" />
+ </properties>
+ </glade-widget-class>
- </glade-widget-classes>
+ <glade-widget-class name="PsppireValChooser"
+ generic-name="psppire-val-chooser"
+ title="Value Chooser"
+ icon-name="widget-gtk-recentchooser">
+ <properties>
+ <property id="child" disabled="True" />
+ <property id="homogeneous" disabled="True" />
+ <property id="visible" ignore="True" default="True" />
+ </properties>
+ </glade-widget-class>
-
+ <glade-widget-class name="PsppireValueEntry"
+ generic-name="psppire-value-entry"
+ title="Value Entry"
+ icon-name="widget-gtk-entry">
+ <properties>
+ <property id="child" disabled="True" />
+ <property id="homogeneous" disabled="True" />
+ <property id="visible" ignore="True" default="True" />
+ </properties>
+ </glade-widget-class>
+
+ </glade-widget-classes>
<glade-widget-group name="psppire" title="Psppire">
<glade-widget-class-ref name="PsppireDialog"/>
<glade-widget-class-ref name="PsppireSelector"/>
<glade-widget-class-ref name="PsppireKeypad"/>
<glade-widget-class-ref name="PsppireAcr"/>
+ <glade-widget-class-ref name="PsppireCheckboxTreeview"/>
+ <glade-widget-class-ref name="PsppireValChooser"/>
+ <glade-widget-class-ref name="PsppireValueEntry"/>
</glade-widget-group>
-
</glade-catalog>
+++ /dev/null
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "psppire-selector.h"
-
-#include <gladeui/glade.h>
-
-
-void
-glade_psppire_selector_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *widget ;
-
- PsppireSelector *selector = PSPPIRE_SELECTOR (object);
-
- g_return_if_fail (PSPPIRE_IS_SELECTOR (selector));
-
- widget = glade_widget_get_from_gobject (GTK_WIDGET (selector));
- if (!widget)
- return;
-
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG complient border-width defaults on selectors */
- glade_widget_property_set (widget, "border-width", 5);
- }
-}
-
-
-GtkWidget *
-glade_psppire_selector_get_internal_child (GladeWidgetAdaptor *adaptor,
- PsppireSelector *selector,
- const gchar *name)
-{
-#if DEBUGGING
- g_print ("%s\n", __FUNCTION__);
-#endif
- return GTK_WIDGET (selector);
-}
-
-
-
-void
-glade_psppire_selector_set_property (GladeWidgetAdaptor *adaptor,
- GObject *object,
- const gchar *id,
- const GValue *value)
-{
-#if DEBUGGING
- g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object,
- G_OBJECT_TYPE_NAME( object ),
- id);
-#endif
-
- GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object,
- id, value);
-}
-
-
-
-GList *
-glade_psppire_selector_get_children (GladeWidgetAdaptor *adaptor,
- PsppireSelector *selector)
-{
- GList *list = NULL;
-
- g_return_val_if_fail (PSPPIRE_IS_SELECTOR (selector), NULL);
-
- list = glade_util_container_get_all_children (GTK_CONTAINER (selector));
-
- return list;
-}
+++ /dev/null
-#include <config.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "psppire-var-view.h"
-
-#include <gladeui/glade.h>
-
-
-/* Dummy function to keep the linker happy.
- Glade never actually needs to use this return value.
- */
-GType
-psppire_var_ptr_get_type (void)
-{
- return 0;
-}
-
-void
-glade_psppire_var_view_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *widget ;
-
- PsppireVarView *var_view = PSPPIRE_VAR_VIEW (object);
-
- g_return_if_fail (PSPPIRE_IS_VAR_VIEW (var_view));
-
- widget = glade_widget_get_from_gobject (GTK_WIDGET (var_view));
- if (!widget)
- return;
-
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG complient border-width defaults on var_views */
- glade_widget_property_set (widget, "border-width", 5);
- }
-}
-
-
-GtkWidget *
-glade_psppire_var_view_get_internal_child (GladeWidgetAdaptor *adaptor,
- PsppireVarView *var_view,
- const gchar *name)
-{
-#if DEBUGGING
- g_print ("%s\n", __FUNCTION__);
-#endif
- return GTK_WIDGET (var_view);
-}
-
-
-
-void
-glade_psppire_var_view_set_property (GladeWidgetAdaptor *adaptor,
- GObject *object,
- const gchar *id,
- const GValue *value)
-{
-#if DEBUGGING
- g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object,
- G_OBJECT_TYPE_NAME( object ),
- id);
-#endif
-
- GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object,
- id, value);
-}
-
-
-GList *
-glade_psppire_var_view_get_children (GladeWidgetAdaptor *adaptor,
- PsppireVarView *dv)
-{
- GList *list = NULL;
-
- g_return_val_if_fail (PSPPIRE_IS_VAR_VIEW (dv), NULL);
-
- list = glade_util_container_get_all_children (GTK_CONTAINER (dv));
-
- return list;
-}
<object class="PsppireDialog" id="psppire-dialog1">
<property name="title" translatable="yes">Aggregate Data</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
<property name="help-page">AGGREGATE</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="title" translatable="yes">Automatic Recode</property>
<property name="modal">True</property>
<property name="help-page">AUTORECODE</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="title" translatable="yes">Binomial Test</property>
<property name="modal">True</property>
<property name="help-page">NPAR-TESTS#BINOMIAL</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox13">
<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="title" translatable="yes">Chi-Square Test</property>
<property name="modal">True</property>
<property name="help-page">NPAR-TESTS#CHISQUARE</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox13">
<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="title" translatable="yes">Compute Variable</property>
<property name="modal">True</property>
<property name="help-page">COMPUTE</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox5">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Compute Variable: Type and Label</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox9">
<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="title" translatable="yes">Bivariate Correlations</property>
<property name="modal">True</property>
<property name="help-page">CORRELATIONS</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="title" translatable="yes">Count Occurrences of Values within Cases</property>
<property name="modal">True</property>
<property name="help-page">COUNT</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox5">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<object class="PsppireDialog" id="values-dialog">
<property name="title" translatable="yes">Count Values within Cases: Values to Count</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox6">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="title" translatable="yes">Crosstabs</property>
<property name="modal">True</property>
<property name="help-page">CROSSTABS</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Crosstabs: Format</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Crosstabs: Cells</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Crosstabs: Statistics</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox4">
<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="title" translatable="yes">Descriptives</property>
<property name="modal">True</property>
<property name="help-page">DESCRIPTIVES</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox16">
<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>
<object class="PsppireDialog" id="entry-dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox8">
<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="title" translatable="yes">Explore</property>
<property name="modal">True</property>
<property name="help-page">EXAMINE</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Explore: Statistics</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox2">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Explore: Options</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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>
<object class="PsppireDialog" id="factor-dialog">
<property name="title" translatable="yes">Factor Analysis</property>
<property name="modal">True</property>
- <property name="orientation">Tabular</property>
<property name="help-page">FACTOR</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkTable" id="dialog-hbox1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<object class="PsppireDialog" id="extractions-dialog">
<property name="title" translatable="yes">Factor Analysis: Extraction</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox4">
<property name="visible">True</property>
<property name="spacing">2</property>
<object class="PsppireDialog" id="rotations-dialog">
<property name="title" translatable="yes">Factor Analysis: Rotation</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox8">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Find Case</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox14">
<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="title" translatable="yes">Frequencies</property>
<property name="modal">True</property>
<property name="help-page">FREQUENCIES</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Frequencies: Frequency Tables</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox6">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Frequencies: Charts</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox5">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Goto Case</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox8">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Independent-Samples T Test</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox15">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Define Groups</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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>
<object class="PsppireDialog" id="k-means-dialog">
<property name="title" translatable="yes">K-Means Cluster Analysis</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
<property name="help-page">QUICK-CLUSTER</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<object class="PsppireDialog" id="k-related-dialog">
<property name="title" translatable="yes">Tests for Several Related Samples</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<object class="PsppireDialog" id="ks-one-sample-dialog">
<property name="title" translatable="yes">One-Sample Kolmogorov-Smirnov Test</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="title" translatable="yes">Logistic Regression</property>
<property name="modal">True</property>
<property name="help-page">LOGISTIC-REGRESSION</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Logistic Regression: Options</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox4">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="title" translatable="yes">Means</property>
<property name="modal">True</property>
<property name="help-page">MEANS</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox16">
<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>
type, n_properties, properties);
dialog = PSPPIRE_MISSING_VAL_DIALOG (obj);
- content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog)->box);
+ content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog));
xml = builder_new ("missing-val-dialog.ui");
gtk_container_add (GTK_CONTAINER (content_area),
get_widget_assert (xml, "missing-values-dialog"));
<property name="title" translatable="yes">One-Way ANOVA</property>
<property name="modal">True</property>
<property name="help-page">ONEWAY</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox15">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">One-Way ANOVA: Contrasts</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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>
<object class="PsppireDialog" id="t-test-paired-samples-dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox6">
<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>
static GObjectClass *parent_class = NULL;
-
-static void psppire_dialog_buildable_init (GtkBuildableIface *iface);
-
static void
psppire_dialog_finalize (GObject *object)
{
(GInstanceInitFunc) psppire_dialog_init,
};
- static const GInterfaceInfo buildable_info =
- {
- (GInterfaceInitFunc) psppire_dialog_buildable_init,
- NULL,
- NULL
- };
-
dialog_type = g_type_register_static (PSPPIRE_TYPE_WINDOW_BASE,
"PsppireDialog", &dialog_info, 0);
-
- g_type_add_interface_static (dialog_type,
- GTK_TYPE_BUILDABLE,
- &buildable_info);
}
return dialog_type;
switch (prop_id)
{
- case PROP_ORIENTATION:
- {
- if ( GTK_IS_VBOX (dialog->box) || GTK_VPANED (dialog->box))
- g_value_set_enum (value, PSPPIRE_VERTICAL);
- else if ( GTK_IS_HBOX (dialog->box) || GTK_HPANED (dialog->box))
- g_value_set_enum (value, PSPPIRE_HORIZONTAL);
- else if ( GTK_IS_TABLE (dialog->box))
- g_value_set_enum (value, PSPPIRE_TABULAR);
- }
- break;
case PROP_SLIDING:
g_value_set_boolean (value, dialog->slidable);
break;
};
}
-
-static void
-dialog_set_container (PsppireDialog *dialog)
-{
- if ( dialog->box != NULL)
- {
- gtk_container_remove (GTK_CONTAINER (dialog), dialog->box);
- }
-
- switch (dialog->orientation)
- {
- case PSPPIRE_HORIZONTAL:
- if ( dialog->slidable)
- dialog->box = gtk_hpaned_new();
- else
- dialog->box = gtk_hbox_new (FALSE, 5);
- break;
- case PSPPIRE_VERTICAL:
- if ( dialog->slidable)
- dialog->box = gtk_vpaned_new();
- else
- dialog->box = gtk_vbox_new (FALSE, 5);
- break;
- case PSPPIRE_TABULAR:
- dialog->box = gtk_table_new (2, 3, FALSE);
- g_object_set (dialog->box,
- "row-spacing", 5,
- "column-spacing", 5,
- NULL);
- break;
- }
-
- gtk_widget_show_all (dialog->box);
- gtk_container_add (GTK_CONTAINER (dialog), dialog->box);
-}
-
-
static void
psppire_dialog_set_property (GObject *object,
guint prop_id,
case PROP_SLIDING:
dialog->slidable = g_value_get_boolean (value);
break;
- case PROP_ORIENTATION:
- dialog->orientation = g_value_get_enum (value);
- break;
case PROP_HELP_PAGE:
dialog->help_page = g_value_dup_string (value);
break;
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
};
-
- dialog_set_container (dialog);
}
-
-static GParamSpec *orientation_spec ;
-
static void
psppire_dialog_class_init (PsppireDialogClass *class)
{
NULL,
G_PARAM_READWRITE);
- orientation_spec =
- g_param_spec_enum ("orientation",
- "Orientation",
- "Which way widgets are packed",
- PSPPIRE_TYPE_ORIENTATION,
- PSPPIRE_HORIZONTAL /* default value */,
- G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
-
sliding_spec =
g_param_spec_boolean ("slidable",
"Slidable",
object_class->set_property = psppire_dialog_set_property;
object_class->get_property = psppire_dialog_get_property;
- g_object_class_install_property (object_class,
- PROP_ORIENTATION,
- orientation_spec);
-
-
g_object_class_install_property (object_class,
PROP_SLIDING,
sliding_spec);
1,
G_TYPE_STRING);
-
parent_class = g_type_class_peek_parent (class);
}
-
-
-
static void
close_dialog (GtkWidget *w, gpointer data)
{
gtk_widget_hide (GTK_WIDGET (dialog));
}
-
static void
delete_event_callback (GtkWidget *w, GdkEvent *e, gpointer data)
{
static void
psppire_dialog_init (PsppireDialog *dialog)
{
- GValue value = {0};
- dialog->box = NULL;
dialog->contents_are_valid = NULL;
dialog->validity_data = NULL;
dialog->contents_are_acceptable = NULL;
dialog->slidable = FALSE;
dialog->help_page = NULL;
- g_value_init (&value, orientation_spec->value_type);
- g_param_value_set_default (orientation_spec, &value);
-
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
- g_value_unset (&value);
-
g_signal_connect (dialog, "delete-event",
G_CALLBACK (delete_event_callback),
dialog);
g_object_set (dialog, "icon-name", "pspp", NULL);
}
-
GtkWidget*
psppire_dialog_new (void)
{
g_warning ("PsppireDialog %s has no title", gtk_widget_get_name (GTK_WIDGET (dialog)));
if ( dialog->contents_are_valid != NULL )
- gtk_container_foreach (GTK_CONTAINER (dialog->box),
+ gtk_container_foreach (gtk_bin_get_child(GTK_BIN(dialog)),
connect_notify_signal,
dialog);
g_signal_emit (dialog, signals [DIALOG_HELP], 0, page);
}
-
-GType
-psppire_orientation_get_type (void)
-{
- static GType etype = 0;
- if (etype == 0)
- {
- static const GEnumValue values[] =
- {
- { PSPPIRE_HORIZONTAL, "PSPPIRE_HORIZONTAL", "Horizontal" },
- { PSPPIRE_VERTICAL, "PSPPIRE_VERTICAL", "Vertical" },
- { PSPPIRE_TABULAR, "PSPPIRE_TABULAR", "Tabular" },
- { 0, NULL, NULL }
- };
-
- etype = g_enum_register_static
- (g_intern_static_string ("PsppireOrientation"), values);
-
- }
- return etype;
-}
-
-
/* Sets a predicate function that is checked after each change that the user
makes to the dialog's state. If the predicate function returns false, then
"OK" and other buttons that accept the dialog's settings will be
return (dialog->contents_are_acceptable == NULL
|| dialog->contents_are_acceptable (dialog->acceptable_data));
}
-
-
-
-
-static GObject *
-get_internal_child (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *childname)
-{
- PsppireDialog *dialog = PSPPIRE_DIALOG (buildable);
-
- if ( 0 == strcmp (childname, "hbox"))
- return G_OBJECT (dialog->box);
-
- return NULL;
-}
-
-
-
-static void
-psppire_dialog_buildable_init (GtkBuildableIface *iface)
-{
- iface->get_internal_child = get_internal_child;
-}
struct _PsppireDialog
{
PsppireWindowBase window;
- GtkWidget *box;
/* Private */
GMainLoop *loop;
ContentsAreValid contents_are_acceptable;
gpointer acceptable_data;
gboolean slidable;
- PsppireOrientation orientation;
-
gchar *help_page;
};
gboolean psppire_dialog_is_acceptable (const PsppireDialog *);
void psppire_dialog_notify_change (PsppireDialog *);
-
-
-GType psppire_orientation_get_type (void);
-
-
-#define PSPPIRE_TYPE_ORIENTATION (psppire_orientation_get_type ())
-
-
G_END_DECLS
#endif /* __PSPPIRE_DIALOG_H__ */
<property name="title" translatable="yes">Weight Cases</property>
<property name="modal">True</property>
<property name="help-page">WEIGHT</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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 | GDK_ENTER_NOTIFY_MASK</property>
<property name="title" translatable="yes">Transpose</property>
<property name="modal">True</property>
<property name="help-page">FLIP</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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 | GDK_ENTER_NOTIFY_MASK</property>
<property name="title" translatable="yes">Data File Comments</property>
<property name="modal">True</property>
<property name="help-page">DOCUMENT</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox7">
<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="title" translatable="yes">Rank Cases</property>
<property name="modal">True</property>
<property name="help-page">RANK</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Rank Cases: Types</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Rank Cases: Ties</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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>
<object class="PsppireDialog" id="old-new-values-dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Recode into Same Variables</property>
<property name="modal">True</property>
- <property name="orientation">Tabular</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkTable" id="dialog-hbox3">
<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="title" translatable="yes">Regression</property>
<property name="modal">True</property>
<property name="help-page">REGRESSION</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Regression: Save</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Regression: Statistics</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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="title" translatable="yes">Reliability Analysis</property>
<property name="modal">True</property>
<property name="help-page">RELIABILITY</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox5">
<property name="visible">True</property>
<child>
<property name="title" translatable="yes">ROC Curve</property>
<property name="modal">True</property>
<property name="help-page">ROC</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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>
<object class="PsppireDialog" id="runs-dialog">
<property name="title" translatable="yes">Runs Test</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
<property name="help-page">NPAR-TESTS#RUNS</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Select Cases</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
<property name="help-page">SELECT-IF</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox6">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Select Cases: Range</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox10">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Select Cases: Random Sample</property>
<property name="modal">True</property>
- <property name="orientation">Vertical</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkVBox" id="dialog-hbox13">
<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="title" translatable="yes">Sort Cases</property>
<property name="modal">True</property>
<property name="help-page">SORT-CASES</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox4">
<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="title" translatable="yes">Split File</property>
<property name="modal">True</property>
<property name="help-page">SPLIT-FILE</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Options</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">One - Sample T Test</property>
<property name="modal">True</property>
- <property name="orientation">Tabular</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkTable" id="dialog-hbox5">
<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>
<object class="PsppireDialog" id="univariate-dialog">
<property name="title" translatable="yes">Univariate</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox1">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Univariate: Save</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox2">
<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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Univariate: Statistics</property>
<property name="modal">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHBox" id="dialog-hbox3">
<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>
type, n_properties, properties);
dialog = PSPPIRE_VAL_LABS_DIALOG (obj);
- content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog)->box);
+ content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (content_area),
get_widget_assert (xml, "val-labs-dialog"));
xml = builder_new ("var-type-dialog.ui");
- content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog)->box);
+ content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (content_area),
get_widget_assert (xml, "var-type-dialog"));
<property name="title" translatable="yes">Variables</property>
<property name="modal">True</property>
<property name="slidable">True</property>
- <child internal-child="hbox">
+ <child>
<object class="GtkHPaned" id="dialog-hbox2">
<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>
projects / pspp / commitdiff
