X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog.c;h=99d32197ec28551e6e20f1d2ce6acaa543640f21;hb=34bfbdd99ac80a84447cb8bbc46de726d0bdc7fc;hp=22b4cf4eb339d752f0442fa6231b66696e10c29e;hpb=284371cbedd3a3a774f9ca5cd35e43fb38bb09e7;p=pspp diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 22b4cf4eb3..99d32197ec 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 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,13 +18,12 @@ #include #include -#include -#include #include "psppire-dialog.h" #include "psppire-buttonbox.h" #include "psppire-selector.h" #include "psppire-conf.h" #include +#include "helper.h" static void psppire_dialog_class_init (PsppireDialogClass *); static void psppire_dialog_init (PsppireDialog *); @@ -73,7 +72,6 @@ psppire_dialog_get_type (void) g_type_add_interface_static (dialog_type, GTK_TYPE_BUILDABLE, &buildable_info); - } return dialog_type; @@ -104,7 +102,8 @@ psppire_dialog_finalize (GObject *object) enum { PROP_0, - PROP_ORIENTATION + PROP_ORIENTATION, + PROP_SLIDING }; @@ -120,14 +119,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; @@ -136,22 +138,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 +168,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 +184,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); } @@ -194,15 +206,24 @@ psppire_dialog_class_init (PsppireDialogClass *class) { 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; @@ -212,6 +233,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", @@ -269,16 +295,16 @@ static gboolean configure_event_callback (GtkDialog *dialog, GdkEvent *event, gpointer data) { - gchar *base = NULL; + const gchar *base; PsppireConf *conf = psppire_conf_new (); - if ( ! GTK_WIDGET_MAPPED (dialog)) + if ( ! gtk_widget_get_mapped (GTK_WIDGET (dialog))) return FALSE; - g_object_get (dialog, "name", &base, NULL); + base = gtk_buildable_get_name (GTK_BUILDABLE (dialog)); - psppire_conf_save_window_geometry (conf, base, event); + psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (dialog)); return FALSE; } @@ -289,9 +315,7 @@ on_realize (GtkWindow *dialog, gpointer data) { PsppireConf *conf = psppire_conf_new (); - const gchar *base = NULL; - - g_object_get (dialog, "name", &base, NULL); + const gchar *base = gtk_buildable_get_name (GTK_BUILDABLE (dialog)); psppire_conf_set_window_geometry (conf, base, dialog); } @@ -305,6 +329,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); @@ -312,8 +337,6 @@ 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", @@ -332,9 +355,7 @@ psppire_dialog_init (PsppireDialog *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); } @@ -457,7 +478,7 @@ connect_notify_signal (GtkWidget *w, gpointer data) 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) { @@ -489,7 +510,9 @@ 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);