projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-selector.c
diff --git
a/src/ui/gui/psppire-selector.c
b/src/ui/gui/psppire-selector.c
index dcaac0ce031f9dcb0dd9b2a73584da2d4e506b33..d6ea3375257186d0566aa8a7706da717030db17c 100644
(file)
--- a/
src/ui/gui/psppire-selector.c
+++ b/
src/ui/gui/psppire-selector.c
@@
-126,6
+126,9
@@
enum
};
};
+static void on_activate (PsppireSelector *selector, gpointer data);
+
+
static void
psppire_selector_set_property (GObject *object,
guint prop_id,
static void
psppire_selector_set_property (GObject *object,
guint prop_id,
@@
-176,7
+179,7
@@
psppire_selector_class_init (PsppireSelectorClass *class)
g_param_spec_enum ("orientation",
"Orientation",
"Where the selector is relative to its subjects",
g_param_spec_enum ("orientation",
"Orientation",
"Where the selector is relative to its subjects",
-
G_TYPE_PSPPIR
E_SELECTOR_ORIENTATION,
+
PSPPIRE_TYP
E_SELECTOR_ORIENTATION,
PSPPIRE_SELECT_SOURCE_BEFORE_DEST /* default value */,
G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
PSPPIRE_SELECT_SOURCE_BEFORE_DEST /* default value */,
G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE);
@@
-230,16
+233,23
@@
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;
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);
gtk_container_add (GTK_CONTAINER (selector), selector->arrow);
gtk_widget_show (selector->arrow);
+ g_signal_connect_swapped (selector->action, "activate", G_CALLBACK (on_activate), selector);
+
selector->selecting = FALSE;
}
selector->selecting = FALSE;
}
@@
-311,9
+321,14
@@
on_source_select (GtkTreeSelection *treeselection, gpointer data)
set_direction (selector, PSPPIRE_SELECTOR_SOURCE_TO_DEST);
set_direction (selector, PSPPIRE_SELECTOR_SOURCE_TO_DEST);
- if (
GTK_IS_ENTRY (selector->dest)
)
+ if (
selector->allow_selection
)
{
{
- gtk_widget_set_sensitive (GTK_WIDGET (selector),
+ gtk_action_set_sensitive (selector->action,
+ selector->allow_selection (selector->source, selector->dest));
+ }
+ else if ( GTK_IS_ENTRY (selector->dest) )
+ {
+ gtk_action_set_sensitive (selector->action,
gtk_tree_selection_count_selected_rows
(treeselection) <= 1 );
}
gtk_tree_selection_count_selected_rows
(treeselection) <= 1 );
}
@@
-325,6
+340,8
@@
on_dest_treeview_select (GtkTreeSelection *treeselection, gpointer data)
{
PsppireSelector *selector = 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);
}
set_direction (selector, PSPPIRE_SELECTOR_DEST_TO_SOURCE);
}
@@
-448,7
+465,9
@@
select_selection (PsppireSelector *selector)
selector->select_items (child_iter,
selector->dest,
selector->select_items (child_iter,
selector->dest,
- childmodel);
+ childmodel,
+ selector->select_user_data
+ );
}
g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
}
g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
@@
-470,12
+489,14
@@
on_row_activate (GtkTreeView *tree_view,
{
PsppireSelector *selector = data;
{
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
static void
-on_
click
(PsppireSelector *selector, gpointer data)
+on_
activate
(PsppireSelector *selector, gpointer data)
{
switch (selector->direction)
{
{
switch (selector->direction)
{
@@
-530,10
+551,21
@@
is_item_in_dest (GtkTreeModel *model, GtkTreeIter *iter,
do
{
do
{
+ int x;
GValue value = {0};
GValue value = {0};
+ GValue int_value = {0};
gtk_tree_model_get_value (dest_model, &dest_iter, 0, &value);
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));
return TRUE;
}
while (gtk_tree_model_iter_next (dest_model, &dest_iter));
@@
-690,6
+722,7
@@
on_entry_dest_select (GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
PsppireSelector * selector = 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;
set_direction (selector, PSPPIRE_SELECTOR_DEST_TO_SOURCE);
return FALSE;
@@
-727,6
+760,9
@@
set_entry_dest (PsppireSelector *selector,
g_signal_connect_swapped (dest, "activate", G_CALLBACK (refilter),
selector);
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 (dest, "focus-in-event", G_CALLBACK (on_entry_dest_select),
selector);
@@
-749,7
+785,8
@@
psppire_selector_set_subjects (PsppireSelector *selector,
GtkWidget *source,
GtkWidget *dest,
SelectItemsFunc *select_func,
GtkWidget *source,
GtkWidget *dest,
SelectItemsFunc *select_func,
- FilterItemsFunc *filter_func )
+ FilterItemsFunc *filter_func,
+ gpointer user_data)
{
g_assert(selector);
{
g_assert(selector);
@@
-757,6
+794,7
@@
psppire_selector_set_subjects (PsppireSelector *selector,
selector->source = source;
selector->dest = dest;
selector->source = source;
selector->dest = dest;
+ selector->select_user_data = user_data;
if ( filter_func == NULL)
{
if ( filter_func == NULL)
{
@@
-764,8
+802,6
@@
psppire_selector_set_subjects (PsppireSelector *selector,
selector->filter = is_item_in_dest;
}
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
if ( GTK_IS_TREE_VIEW (source))
set_tree_view_source (selector, GTK_TREE_VIEW (source) );
else
@@
-773,7
+809,9
@@
psppire_selector_set_subjects (PsppireSelector *selector,
g_assert ( GTK_IS_TREE_MODEL_FILTER (selector->filtered_source));
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_tree_view_dest (selector, GTK_TREE_VIEW (dest));
else if ( GTK_IS_ENTRY (dest))
@@
-792,6
+830,14
@@
psppire_selector_set_subjects (PsppireSelector *selector,
+void
+psppire_selector_set_allow (PsppireSelector *selector , AllowSelectionFunc *allow)
+{
+ selector->allow_selection = allow;
+}
+
+
+
GType
psppire_selector_orientation_get_type (void)
{
GType
psppire_selector_orientation_get_type (void)
{