/* 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 "psppire-conf.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,
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);
}
FALSE,
G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
-
-
object_class->set_property = psppire_dialog_set_property;
object_class->get_property = psppire_dialog_get_property;
PROP_SLIDING,
sliding_spec);
-
-
signals [DIALOG_REFRESH] =
g_signal_new ("refresh",
G_TYPE_FROM_CLASS (class),
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);
+ 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);
+
+
object_class->finalize = psppire_dialog_finalize;
+
+ parent_class = g_type_class_peek_parent (class);
}
}
-static gboolean
-configure_event_callback (GtkDialog *dialog,
- GdkEvent *event, gpointer data)
-{
- gchar *base = NULL;
-
- PsppireConf *conf = psppire_conf_new ();
-
- if ( ! GTK_WIDGET_MAPPED (dialog))
- return FALSE;
-
- g_object_get (dialog, "name", &base, NULL);
-
- psppire_conf_save_window_geometry (conf, base, event);
-
- return FALSE;
-}
-
-
-static void
-on_realize (GtkWindow *dialog, gpointer data)
-{
- PsppireConf *conf = psppire_conf_new ();
-
- const gchar *base = NULL;
-
- g_object_get (dialog, "name", &base, NULL);
-
- psppire_conf_set_window_geometry (conf, base, dialog);
-}
-
-
-
static void
psppire_dialog_init (PsppireDialog *dialog)
{
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_CALLBACK (delete_event_callback),
dialog);
- g_signal_connect (dialog, "configure-event",
- G_CALLBACK (configure_event_callback),
- dialog);
-
- g_signal_connect (dialog, "realize",
- G_CALLBACK (on_realize),
- dialog);
-
-
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
- g_object_set (dialog, "icon-name", "psppicon", NULL);
+ g_object_set (dialog, "icon-name", "pspp", NULL);
}
if ( PSPPIRE_IS_BUTTONBOX (w))
return;
-
-
if ( GTK_IS_CONTAINER (w))
{
gtk_container_foreach (GTK_CONTAINER (w),
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)
{
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));
+}
projects / pspp / blobdiff