X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-selector.c;h=f3f684a16fc1e1e004835926c77ce45c5403e780;hb=1d5a97ba2afec23855a8294ff2814ab052f6777a;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..f3f684a1 100644 --- a/src/ui/gui/psppire-selector.c +++ b/src/ui/gui/psppire-selector.c @@ -62,6 +62,7 @@ #include #include +#include #include "psppire-selector.h" @@ -74,6 +75,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 +120,76 @@ psppire_selector_finalize (GObject *object) { } +/* Properties */ +enum +{ + PROP_0, + PROP_ORIENTATION +}; + + +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", + G_TYPE_PSPPIRE_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 +209,6 @@ psppire_selector_class_init (PsppireSelectorClass *class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - } @@ -174,9 +242,7 @@ psppire_selector_init (PsppireSelector *selector) gtk_widget_show (selector->arrow); - /* FIXME: This shouldn't be necessary, but Glade interfaces seem to - need it. */ - gtk_widget_show (GTK_WIDGET (selector)); + selector->selecting = FALSE; } @@ -195,9 +261,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 */ @@ -290,6 +395,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 +406,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 +430,7 @@ select_selection (PsppireSelector *selector) g_return_if_fail (selector->select_items); + selector->selecting = TRUE; for (item = g_list_first (selected_rows); item != NULL; @@ -349,9 +459,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, @@ -510,17 +622,57 @@ 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) */ @@ -596,3 +748,22 @@ psppire_selector_set_subjects (PsppireSelector *selector, selector->select_items = select_func; } + + + +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; +}