/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011, 2012 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];
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
};
{
case PROP_ORIENTATION:
{
- if ( GTK_IS_VBOX (dialog->box) )
+ if ( GTK_IS_VBOX (dialog->box) || GTK_VPANED (dialog->box))
g_value_set_enum (value, PSPPIRE_VERTICAL);
- else if ( GTK_IS_HBOX (dialog->box))
+ 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;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
static void
-dialog_set_orientation (PsppireDialog *dialog, const GValue *orval)
+dialog_set_container (PsppireDialog *dialog)
{
- PsppireOrientation orientation = g_value_get_enum (orval);
-
if ( dialog->box != NULL)
{
gtk_container_remove (GTK_CONTAINER (dialog), dialog->box);
}
- switch ( orientation )
+ switch (dialog->orientation)
{
case PSPPIRE_HORIZONTAL:
- dialog->box = gtk_hbox_new (FALSE, 5);
+ if ( dialog->slidable)
+ dialog->box = gtk_hpaned_new();
+ else
+ dialog->box = gtk_hbox_new (FALSE, 5);
break;
case PSPPIRE_VERTICAL:
- dialog->box = gtk_vbox_new (FALSE, 5);
+ 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);
break;
}
+ gtk_widget_show_all (dialog->box);
gtk_container_add (GTK_CONTAINER (dialog), dialog->box);
}
switch (prop_id)
{
+ case PROP_SLIDING:
+ dialog->slidable = g_value_get_boolean (value);
+ break;
case PROP_ORIENTATION:
- dialog_set_orientation (dialog, value);
+ dialog->orientation = g_value_get_enum (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
};
+
+ dialog_set_container (dialog);
}
{
GObjectClass *object_class = (GObjectClass *) class;
+ GParamSpec *sliding_spec ;
orientation_spec =
g_param_spec_enum ("orientation",
"Orientation",
"Which way widgets are packed",
- G_TYPE_PSPPIRE_ORIENTATION,
+ PSPPIRE_TYPE_ORIENTATION,
PSPPIRE_HORIZONTAL /* default value */,
G_PARAM_CONSTRUCT_ONLY |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;
orientation_spec);
+ g_object_class_install_property (object_class,
+ PROP_SLIDING,
+ sliding_spec);
signals [DIALOG_REFRESH] =
g_signal_new ("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);
}
dialog->box = NULL;
dialog->contents_are_valid = NULL;
dialog->validity_data = NULL;
+ dialog->contents_are_acceptable = NULL;
+ dialog->acceptable_data = NULL;
+ dialog->slidable = FALSE;
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);
- 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);
}
{
PsppireDialog *dialog ;
- dialog = g_object_new (psppire_dialog_get_type (), NULL);
+ dialog = g_object_new (psppire_dialog_get_type (),
+ NULL);
return GTK_WIDGET (dialog) ;
}
}
+static void
+remove_notify_handlers (PsppireDialog *dialog, GObject *sel)
+{
+ g_signal_handlers_disconnect_by_data (sel, dialog);
+}
+
+
/* Descend the widget tree, connecting appropriate signals to the
psppire_dialog_notify_change callback */
static void
if ( PSPPIRE_IS_BUTTONBOX (w))
return;
-
-
if ( GTK_IS_CONTAINER (w))
{
gtk_container_foreach (GTK_CONTAINER (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 (dialog, "destroy", G_CALLBACK (remove_notify_handlers),
+ model);
+ }
+
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),
connect_notify_signal,
g_signal_emit (dialog, signals [DIALOG_REFRESH], 0);
+ gdk_threads_leave ();
g_main_loop_run (dialog->loop);
+ gdk_threads_enter ();
g_main_loop_unref (dialog->loop);
+ g_signal_emit (dialog, signals [RESPONSE], 0, dialog->response);
+
return dialog->response;
}
}
+void
+psppire_dialog_help (PsppireDialog *dialog)
+{
+ char *name = NULL;
+ g_object_get (dialog, "name", &name, NULL);
+
+ online_help (name);
+
+ g_signal_emit (dialog, signals [DIALOG_HELP], 0, name);
+}
GType
}
+/* 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.)
+
+ 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)
+{
+ dialog->contents_are_acceptable = contents_are_acceptable;
+ dialog->acceptable_data = data;
+}
+
+gboolean
+psppire_dialog_is_acceptable (const PsppireDialog *dialog)
+{
+ return (dialog->contents_are_acceptable == NULL
+ || dialog->contents_are_acceptable (dialog->acceptable_data));
+}