X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog.c;h=6a6733d2f457897ae8e89dfb08e53053d4b5d18b;hb=e589b646894ffc013ab5e57981c8ac07bce522dd;hp=90080094f8e2e5d4d4a22ea8ce1a09862abcca96;hpb=6063e91bfb952c369ca3343928ed30f53d1f0bdd;p=pspp-builds.git diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 90080094..6a6733d2 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -19,9 +19,12 @@ #include #include +#include #include "psppire-dialog.h" #include "psppire-buttonbox.h" #include "psppire-selector.h" +#include "psppire-conf.h" +#include static void psppire_dialog_class_init (PsppireDialogClass *); static void psppire_dialog_init (PsppireDialog *); @@ -34,6 +37,9 @@ enum {DIALOG_REFRESH, static guint signals [n_SIGNALS]; +static void psppire_dialog_buildable_init (GtkBuildableIface *iface); + + GType psppire_dialog_get_type (void) { @@ -54,8 +60,19 @@ psppire_dialog_get_type (void) (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, "PsppireDialog", &dialog_info, 0); + + g_type_add_interface_static (dialog_type, + GTK_TYPE_BUILDABLE, + &buildable_info); } return dialog_type; @@ -86,7 +103,8 @@ psppire_dialog_finalize (GObject *object) enum { PROP_0, - PROP_ORIENTATION + PROP_ORIENTATION, + PROP_SLIDING }; @@ -102,12 +120,17 @@ 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; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -116,24 +139,37 @@ 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); } - if ( orientation == PSPPIRE_HORIZONTAL) - { - dialog->box = gtk_hbox_new (FALSE, 5); - } - else + switch (dialog->orientation) { - dialog->box = gtk_vbox_new (FALSE, 5); + case PSPPIRE_HORIZONTAL: + if ( dialog->slidable) + dialog->box = gtk_hpaned_new(); + else + dialog->box = gtk_hbox_new (FALSE, 5); + break; + case PSPPIRE_VERTICAL: + 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); + g_object_set (dialog->box, + "row-spacing", 5, + "column-spacing", 5, + NULL); + break; } + gtk_widget_show_all (dialog->box); gtk_container_add (GTK_CONTAINER (dialog), dialog->box); } @@ -149,13 +185,18 @@ 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; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; }; + + dialog_set_container (dialog); } @@ -166,6 +207,7 @@ psppire_dialog_class_init (PsppireDialogClass *class) { GObjectClass *object_class = (GObjectClass *) class; + GParamSpec *sliding_spec ; orientation_spec = g_param_spec_enum ("orientation", @@ -175,6 +217,14 @@ psppire_dialog_class_init (PsppireDialogClass *class) 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; @@ -184,6 +234,11 @@ psppire_dialog_class_init (PsppireDialogClass *class) orientation_spec); + g_object_class_install_property (object_class, + PROP_SLIDING, + sliding_spec); + + signals [DIALOG_REFRESH] = g_signal_new ("refresh", @@ -237,6 +292,39 @@ 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) { @@ -244,6 +332,7 @@ psppire_dialog_init (PsppireDialog *dialog) dialog->box = NULL; dialog->contents_are_valid = NULL; dialog->validity_data = NULL; + dialog->slidable = FALSE; g_value_init (&value, orientation_spec->value_type); g_param_value_set_default (orientation_spec, &value); @@ -251,18 +340,25 @@ 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 (G_OBJECT (dialog), "delete-event", + 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); - gtk_widget_show_all (dialog->box); + g_object_set (dialog, "icon-name", "psppicon", NULL); } @@ -271,14 +367,15 @@ 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) ; } -static void -notify_change (PsppireDialog *dialog) +void +psppire_dialog_notify_change (PsppireDialog *dialog) { if ( dialog->contents_are_valid ) { @@ -290,7 +387,7 @@ notify_change (PsppireDialog *dialog) /* Descend the widget tree, connecting appropriate signals to the - notify_change callback */ + psppire_dialog_notify_change callback */ static void connect_notify_signal (GtkWidget *w, gpointer data) { @@ -315,28 +412,33 @@ connect_notify_signal (GtkWidget *w, gpointer data) if ( GTK_IS_TOGGLE_BUTTON (w)) { - g_signal_connect_swapped (w, "toggled", G_CALLBACK (notify_change), + g_signal_connect_swapped (w, "toggled", + G_CALLBACK (psppire_dialog_notify_change), dialog); } if ( PSPPIRE_IS_SELECTOR (w)) { - g_signal_connect_swapped (w, "selected", G_CALLBACK (notify_change), + g_signal_connect_swapped (w, "selected", + G_CALLBACK (psppire_dialog_notify_change), dialog); - g_signal_connect_swapped (w, "de-selected", G_CALLBACK (notify_change), + g_signal_connect_swapped (w, "de-selected", + G_CALLBACK (psppire_dialog_notify_change), dialog); } if ( GTK_IS_EDITABLE (w)) { - g_signal_connect_swapped (w, "changed", G_CALLBACK (notify_change), + g_signal_connect_swapped (w, "changed", + G_CALLBACK (psppire_dialog_notify_change), dialog); } if ( GTK_IS_CELL_EDITABLE (w)) { - g_signal_connect_swapped (w, "editing-done", G_CALLBACK (notify_change), + g_signal_connect_swapped (w, "editing-done", + G_CALLBACK (psppire_dialog_notify_change), dialog); } @@ -344,7 +446,8 @@ connect_notify_signal (GtkWidget *w, gpointer data) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (w)); - g_signal_connect_swapped (buffer, "changed", G_CALLBACK (notify_change), + g_signal_connect_swapped (buffer, "changed", + G_CALLBACK (psppire_dialog_notify_change), dialog); } @@ -355,9 +458,26 @@ connect_notify_signal (GtkWidget *w, gpointer data) GtkTreeSelection *selection = gtk_tree_view_get_selection (tv); GtkTreeViewColumn *col; + GtkTreeModel *model = gtk_tree_view_get_model (tv); + + if ( model) + { + 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-inserted", + G_CALLBACK (psppire_dialog_notify_change), + dialog); + } g_signal_connect_swapped (selection, "changed", - G_CALLBACK (notify_change), dialog); + G_CALLBACK (psppire_dialog_notify_change), + dialog); while ((col = gtk_tree_view_get_column (tv, i++))) { @@ -367,7 +487,7 @@ connect_notify_signal (GtkWidget *w, gpointer data) { if ( GTK_IS_CELL_RENDERER_TOGGLE (renderers->data)) g_signal_connect_swapped (renderers->data, "toggled", - G_CALLBACK (notify_change), dialog); + G_CALLBACK (psppire_dialog_notify_change), dialog); renderers = renderers->next; } g_list_free (start); @@ -395,6 +515,8 @@ psppire_dialog_run (PsppireDialog *dialog) g_main_loop_run (dialog->loop); + g_main_loop_unref (dialog->loop); + return dialog->response; } @@ -418,6 +540,7 @@ psppire_orientation_get_type (void) { { PSPPIRE_HORIZONTAL, "PSPPIRE_HORIZONTAL", "Horizontal" }, { PSPPIRE_VERTICAL, "PSPPIRE_VERTICAL", "Vertical" }, + { PSPPIRE_TABULAR, "PSPPIRE_TABULAR", "Tabular" }, { 0, NULL, NULL } }; @@ -439,3 +562,26 @@ psppire_dialog_set_valid_predicate (PsppireDialog *dialog, } + + + +static GObject * +get_internal_child (GtkBuildable *buildable, + GtkBuilder *builder, + const gchar *childname) +{ + PsppireDialog *dialog = PSPPIRE_DIALOG (buildable); + + if ( 0 == strcmp (childname, "hbox")) + return G_OBJECT (dialog->box); + + return NULL; +} + + + +static void +psppire_dialog_buildable_init (GtkBuildableIface *iface) +{ + iface->get_internal_child = get_internal_child; +}