X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-selector.c;h=d6ea3375257186d0566aa8a7706da717030db17c;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=753a9dc8c5481fe3c963c570eaff2e9291bb129e;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp-builds.git
diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c
index 753a9dc8..d6ea3375 100644
--- a/src/ui/gui/psppire-selector.c
+++ b/src/ui/gui/psppire-selector.c
@@ -1,10 +1,9 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* 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
+ 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
+ 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,
@@ -13,9 +12,7 @@
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. */
+ along with this program. If not, see . */
/*
This module provides a widget, PsppireSelector derived from
@@ -62,11 +59,13 @@
#include
#include
+#include
#include "psppire-selector.h"
#include
#include
+#include
#include
static void psppire_selector_base_finalize (PsppireSelectorClass *, gpointer);
@@ -74,6 +73,10 @@ static void psppire_selector_base_init (PsppireSelectorClass *class);
static void psppire_selector_class_init (PsppireSelectorClass *class);
static void psppire_selector_init (PsppireSelector *selector);
+
+static void set_direction (PsppireSelector *, enum psppire_selector_dir);
+
+
enum {SELECTED, /* Emitted when an item is inserted into dest */
DE_SELECTED, /* Emitted when an item is removed from dest */
n_SIGNALS};
@@ -115,11 +118,79 @@ psppire_selector_finalize (GObject *object)
{
}
+/* Properties */
+enum
+{
+ PROP_0,
+ PROP_ORIENTATION
+};
+
+
+static void on_activate (PsppireSelector *selector, gpointer data);
+
+
+static void
+psppire_selector_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ PsppireSelector *selector = PSPPIRE_SELECTOR (object);
+
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ selector->orientation = g_value_get_enum (value);
+ set_direction (selector, selector->direction);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ };
+}
+
+
+static void
+psppire_selector_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ PsppireSelector *selector = PSPPIRE_SELECTOR (object);
+
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, selector->orientation);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ };
+}
+
static void
psppire_selector_class_init (PsppireSelectorClass *class)
{
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GParamSpec *orientation_spec =
+ g_param_spec_enum ("orientation",
+ "Orientation",
+ "Where the selector is relative to its subjects",
+ PSPPIRE_TYPE_SELECTOR_ORIENTATION,
+ PSPPIRE_SELECT_SOURCE_BEFORE_DEST /* default value */,
+ G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
+
+
+ object_class->set_property = psppire_selector_set_property;
+ object_class->get_property = psppire_selector_get_property;
+
+ g_object_class_install_property (object_class,
+ PROP_ORIENTATION,
+ orientation_spec);
+
signals [SELECTED] =
g_signal_new ("selected",
G_TYPE_FROM_CLASS (class),
@@ -139,8 +210,6 @@ psppire_selector_class_init (PsppireSelectorClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
-
-
}
@@ -164,19 +233,24 @@ psppire_selector_base_finalize(PsppireSelectorClass *class,
}
+
static void
psppire_selector_init (PsppireSelector *selector)
{
selector->arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
selector->filtered_source = NULL;
+ selector->action = gtk_action_new ("select", NULL, NULL, "pspp-stock-select");
+
+ gtk_action_connect_proxy (selector->action, GTK_WIDGET (selector));
+
gtk_container_add (GTK_CONTAINER (selector), selector->arrow);
gtk_widget_show (selector->arrow);
- /* FIXME: This shouldn't be necessary, but Glade interfaces seem to
- need it. */
- gtk_widget_show (GTK_WIDGET (selector));
+ g_signal_connect_swapped (selector->action, "activate", G_CALLBACK (on_activate), selector);
+
+ selector->selecting = FALSE;
}
@@ -195,9 +269,48 @@ set_direction (PsppireSelector *selector, enum psppire_selector_dir d)
/* FIXME: Need to reverse the arrow direction if an RTL locale is in
effect */
if ( d == PSPPIRE_SELECTOR_SOURCE_TO_DEST )
- g_object_set (selector->arrow, "arrow-type", GTK_ARROW_RIGHT, NULL);
+ {
+ switch (selector->orientation)
+ {
+ case PSPPIRE_SELECT_SOURCE_BEFORE_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_RIGHT, NULL);
+ break;
+ case PSPPIRE_SELECT_SOURCE_AFTER_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_LEFT, NULL);
+ break;
+ case PSPPIRE_SELECT_SOURCE_ABOVE_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_DOWN, NULL);
+ break;
+ case PSPPIRE_SELECT_SOURCE_BELOW_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_UP, NULL);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ };
+ }
else
- g_object_set (selector->arrow, "arrow-type", GTK_ARROW_LEFT, NULL);
+ {
+ switch (selector->orientation)
+ {
+ case PSPPIRE_SELECT_SOURCE_BEFORE_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_LEFT, NULL);
+ break;
+ case PSPPIRE_SELECT_SOURCE_AFTER_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_RIGHT, NULL);
+ break;
+ case PSPPIRE_SELECT_SOURCE_ABOVE_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_UP, NULL);
+ break;
+ case PSPPIRE_SELECT_SOURCE_BELOW_DEST:
+ g_object_set (selector->arrow, "arrow-type", GTK_ARROW_DOWN, NULL);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ };
+
+ }
}
/* Callback for when the source selection changes */
@@ -208,9 +321,14 @@ on_source_select (GtkTreeSelection *treeselection, gpointer data)
set_direction (selector, PSPPIRE_SELECTOR_SOURCE_TO_DEST);
- if ( GTK_IS_ENTRY (selector->dest) )
+ if ( selector->allow_selection )
+ {
+ gtk_action_set_sensitive (selector->action,
+ selector->allow_selection (selector->source, selector->dest));
+ }
+ else if ( GTK_IS_ENTRY (selector->dest) )
{
- gtk_widget_set_sensitive (GTK_WIDGET (selector),
+ gtk_action_set_sensitive (selector->action,
gtk_tree_selection_count_selected_rows
(treeselection) <= 1 );
}
@@ -222,6 +340,8 @@ on_dest_treeview_select (GtkTreeSelection *treeselection, gpointer data)
{
PsppireSelector *selector = data;
+ gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->source)));
+
set_direction (selector, PSPPIRE_SELECTOR_DEST_TO_SOURCE);
}
@@ -290,6 +410,8 @@ de_select_selection_tree_view (PsppireSelector *selector)
static void
de_select_selection (PsppireSelector *selector)
{
+ selector->selecting = TRUE;
+
if ( GTK_IS_TREE_VIEW (selector->dest ) )
de_select_selection_tree_view (selector);
@@ -299,6 +421,8 @@ de_select_selection (PsppireSelector *selector)
else
g_assert_not_reached ();
+ selector->selecting = FALSE;
+
gtk_tree_model_filter_refilter (selector->filtered_source);
g_signal_emit (selector, signals [DE_SELECTED], 0);
@@ -321,6 +445,7 @@ select_selection (PsppireSelector *selector)
g_return_if_fail (selector->select_items);
+ selector->selecting = TRUE;
for (item = g_list_first (selected_rows);
item != NULL;
@@ -340,7 +465,9 @@ select_selection (PsppireSelector *selector)
selector->select_items (child_iter,
selector->dest,
- childmodel);
+ childmodel,
+ selector->select_user_data
+ );
}
g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
@@ -349,9 +476,11 @@ select_selection (PsppireSelector *selector)
gtk_tree_model_filter_refilter (selector->filtered_source);
g_signal_emit (selector, signals [SELECTED], 0);
+
+ selector->selecting = FALSE;
}
-/* Callback fro then the source treeview is activated (double clicked) */
+/* Callback for when the source treeview is activated (double clicked) */
static void
on_row_activate (GtkTreeView *tree_view,
GtkTreePath *path,
@@ -360,12 +489,14 @@ on_row_activate (GtkTreeView *tree_view,
{
PsppireSelector *selector = data;
- select_selection (selector);
+ gtk_action_activate (selector->action);
}
-/* Callback for when the selector button is clicked */
+/* Callback for when the selector button is clicked,
+ or other event which causes the selector's action to occur.
+ */
static void
-on_click (PsppireSelector *selector, gpointer data)
+on_activate (PsppireSelector *selector, gpointer data)
{
switch (selector->direction)
{
@@ -420,10 +551,21 @@ is_item_in_dest (GtkTreeModel *model, GtkTreeIter *iter,
do
{
+ int x;
GValue value = {0};
+ GValue int_value = {0};
gtk_tree_model_get_value (dest_model, &dest_iter, 0, &value);
- if ( g_value_get_int (&value) == index)
+ g_value_init (&int_value, G_TYPE_INT);
+
+ g_value_transform (&value, &int_value);
+
+ x = g_value_get_int (&int_value);
+
+ g_value_unset (&int_value);
+ g_value_unset (&value);
+
+ if ( x == index )
return TRUE;
}
while (gtk_tree_model_iter_next (dest_model, &dest_iter));
@@ -449,8 +591,8 @@ is_source_item_visible (GtkTreeModel *childmodel,
{
PsppireSelector *selector = list->data;
- if ( selector->filter (childmodel, iter, selector))
- return FALSE;
+ if ( selector->filter && selector->filter (childmodel, iter, selector))
+ return FALSE;
list = list->next;
}
@@ -510,26 +652,68 @@ set_tree_view_source (PsppireSelector *selector,
}
+/*
+ Callback for when the destination treeview's data changes
+ */
+static void
+on_dest_data_change (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ PsppireSelector *selector = user_data;
+
+ if ( selector->selecting) return;
+
+ gtk_tree_model_filter_refilter (selector->filtered_source);
+}
+
+
+static void
+on_dest_data_delete (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ gpointer user_data)
+{
+ PsppireSelector *selector = user_data;
+
+ if ( selector->selecting ) return;
+
+ gtk_tree_model_filter_refilter (selector->filtered_source);
+}
+
+
+
+
/* Set the destination widget to DEST */
static void
set_tree_view_dest (PsppireSelector *selector,
GtkTreeView *dest)
{
GtkTreeSelection* selection = gtk_tree_view_get_selection (dest);
+ GtkTreeModel *model = gtk_tree_view_get_model (dest);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
g_signal_connect (selection, "changed", G_CALLBACK (on_dest_treeview_select),
selector);
+
+ g_signal_connect (model, "row-changed", G_CALLBACK (on_dest_data_change),
+ selector);
+
+ g_signal_connect (model, "row-deleted", G_CALLBACK (on_dest_data_delete),
+ selector);
+
}
-/* Callback for when the DEST GtkEntry is activated (Enter is pressed) */
-static void
-on_entry_activate (GtkEntry *w, gpointer data)
+/* Callback which causes the filter to be refiltered.
+ Called when the DEST GtkEntry is activated (Enter is pressed), or when it
+ looses focus.
+*/
+static gboolean
+refilter (PsppireSelector *selector)
{
- PsppireSelector * selector = data;
-
gtk_tree_model_filter_refilter (selector->filtered_source);
+ return FALSE;
}
/* Callback for when the DEST GtkEntry is selected (clicked) */
@@ -538,21 +722,59 @@ on_entry_dest_select (GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
PsppireSelector * selector = data;
+ gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->source)));
set_direction (selector, PSPPIRE_SELECTOR_DEST_TO_SOURCE);
return FALSE;
}
+
+
+/* Callback for when an item disappears from the source list.
+ By implication, this means that the item has been inserted into the
+ destination.
+ */
+static void
+on_row_deleted (PsppireSelector *selector)
+{
+ g_signal_emit (selector, signals [SELECTED], 0);
+}
+
+/* Callback for when a new item appears in the source list.
+ By implication, this means that an item has been deleted from the
+ destination.
+ */
+static void
+on_row_inserted (PsppireSelector *selector)
+{
+ g_signal_emit (selector, signals [DE_SELECTED], 0);
+}
+
+
+
/* Set DEST to be the destination GtkEntry widget */
static void
set_entry_dest (PsppireSelector *selector,
GtkEntry *dest)
{
- g_signal_connect (dest, "activate", G_CALLBACK (on_entry_activate),
+ g_signal_connect_swapped (dest, "activate", G_CALLBACK (refilter),
+ selector);
+
+ g_signal_connect_swapped (dest, "changed", G_CALLBACK (refilter),
selector);
g_signal_connect (dest, "focus-in-event", G_CALLBACK (on_entry_dest_select),
selector);
+
+ g_signal_connect_swapped (dest, "focus-out-event", G_CALLBACK (refilter),
+ selector);
+
+
+ g_signal_connect_swapped (selector->filtered_source, "row-deleted",
+ G_CALLBACK (on_row_deleted), selector);
+
+ g_signal_connect_swapped (selector->filtered_source, "row-inserted",
+ G_CALLBACK (on_row_inserted), selector);
}
@@ -563,12 +785,16 @@ psppire_selector_set_subjects (PsppireSelector *selector,
GtkWidget *source,
GtkWidget *dest,
SelectItemsFunc *select_func,
- FilterItemsFunc *filter_func )
+ FilterItemsFunc *filter_func,
+ gpointer user_data)
{
+ g_assert(selector);
+
selector->filter = filter_func ;
selector->source = source;
selector->dest = dest;
+ selector->select_user_data = user_data;
if ( filter_func == NULL)
{
@@ -576,8 +802,6 @@ psppire_selector_set_subjects (PsppireSelector *selector,
selector->filter = is_item_in_dest;
}
- g_signal_connect (selector, "clicked", G_CALLBACK (on_click), NULL);
-
if ( GTK_IS_TREE_VIEW (source))
set_tree_view_source (selector, GTK_TREE_VIEW (source) );
else
@@ -585,14 +809,48 @@ psppire_selector_set_subjects (PsppireSelector *selector,
g_assert ( GTK_IS_TREE_MODEL_FILTER (selector->filtered_source));
- if ( GTK_IS_TREE_VIEW (dest))
+ if ( NULL == dest)
+ ;
+ else if ( GTK_IS_TREE_VIEW (dest))
set_tree_view_dest (selector, GTK_TREE_VIEW (dest));
else if ( GTK_IS_ENTRY (dest))
set_entry_dest (selector, GTK_ENTRY (dest));
+ else if (GTK_IS_TEXT_VIEW (dest))
+ {
+ /* Nothing to be done */
+ }
+
else
g_error ("Unsupported destination widget: %s", G_OBJECT_TYPE_NAME (dest));
selector->select_items = select_func;
}
+
+
+
+void
+psppire_selector_set_allow (PsppireSelector *selector , AllowSelectionFunc *allow)
+{
+ selector->allow_selection = allow;
+}
+
+
+
+GType
+psppire_selector_orientation_get_type (void)
+{
+ static GType etype = 0;
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { PSPPIRE_SELECT_SOURCE_BEFORE_DEST, "PSPPIRE_SELECT_SOURCE_BEFORE_DEST", "source before destination" },
+ { PSPPIRE_SELECT_SOURCE_AFTER_DEST, "PSPPIRE_SELECT_SOURCE_AFTER_DEST", "source after destination" },
+ { PSPPIRE_SELECT_SOURCE_ABOVE_DEST, "PSPPIRE_SELECT_SOURCE_ABOVE_DEST", "source above destination" },
+ { PSPPIRE_SELECT_SOURCE_BELOW_DEST, "PSPPIRE_SELECT_SOURCE_BELOW_DEST", "source below destination" },
+ { 0, NULL, NULL }
+ };
+ etype = g_enum_register_static (g_intern_static_string ("PsppireSelectorOrientation"), values);
+ }
+ return etype;
+}