X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog.c;h=37eaa1fb50234d0d95305277373eda2b1aec2a94;hb=3380cd42c3831b98b71709a0c1fcb175e3e4a5d9;hp=22b4cf4eb339d752f0442fa6231b66696e10c29e;hpb=284371cbedd3a3a774f9ca5cd35e43fb38bb09e7;p=pspp diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 22b4cf4eb3..37eaa1fb50 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -1,5 +1,5 @@ /* 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 @@ -18,27 +18,50 @@ #include #include -#include -#include #include "psppire-dialog.h" #include "psppire-buttonbox.h" #include "psppire-selector.h" -#include "psppire-conf.h" #include +#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_buildable_init (GtkBuildableIface *iface); +static void +psppire_dialog_finalize (GObject *object) +{ + PsppireDialog *dialog = PSPPIRE_DIALOG (object); + + 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) @@ -50,7 +73,7 @@ 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 */ @@ -67,13 +90,12 @@ psppire_dialog_get_type (void) 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; @@ -81,30 +103,13 @@ psppire_dialog_get_type (void) -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, }; @@ -120,14 +125,20 @@ psppire_dialog_get_property (GObject *object, { 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; + case PROP_HELP_PAGE: + g_value_set_string (value, dialog->help_page); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -136,22 +147,26 @@ psppire_dialog_get_property (GObject *object, 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); @@ -162,6 +177,7 @@ dialog_set_orientation (PsppireDialog *dialog, const GValue *orval) break; } + gtk_widget_show_all (dialog->box); gtk_container_add (GTK_CONTAINER (dialog), dialog->box); } @@ -177,13 +193,21 @@ psppire_dialog_set_property (GObject *object, 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; + case PROP_HELP_PAGE: + dialog->help_page = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; }; + + dialog_set_container (dialog); } @@ -194,15 +218,30 @@ psppire_dialog_class_init (PsppireDialogClass *class) { GObjectClass *object_class = (GObjectClass *) class; + GParamSpec *sliding_spec ; + GParamSpec *help_page_spec ; + + 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); 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; @@ -212,6 +251,14 @@ psppire_dialog_class_init (PsppireDialogClass *class) orientation_spec); + g_object_class_install_property (object_class, + PROP_SLIDING, + sliding_spec); + + g_object_class_install_property (object_class, + PROP_HELP_PAGE, + help_page_spec); + signals [DIALOG_REFRESH] = g_signal_new ("refresh", @@ -224,6 +271,18 @@ psppire_dialog_class_init (PsppireDialogClass *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), @@ -236,7 +295,19 @@ psppire_dialog_class_init (PsppireDialogClass *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); } @@ -265,39 +336,6 @@ delete_event_callback (GtkWidget *w, GdkEvent *e, gpointer data) } -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) { @@ -305,6 +343,10 @@ 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; + dialog->help_page = NULL; g_value_init (&value, orientation_spec->value_type); g_param_value_set_default (orientation_spec, &value); @@ -312,29 +354,16 @@ psppire_dialog_init (PsppireDialog *dialog) 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 (dialog, "delete-event", 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); - - gtk_widget_show_all (dialog->box); + g_object_set (dialog, "icon-name", "pspp", NULL); } @@ -362,6 +391,13 @@ psppire_dialog_notify_change (PsppireDialog *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 @@ -372,8 +408,6 @@ connect_notify_signal (GtkWidget *w, gpointer data) if ( PSPPIRE_IS_BUTTONBOX (w)) return; - - if ( GTK_IS_CONTAINER (w)) { gtk_container_foreach (GTK_CONTAINER (w), @@ -438,26 +472,29 @@ connect_notify_signal (GtkWidget *w, gpointer data) 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) { @@ -475,6 +512,12 @@ connect_notify_signal (GtkWidget *w, gpointer data) 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, @@ -489,10 +532,14 @@ psppire_dialog_run (PsppireDialog *dialog) 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; } @@ -504,6 +551,17 @@ psppire_dialog_reload (PsppireDialog *dialog) } +void +psppire_dialog_help (PsppireDialog *dialog) +{ + const char *page = NULL; + + g_object_get (dialog, "help-page", &page, NULL); + + online_help (page); + + g_signal_emit (dialog, signals [DIALOG_HELP], 0, page); +} GType @@ -528,6 +586,10 @@ psppire_orientation_get_type (void) } +/* 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, @@ -537,6 +599,30 @@ psppire_dialog_set_valid_predicate (PsppireDialog *dialog, 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)); +}