X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog.c;h=cea5134630c8483e095c365e95693b595fddb47e;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=a6118f44214b2403f29f6d86517560a1199ae4e3;hpb=992bcbd6001c1b36828de093c3b218f5bfd688b6;p=pspp-builds.git
diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index a6118f44..cea51346 100644
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -1,37 +1,45 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+#include
+
#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 *);
enum {DIALOG_REFRESH,
+ VALIDITY_CHANGED,
n_SIGNALS};
static guint signals [n_SIGNALS];
+static void psppire_dialog_buildable_init (GtkBuildableIface *iface);
+
+
GType
psppire_dialog_get_type (void)
{
@@ -52,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;
@@ -79,11 +98,148 @@ psppire_dialog_finalize (GObject *object)
}
+
+/* Properties */
+enum
+{
+ PROP_0,
+ PROP_ORIENTATION,
+ PROP_SLIDING
+};
+
+
+static void
+psppire_dialog_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ PsppireDialog *dialog = PSPPIRE_DIALOG (object);
+
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ {
+ if ( GTK_IS_VBOX (dialog->box) || GTK_VPANED (dialog->box))
+ g_value_set_enum (value, PSPPIRE_VERTICAL);
+ 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;
+ };
+}
+
+
+static void
+dialog_set_container (PsppireDialog *dialog)
+{
+ if ( dialog->box != NULL)
+ {
+ gtk_container_remove (GTK_CONTAINER (dialog), dialog->box);
+ }
+
+ switch (dialog->orientation)
+ {
+ 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);
+}
+
+
+static void
+psppire_dialog_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+
+{
+ PsppireDialog *dialog = PSPPIRE_DIALOG (object);
+
+ switch (prop_id)
+ {
+ case PROP_SLIDING:
+ dialog->slidable = g_value_get_boolean (value);
+ break;
+ case PROP_ORIENTATION:
+ dialog->orientation = g_value_get_enum (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ };
+
+ dialog_set_container (dialog);
+}
+
+
+static GParamSpec *orientation_spec ;
+
static void
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",
+ 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;
+
+ g_object_class_install_property (object_class,
+ PROP_ORIENTATION,
+ orientation_spec);
+
+
+ g_object_class_install_property (object_class,
+ PROP_SLIDING,
+ sliding_spec);
+
+
+
signals [DIALOG_REFRESH] =
g_signal_new ("refresh",
G_TYPE_FROM_CLASS (class),
@@ -95,6 +251,18 @@ psppire_dialog_class_init (PsppireDialogClass *class)
0);
+ signals [VALIDITY_CHANGED] =
+ g_signal_new ("validity-changed",
+ G_TYPE_FROM_CLASS (class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_BOOLEAN);
+
+
object_class->finalize = psppire_dialog_finalize;
}
@@ -124,20 +292,73 @@ 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)
{
- dialog->box = gtk_hbox_new (FALSE, 5);
+ GValue value = {0};
+ 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);
- gtk_container_add (GTK_CONTAINER (dialog), dialog->box);
+ gtk_window_set_type_hint (GTK_WINDOW (dialog),
+ GDK_WINDOW_TYPE_HINT_DIALOG);
+ g_value_unset (&value);
- g_signal_connect (G_OBJECT (dialog), "delete-event",
+ g_signal_connect (dialog, "delete-event",
G_CALLBACK (delete_event_callback),
dialog);
- gtk_widget_show_all (dialog->box);
+ 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);
}
@@ -146,26 +367,223 @@ 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) ;
}
+
+void
+psppire_dialog_notify_change (PsppireDialog *dialog)
+{
+ if ( dialog->contents_are_valid )
+ {
+ gboolean valid = dialog->contents_are_valid (dialog->validity_data);
+
+ g_signal_emit (dialog, signals [VALIDITY_CHANGED], 0, valid);
+ }
+}
+
+
+/* Descend the widget tree, connecting appropriate signals to the
+ psppire_dialog_notify_change callback */
+static void
+connect_notify_signal (GtkWidget *w, gpointer data)
+{
+ PsppireDialog *dialog = data;
+
+ if ( PSPPIRE_IS_BUTTONBOX (w))
+ return;
+
+
+
+ if ( GTK_IS_CONTAINER (w))
+ {
+ gtk_container_foreach (GTK_CONTAINER (w),
+ connect_notify_signal,
+ dialog);
+ }
+
+
+ /* It's unfortunate that GTK+ doesn't have a generic
+ "user-modified-state-changed" signal. Instead, we have to try and
+ predict what widgets and signals are likely to exist in our dialogs. */
+
+ if ( GTK_IS_TOGGLE_BUTTON (w))
+ {
+ 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 (psppire_dialog_notify_change),
+ dialog);
+
+ 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 (psppire_dialog_notify_change),
+ dialog);
+ }
+
+ if ( GTK_IS_CELL_EDITABLE (w))
+ {
+ g_signal_connect_swapped (w, "editing-done",
+ G_CALLBACK (psppire_dialog_notify_change),
+ dialog);
+ }
+
+ if ( GTK_IS_TEXT_VIEW (w))
+ {
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (w));
+
+ g_signal_connect_swapped (buffer, "changed",
+ G_CALLBACK (psppire_dialog_notify_change),
+ dialog);
+ }
+
+ if ( GTK_IS_TREE_VIEW (w))
+ {
+ gint i = 0;
+ GtkTreeView *tv = GTK_TREE_VIEW (w);
+ 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 (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 *start = renderers;
+ while (renderers)
+ {
+ if ( GTK_IS_CELL_RENDERER_TOGGLE (renderers->data))
+ g_signal_connect_swapped (renderers->data, "toggled",
+ G_CALLBACK (psppire_dialog_notify_change), dialog);
+ renderers = renderers->next;
+ }
+ g_list_free (start);
+ }
+ }
+}
+
+
gint
psppire_dialog_run (PsppireDialog *dialog)
{
+ if ( dialog->contents_are_valid != NULL )
+ gtk_container_foreach (GTK_CONTAINER (dialog->box),
+ connect_notify_signal,
+ dialog);
+
dialog->loop = g_main_loop_new (NULL, FALSE);
gtk_widget_show (GTK_WIDGET (dialog));
+ if ( dialog->contents_are_valid != NULL)
+ g_signal_emit (dialog, signals [VALIDITY_CHANGED], 0, FALSE);
+
+ 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);
return dialog->response;
}
void
-psppire_dialog_reload (PsppireDialog *dialog, gpointer data)
+psppire_dialog_reload (PsppireDialog *dialog)
+{
+ g_signal_emit (dialog, signals [DIALOG_REFRESH], 0);
+}
+
+
+
+
+GType
+psppire_orientation_get_type (void)
+{
+ static GType etype = 0;
+ if (etype == 0)
+ {
+ static const GEnumValue values[] =
+ {
+ { PSPPIRE_HORIZONTAL, "PSPPIRE_HORIZONTAL", "Horizontal" },
+ { PSPPIRE_VERTICAL, "PSPPIRE_VERTICAL", "Vertical" },
+ { PSPPIRE_TABULAR, "PSPPIRE_TABULAR", "Tabular" },
+ { 0, NULL, NULL }
+ };
+
+ etype = g_enum_register_static
+ (g_intern_static_string ("PsppireOrientation"), values);
+
+ }
+ return etype;
+}
+
+
+void
+psppire_dialog_set_valid_predicate (PsppireDialog *dialog,
+ ContentsAreValid contents_are_valid,
+ gpointer data)
+{
+ dialog->contents_are_valid = contents_are_valid;
+ dialog->validity_data = data;
+}
+
+
+
+
+
+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)
{
- g_signal_emit (dialog, signals [DIALOG_REFRESH], 0, data);
+ iface->get_internal_child = get_internal_child;
}