/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011, 2012, 2015 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
#include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbuildable.h>
#include "psppire-dialog.h"
#include "psppire-buttonbox.h"
#include "psppire-selector.h"
#include <string.h>
+#include "builder-wrapper.h"
+#include "help-menu.h"
+
+#include "psppire-window-base.h"
static void psppire_dialog_class_init (PsppireDialogClass *);
static void psppire_dialog_init (PsppireDialog *);
enum {DIALOG_REFRESH,
+ RESPONSE,
VALIDITY_CHANGED,
+ DIALOG_HELP,
n_SIGNALS};
static guint signals [n_SIGNALS];
+static GObjectClass *parent_class = NULL;
+
+static void
+psppire_dialog_finalize (GObject *object)
+{
+ PsppireDialog *dialog = PSPPIRE_DIALOG (object);
-static void psppire_dialog_buildable_init (GtkBuildableIface *iface);
+ g_free (dialog->help_page);
+ if (G_OBJECT_CLASS (parent_class)->finalize)
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+psppire_dialog_base_init (PsppireDialogClass *class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+ object_class->finalize = psppire_dialog_finalize;
+}
GType
psppire_dialog_get_type (void)
static const GTypeInfo dialog_info =
{
sizeof (PsppireDialogClass),
- NULL, /* base_init */
+ (GBaseInitFunc) psppire_dialog_base_init,
NULL, /* base_finalize */
(GClassInitFunc) psppire_dialog_class_init,
NULL, /* class_finalize */
(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,
+ 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;
-static GObjectClass *parent_class = NULL;
-
-
-static void
-psppire_dialog_finalize (GObject *object)
-{
- PsppireDialog *dialog ;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (PSPPIRE_IS_DIALOG (object));
-
- dialog = PSPPIRE_DIALOG (object);
-
- if (G_OBJECT_CLASS (parent_class)->finalize)
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-
/* Properties */
enum
{
PROP_0,
- PROP_ORIENTATION
+ PROP_ORIENTATION,
+ PROP_SLIDING,
+ PROP_HELP_PAGE,
};
switch (prop_id)
{
- case PROP_ORIENTATION:
- {
- if ( GTK_IS_VBOX (dialog->box) )
- g_value_set_enum (value, PSPPIRE_VERTICAL);
- else if ( GTK_IS_HBOX (dialog->box))
- g_value_set_enum (value, PSPPIRE_HORIZONTAL);
- else if ( GTK_IS_TABLE (dialog->box))
- g_value_set_enum (value, PSPPIRE_TABULAR);
- }
+ case PROP_SLIDING:
+ g_value_set_boolean (value, dialog->slidable);
+ break;
+ case PROP_HELP_PAGE:
+ g_value_set_string (value, dialog->help_page);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
};
}
-
-static void
-dialog_set_orientation (PsppireDialog *dialog, const GValue *orval)
-{
- PsppireOrientation orientation = g_value_get_enum (orval);
-
- if ( dialog->box != NULL)
- {
- gtk_container_remove (GTK_CONTAINER (dialog), dialog->box);
- }
-
- switch ( orientation )
- {
- case PSPPIRE_HORIZONTAL:
- dialog->box = gtk_hbox_new (FALSE, 5);
- break;
- case PSPPIRE_VERTICAL:
- 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_container_add (GTK_CONTAINER (dialog), dialog->box);
-}
-
-
static void
psppire_dialog_set_property (GObject *object,
guint prop_id,
switch (prop_id)
{
- case PROP_ORIENTATION:
- dialog_set_orientation (dialog, value);
+ case PROP_SLIDING:
+ dialog->slidable = g_value_get_boolean (value);
+ break;
+ case PROP_HELP_PAGE:
+ dialog->help_page = g_value_dup_string (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
};
}
-
-static GParamSpec *orientation_spec ;
-
static void
psppire_dialog_class_init (PsppireDialogClass *class)
{
GObjectClass *object_class = (GObjectClass *) class;
+ GParamSpec *sliding_spec ;
+ GParamSpec *help_page_spec ;
- orientation_spec =
- g_param_spec_enum ("orientation",
- "Orientation",
- "Which way widgets are packed",
- G_TYPE_PSPPIRE_ORIENTATION,
- PSPPIRE_HORIZONTAL /* default value */,
- G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
+ help_page_spec =
+ g_param_spec_string ("help-page",
+ "Help Page",
+ "The section of the manual to load when the Help button is clicked",
+ NULL,
+ G_PARAM_READWRITE);
+ sliding_spec =
+ g_param_spec_boolean ("slidable",
+ "Slidable",
+ "Can the container be sized by the user",
+ FALSE,
+ G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
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);
+ PROP_SLIDING,
+ sliding_spec);
+ g_object_class_install_property (object_class,
+ PROP_HELP_PAGE,
+ help_page_spec);
signals [DIALOG_REFRESH] =
0);
+ signals [RESPONSE] =
+ g_signal_new ("response",
+ G_TYPE_FROM_CLASS (class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_INT);
+
+
signals [VALIDITY_CHANGED] =
g_signal_new ("validity-changed",
G_TYPE_FROM_CLASS (class),
G_TYPE_BOOLEAN);
- object_class->finalize = psppire_dialog_finalize;
-}
-
-
+ signals [DIALOG_HELP] =
+ g_signal_new ("help",
+ G_TYPE_FROM_CLASS (class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE,
+ 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;
-
- g_value_init (&value, orientation_spec->value_type);
- g_param_value_set_default (orientation_spec, &value);
+ dialog->contents_are_acceptable = NULL;
+ dialog->acceptable_data = NULL;
+ dialog->slidable = FALSE;
+ dialog->help_page = NULL;
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
- dialog_set_orientation (dialog, &value);
-
- g_value_unset (&value);
-
- g_signal_connect (G_OBJECT (dialog), "delete-event",
+ g_signal_connect (dialog, "delete-event",
G_CALLBACK (delete_event_callback),
dialog);
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_widget_show_all (dialog->box);
+ g_object_set (dialog, "icon-name", "pspp", NULL);
}
-
GtkWidget*
psppire_dialog_new (void)
{
PsppireDialog *dialog ;
- dialog = g_object_new (psppire_dialog_get_type (), NULL);
+ dialog = g_object_new (psppire_dialog_get_type (),
+ NULL);
return GTK_WIDGET (dialog) ;
}
if ( PSPPIRE_IS_BUTTONBOX (w))
return;
-
-
if ( GTK_IS_CONTAINER (w))
{
gtk_container_foreach (GTK_CONTAINER (w),
g_signal_connect_swapped (w, "de-selected",
G_CALLBACK (psppire_dialog_notify_change),
dialog);
+
+ psppire_selector_update_subjects (PSPPIRE_SELECTOR (w));
}
if ( GTK_IS_EDITABLE (w))
if ( model)
{
- g_signal_connect_swapped (model, "row-changed",
- G_CALLBACK (psppire_dialog_notify_change),
- dialog);
+ g_signal_connect_swapped (model, "row-changed",
+ G_CALLBACK (psppire_dialog_notify_change),
+ dialog);
- g_signal_connect_swapped (model, "row-deleted",
- G_CALLBACK (psppire_dialog_notify_change),
- dialog);
+ g_signal_connect_swapped (model, "row-deleted",
+ G_CALLBACK (psppire_dialog_notify_change),
+ dialog);
- g_signal_connect_swapped (model, "row-inserted",
- G_CALLBACK (psppire_dialog_notify_change),
- dialog);
- }
+ g_signal_connect_swapped (model, "row-inserted",
+ G_CALLBACK (psppire_dialog_notify_change),
+ dialog);
+ }
+
g_signal_connect_swapped (selection, "changed",
G_CALLBACK (psppire_dialog_notify_change),
dialog);
while ((col = gtk_tree_view_get_column (tv, i++)))
{
- GList *renderers = gtk_tree_view_column_get_cell_renderers (col);
+ GList *renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (col));
GList *start = renderers;
while (renderers)
{
gint
psppire_dialog_run (PsppireDialog *dialog)
{
+ gchar *title = NULL;
+ g_object_get (dialog, "title", &title, NULL);
+
+ if (title == NULL)
+ 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_CONTAINER (gtk_bin_get_child(GTK_BIN(dialog))),
connect_notify_signal,
dialog);
dialog->loop = g_main_loop_new (NULL, FALSE);
gtk_widget_show (GTK_WIDGET (dialog));
-
- if ( dialog->contents_are_valid != NULL)
- g_signal_emit (dialog, signals [VALIDITY_CHANGED], 0, FALSE);
-
- g_signal_emit (dialog, signals [DIALOG_REFRESH], 0);
+ psppire_dialog_notify_change (dialog);
g_main_loop_run (dialog->loop);
g_main_loop_unref (dialog->loop);
+ g_signal_emit (dialog, signals [RESPONSE], 0, dialog->response);
+
return dialog->response;
}
}
-
-
-GType
-psppire_orientation_get_type (void)
+void
+psppire_dialog_help (PsppireDialog *dialog)
{
- 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 }
- };
+ const char *page = NULL;
- etype = g_enum_register_static
- (g_intern_static_string ("PsppireOrientation"), values);
+ g_object_get (dialog, "help-page", &page, NULL);
- }
- return etype;
-}
+ online_help (page);
+ g_signal_emit (dialog, signals [DIALOG_HELP], 0, page);
+}
+/* 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
+ disabled. */
void
psppire_dialog_set_valid_predicate (PsppireDialog *dialog,
ContentsAreValid contents_are_valid,
dialog->validity_data = data;
}
+/* Sets a predicate function that is called after "OK" or another button that
+ accepts the dialog's settings is pushed. If the predicate function returns
+ false, then the button push is ignored. (If the predicate function returns
+ false, then it should take some action to notify the user why the contents
+ are unacceptable, e.g. pop up a dialog box.)
-
-
-
-static GObject *
-get_internal_child (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *childname)
+ An accept predicate is preferred over a validity predicate when the reason
+ why the dialog settings are unacceptable may not be obvious to the user, so
+ that the user needs a helpful message to explain. */
+void
+psppire_dialog_set_accept_predicate (PsppireDialog *dialog,
+ ContentsAreValid contents_are_acceptable,
+ gpointer data)
{
- PsppireDialog *dialog = PSPPIRE_DIALOG (buildable);
-
- if ( 0 == strcmp (childname, "hbox"))
- return G_OBJECT (dialog->box);
-
- return NULL;
+ dialog->contents_are_acceptable = contents_are_acceptable;
+ dialog->acceptable_data = data;
}
-
-
-static void
-psppire_dialog_buildable_init (GtkBuildableIface *iface)
+gboolean
+psppire_dialog_is_acceptable (const PsppireDialog *dialog)
{
- iface->get_internal_child = get_internal_child;
+ return (dialog->contents_are_acceptable == NULL
+ || dialog->contents_are_acceptable (dialog->acceptable_data));
}
projects / pspp / blobdiff