X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-selector.c;h=678c2a749f240af62e12219cb58b4006ae15af8f;hb=8f7af0acaf8a9253242d89fcdb26e285841f7833;hp=372ef3c531f18adef3fde1c4dd470e860bffc098;hpb=ea17c5b225557fc0760810861451a84dc241d462;p=pspp diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c index 372ef3c531..678c2a749f 100644 --- a/src/ui/gui/psppire-selector.c +++ b/src/ui/gui/psppire-selector.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2009, 2010, 2012 Free Software Foundation + Copyright (C) 2007, 2009, 2010, 2012, 2015 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 @@ -19,7 +19,7 @@ This module provides a widget, PsppireSelector derived from GtkButton. - It contains a GtkArrow, and is used for selecting objects from a + It contains a GtkImage (to indicate the arrow), and is used for selecting objects from a GtkTreeView and putting them into a destination widget (often another GtkTreeView). Typically this is used in psppire for selecting variables, thus: @@ -59,17 +59,16 @@ #include #include "psppire-dictview.h" -#include "psppire-var-view.h" #include "psppire-dict.h" #include "psppire-select-dest.h" +#include "psppire-means-layer.h" +#include "helper.h" #include #include "psppire-selector.h" -static void psppire_selector_class_init (PsppireSelectorClass *class); -static void psppire_selector_init (PsppireSelector *selector); - +G_DEFINE_TYPE (PsppireSelector, psppire_selector, GTK_TYPE_BUTTON) static void set_direction (PsppireSelector *, enum psppire_selector_dir); @@ -100,41 +99,9 @@ on_row_inserted (PsppireSelector *selector) g_signal_emit (selector, signals [DE_SELECTED], 0); } - -GType -psppire_selector_get_type (void) -{ - static GType psppire_selector_type = 0; - - if (!psppire_selector_type) - { - static const GTypeInfo psppire_selector_info = - { - sizeof (PsppireSelectorClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc)psppire_selector_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireSelector), - 0, - (GInstanceInitFunc) psppire_selector_init, - }; - - psppire_selector_type = - g_type_register_static (GTK_TYPE_BUTTON, "PsppireSelector", - &psppire_selector_info, 0); - } - - return psppire_selector_type; -} - static GObjectClass * parent_class = NULL; - - -#define SELECTOR_DEBUGGING 0 - +#if DEBUG static void dump_hash_entry (gpointer key, gpointer value, gpointer obj) { @@ -151,7 +118,7 @@ dump_hash_entry (gpointer key, gpointer value, gpointer obj) } /* This function is for debugging only */ -void +void psppire_selector_show_map (PsppireSelector *obj) { PsppireSelectorClass *class = g_type_class_peek (PSPPIRE_SELECTOR_TYPE); @@ -159,7 +126,7 @@ psppire_selector_show_map (PsppireSelector *obj) g_print ("%s %p\n", __FUNCTION__, obj); g_hash_table_foreach (class->source_hash, dump_hash_entry, obj); } - +#endif static void @@ -189,9 +156,12 @@ psppire_selector_dispose (GObject *obj) sel->source_litem = NULL; } - - g_object_unref (sel->dest); - g_object_unref (sel->source); + + if (sel->dest) + g_object_unref (sel->dest); + + if (sel->source) + g_object_unref (sel->source); /* Chain up to the parent class */ G_OBJECT_CLASS (parent_class)->dispose (obj); @@ -213,9 +183,6 @@ static void on_click (GtkButton *b); static void on_realize (GtkWidget *selector); -static void update_subjects (PsppireSelector *selector); - - static void psppire_selector_set_property (GObject *object, guint prop_id, @@ -232,15 +199,15 @@ psppire_selector_set_property (GObject *object, break; case PROP_PRIMARY: selector->primary_requested = TRUE; - update_subjects (selector); + psppire_selector_update_subjects (selector); break; case PROP_SOURCE_WIDGET: selector->source = g_value_dup_object (value); - update_subjects (selector); + psppire_selector_update_subjects (selector); break; case PROP_DEST_WIDGET: selector->dest = g_value_dup_object (value); - update_subjects (selector); + psppire_selector_update_subjects (selector); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -297,14 +264,14 @@ psppire_selector_class_init (PsppireSelectorClass *class) FALSE, G_PARAM_READWRITE); - GParamSpec *source_widget_spec = + GParamSpec *source_widget_spec = g_param_spec_object ("source-widget", "Source Widget", "The widget to be used as the source for this selector", GTK_TYPE_WIDGET, G_PARAM_READWRITE); - GParamSpec *dest_widget_spec = + GParamSpec *dest_widget_spec = g_param_spec_object ("dest-widget", "Destination Widget", "The widget to be used as the destination for this selector", @@ -382,16 +349,16 @@ on_source_select (GtkTreeSelection *treeselection, gpointer data) set_direction (selector, PSPPIRE_SELECTOR_SOURCE_TO_DEST); - if ( selector->allow_selection ) + if (selector->allow_selection) { gtk_widget_set_sensitive (GTK_WIDGET (selector), selector->allow_selection (selector->source, selector->dest)); } - else if ( GTK_IS_ENTRY (selector->dest) ) + else if (GTK_IS_ENTRY (selector->dest)) { gtk_widget_set_sensitive (GTK_WIDGET (selector), gtk_tree_selection_count_selected_rows - (treeselection) <= 1 ); + (treeselection) <= 1); } } @@ -408,24 +375,24 @@ on_realize (GtkWidget *w) if (GTK_WIDGET_CLASS (parent_class)->realize) GTK_WIDGET_CLASS (parent_class)->realize (w); - if ( NULL == list) + if (NULL == list) return; - if ( g_list_first (list)->data == selector) + if (g_list_first (list)->data == selector) { - if ( selector->row_activate_id ) + if (selector->row_activate_id) g_signal_handler_disconnect (selector->source, selector->row_activate_id); - selector->row_activate_id = + selector->row_activate_id = g_signal_connect (selector->source, "row-activated", G_CALLBACK (on_row_activate), selector); } selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->source)); - if ( selector->source_select_id ) + if (selector->source_select_id) g_signal_handler_disconnect (selection, selector->source_select_id); - selector->source_select_id = + selector->source_select_id = g_signal_connect (selection, "changed", G_CALLBACK (on_source_select), selector); } @@ -439,8 +406,7 @@ psppire_selector_init (PsppireSelector *selector) selector->allow_selection = NULL; selector->filter = NULL; - selector->arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE); - + selector->arrow = gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (selector), selector->arrow); @@ -474,21 +440,21 @@ 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 ) + if (d == PSPPIRE_SELECTOR_SOURCE_TO_DEST) { switch (selector->orientation) { case PSPPIRE_SELECT_SOURCE_BEFORE_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_RIGHT, NULL); + g_object_set (selector->arrow, "icon-name", "pan-end-symbolic", NULL); break; case PSPPIRE_SELECT_SOURCE_AFTER_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_LEFT, NULL); + g_object_set (selector->arrow, "icon-name", "pan-start-symbolic", NULL); break; case PSPPIRE_SELECT_SOURCE_ABOVE_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_DOWN, NULL); + g_object_set (selector->arrow, "icon-name", "pan-down-symbolic", NULL); break; case PSPPIRE_SELECT_SOURCE_BELOW_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_UP, NULL); + g_object_set (selector->arrow, "icon-name", "pan-up-symbolic", NULL); break; default: g_assert_not_reached (); @@ -500,22 +466,21 @@ set_direction (PsppireSelector *selector, enum psppire_selector_dir d) switch (selector->orientation) { case PSPPIRE_SELECT_SOURCE_BEFORE_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_LEFT, NULL); + g_object_set (selector->arrow, "icon-name", "pan-start-symbolic", NULL); break; case PSPPIRE_SELECT_SOURCE_AFTER_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_RIGHT, NULL); + g_object_set (selector->arrow, "icon-name", "pan-end-symbolic", NULL); break; case PSPPIRE_SELECT_SOURCE_ABOVE_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_UP, NULL); + g_object_set (selector->arrow, "icon-name", "pan-up-symbolic", NULL); break; case PSPPIRE_SELECT_SOURCE_BELOW_DEST: - g_object_set (selector->arrow, "arrow-type", GTK_ARROW_DOWN, NULL); + g_object_set (selector->arrow, "icon-name", "pan-down-symbolic", NULL); break; default: g_assert_not_reached (); break; }; - } } @@ -530,6 +495,7 @@ on_dest_treeview_select (GtkTreeSelection *treeselection, gpointer data) set_direction (selector, PSPPIRE_SELECTOR_DEST_TO_SOURCE); } + /* Callback for source deselection, when the dest is GtkEntry */ static void de_select_selection_entry (PsppireSelector *selector) @@ -537,23 +503,47 @@ de_select_selection_entry (PsppireSelector *selector) gtk_entry_set_text (GTK_ENTRY (selector->dest), ""); } + +static void de_select_tree_model (GtkTreeSelection *selection, GtkTreeModel *model); + +/* Callback for source deselection, when the dest is PsppireMeansLayer */ +static void +de_select_selection_means_layer (PsppireSelector *selector) +{ + PsppireMeansLayer *ml = PSPPIRE_MEANS_LAYER (selector->dest); + GtkTreeView *tv = GTK_TREE_VIEW (ml->var_view); + GtkTreeSelection *selection = gtk_tree_view_get_selection (tv); + + GtkTreeModel *model = psppire_means_layer_get_model (ml); + + g_return_if_fail (selector->select_items); + + de_select_tree_model (selection, model); +} + /* Callback for source deselection, when the dest is GtkTreeView */ static void de_select_selection_tree_view (PsppireSelector *selector) { - GList *item; - GtkTreeSelection* selection = - gtk_tree_view_get_selection ( GTK_TREE_VIEW (selector->dest)); + gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->dest)); GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector->dest)); + g_return_if_fail (selector->select_items); + + de_select_tree_model (selection, model); +} + +static void +de_select_tree_model (GtkTreeSelection *selection, GtkTreeModel *model) +{ + GList *item; + GList *selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL); - g_return_if_fail (selector->select_items); - /* Convert paths to RowRefs */ for (item = g_list_first (selected_rows); item != NULL; @@ -586,7 +576,7 @@ de_select_selection_tree_view (PsppireSelector *selector) } /* Delete list of RowRefs and its contents */ - g_list_foreach (selected_rows, (GFunc) gtk_tree_row_reference_free, NULL); + g_list_foreach (selected_rows, GFUNC_COMPAT_CAST (gtk_tree_row_reference_free), NULL); g_list_free (selected_rows); } @@ -599,7 +589,8 @@ static gboolean refilter (PsppireSelector *selector) { GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector->source)); - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + if (GTK_IS_TREE_MODEL_FILTER (model)) + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); return FALSE; } @@ -609,12 +600,15 @@ de_select_selection (PsppireSelector *selector) { selector->selecting = TRUE; - if ( GTK_IS_TREE_VIEW (selector->dest ) ) + if (GTK_IS_TREE_VIEW (selector->dest)) de_select_selection_tree_view (selector); - else if ( GTK_IS_ENTRY (selector->dest)) + else if (GTK_IS_ENTRY (selector->dest)) de_select_selection_entry (selector); + else if (PSPPIRE_IS_MEANS_LAYER (selector->dest)) + de_select_selection_means_layer (selector); + else g_assert_not_reached (); @@ -632,7 +626,7 @@ select_selection (PsppireSelector *selector) { GList *item ; GtkTreeSelection* selection = - gtk_tree_view_get_selection ( GTK_TREE_VIEW (selector->source)); + gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->source)); GList *selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL); @@ -642,7 +636,7 @@ select_selection (PsppireSelector *selector) g_return_if_fail (selector->select_items); - if (selector->allow_selection && + if (selector->allow_selection && ! selector->allow_selection (selector->source, selector->dest)) return; @@ -666,10 +660,10 @@ select_selection (PsppireSelector *selector) selector->dest, childmodel, selector->select_user_data - ); + ); } - g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); + g_list_foreach (selected_rows, GFUNC_COMPAT_CAST (gtk_tree_path_free), NULL); g_list_free (selected_rows); refilter (selector); @@ -756,7 +750,7 @@ is_source_item_visible (GtkTreeModel *childmodel, { PsppireSelector *selector = list->data; - if ( selector->filter && selector->filter (childmodel, iter, selector)) + if (selector->filter && selector->filter (childmodel, iter, selector)) return FALSE; list = list->next; @@ -773,10 +767,10 @@ set_tree_view_source (PsppireSelector *selector) GList *list = NULL; PsppireSelectorClass *class = g_type_class_peek (PSPPIRE_SELECTOR_TYPE); - - if ( ! (list = g_hash_table_lookup (class->source_hash, selector->source))) + + if (! (list = g_hash_table_lookup (class->source_hash, selector->source))) { - /* Base case: This widget is currently not the source of + /* Base case: This widget is currently not the source of any selector. Create a hash entry and make this selector the first selector in the list */ @@ -790,9 +784,9 @@ set_tree_view_source (PsppireSelector *selector) { /* Append this selector to the list and push the pair onto the hash table */ - if ( NULL == g_list_find (list, selector) ) + if (NULL == g_list_find (list, selector)) { - if ( selector->primary_requested ) + if (selector->primary_requested) { list = g_list_prepend (list, selector); selector->source_litem = list; @@ -816,7 +810,7 @@ update_model ( GtkTreeView *source, GParamSpec *psp, PsppireSelector *selector - ) +) { GtkTreeModel *model = gtk_tree_view_get_model (source); @@ -825,14 +819,14 @@ update_model ( if (model && (model == g_object_get_data (G_OBJECT (source), "model-copy"))) return; - if (model != NULL) - { - GtkTreeModel *new_model = gtk_tree_model_filter_new (model, NULL); + if (model != NULL) + { + GtkTreeModel *new_model = gtk_tree_model_filter_new (model, NULL); - g_object_set_data (G_OBJECT (source), "model-copy", new_model); + g_object_set_data (G_OBJECT (source), "model-copy", new_model); gtk_tree_view_set_model (source, new_model); - + gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (new_model), is_source_item_visible, selector, @@ -863,7 +857,7 @@ on_dest_data_change (GtkTreeModel *tree_model, { PsppireSelector *selector = user_data; - if ( selector->selecting) return; + if (selector->selecting) return; refilter (selector); } @@ -876,25 +870,37 @@ on_dest_data_delete (GtkTreeModel *tree_model, { PsppireSelector *selector = user_data; - if ( selector->selecting ) return; + if (selector->selecting) return; refilter (selector); } +static void +remove_selector_handlers (PsppireSelector *selector, GObject *sel) +{ + g_signal_handlers_disconnect_by_data (sel, selector); +} + static void on_dest_model_changed (PsppireSelector *selector) { GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector->dest)); - if ( model ) - { - 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); - } + if (model == NULL) + return; + + 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); + + g_signal_connect (selector, "destroy", G_CALLBACK (remove_selector_handlers), model); + + if (selector->selecting) return; + + refilter (selector); } /* Set the destination widget to DEST */ @@ -915,7 +921,18 @@ set_tree_view_dest (PsppireSelector *selector, G_CALLBACK (on_dest_model_changed), selector); } +static void +set_layer_dest (PsppireSelector *selector, + PsppireMeansLayer *dest) +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dest->var_view)); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); + + + g_signal_connect (selection, "changed", G_CALLBACK (on_dest_treeview_select), + selector); +} /* Callback for when the DEST GtkEntry is selected (clicked) */ @@ -955,7 +972,7 @@ set_entry_dest (PsppireSelector *selector, static void set_default_filter (PsppireSelector *selector) { - if ( selector->filter == NULL) + if (selector->filter == NULL) { if (GTK_IS_TREE_VIEW (selector->dest)) selector->filter = is_item_in_dest; @@ -963,39 +980,43 @@ set_default_filter (PsppireSelector *selector) } -static void -update_subjects (PsppireSelector *selector) +void +psppire_selector_update_subjects (PsppireSelector *selector) { - if ( NULL == selector->dest ) + if (NULL == selector->dest) return; set_default_filter (selector); - if ( NULL == selector->source ) + if (NULL == selector->source) return; - if ( GTK_IS_TREE_VIEW (selector->source)) + if (GTK_IS_TREE_VIEW (selector->source)) { set_tree_view_source (selector); - g_signal_connect (selector->source, "notify::model", - G_CALLBACK (update_model), selector); + g_signal_connect (selector->source, "notify::model", + G_CALLBACK (update_model), selector); update_model (GTK_TREE_VIEW (selector->source), 0, selector); } else g_error ("Unsupported source widget: %s", G_OBJECT_TYPE_NAME (selector->source)); - if ( NULL == selector->dest) + if (NULL == selector->dest) ; - else if ( GTK_IS_TREE_VIEW (selector->dest)) + else if (GTK_IS_TREE_VIEW (selector->dest)) { set_tree_view_dest (selector, GTK_TREE_VIEW (selector->dest)); } - - else if ( GTK_IS_ENTRY (selector->dest)) - set_entry_dest (selector, GTK_ENTRY (selector->dest)); - + else if (GTK_IS_ENTRY (selector->dest)) + { + set_entry_dest (selector, GTK_ENTRY (selector->dest)); + } + else if (PSPPIRE_IS_MEANS_LAYER (selector->dest)) + { + set_layer_dest (selector, PSPPIRE_MEANS_LAYER (selector->dest)); + } else if (GTK_IS_TEXT_VIEW (selector->dest)) { /* Nothing to be done */ @@ -1004,16 +1025,15 @@ update_subjects (PsppireSelector *selector) g_error ("Unsupported destination widget: %s", G_OBJECT_TYPE_NAME (selector->dest)); - /* FIXME: Remove this dependency */ - if ( PSPPIRE_IS_DICT_VIEW (selector->source) ) + if (PSPPIRE_IS_DICT_VIEW (selector->source) && selector->select_items == NULL) { GObjectClass *class = G_OBJECT_GET_CLASS (selector); GType type = G_OBJECT_TYPE (selector->dest); - SelectItemsFunc *func = + SelectItemsFunc *func = g_hash_table_lookup (PSPPIRE_SELECTOR_CLASS (class)->default_selection_funcs, (gpointer) type); - if ( func ) + if (func) psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), func, NULL); } @@ -1065,15 +1085,17 @@ 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); - } + 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; }