#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 *);
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 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
{
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)
-{
- const gchar *base;
-
- PsppireConf *conf = psppire_conf_new ();
-
- if ( ! gtk_widget_get_mapped (GTK_WIDGET (dialog)))
- return FALSE;
-
- base = gtk_buildable_get_name (GTK_BUILDABLE (dialog));
-
- psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (dialog));
-
- return FALSE;
-}
-
-
-static void
-on_realize (GtkWindow *dialog, gpointer data)
-{
- PsppireConf *conf = psppire_conf_new ();
-
- const gchar *base = gtk_buildable_get_name (GTK_BUILDABLE (dialog));
-
- 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);
}
+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 ( 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);
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,
}
+/* 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