projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve deletion of consecutive variables #55357
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-var-info.c
diff --git
a/src/ui/gui/psppire-dialog-action-var-info.c
b/src/ui/gui/psppire-dialog-action-var-info.c
index 21f9f0439ce52e8292ff2ea49eedc2198f572a2b..9c7d4fd3e2b374d6632408aa42362afecf115977 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-var-info.c
+++ b/
src/ui/gui/psppire-dialog-action-var-info.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation
+ Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013, 2014
, 2016
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
@@
-52,7
+52,7
@@
treeview_item_selected (gpointer data)
GtkTreeView *tv = GTK_TREE_VIEW (pda->source);
GtkTreeSelection *selection = gtk_tree_view_get_selection (tv);
GtkTreeView *tv = GTK_TREE_VIEW (pda->source);
GtkTreeSelection *selection = gtk_tree_view_get_selection (tv);
- return gtk_tree_selection_count_selected_rows (selection)
=
= 1;
+ return gtk_tree_selection_count_selected_rows (selection)
>
= 1;
}
static gchar *
}
static gchar *
@@
-105,7
+105,9
@@
generate_syntax (const PsppireDialogAction *act)
{
return generate_syntax__ (act, "");
}
{
return generate_syntax__ (act, "");
}
+
\f
\f
+
static void
populate_output (GtkTreeSelection *selection, gpointer data)
{
static void
populate_output (GtkTreeSelection *selection, gpointer data)
{
@@
-163,22
+165,17
@@
jump_to (PsppireDialog *d, gint response, gpointer data)
g_free (vars);
}
g_free (vars);
}
-static
void
-psppire_dialog_action_var_info_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_var_info_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionVarInfo *act = PSPPIRE_DIALOG_ACTION_VAR_INFO (pda);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionVarInfo *act = PSPPIRE_DIALOG_ACTION_VAR_INFO (pda);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("variable-info.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "variable-info.ui");
- act->output = psppire_output_view_new (
- GTK_LAYOUT (get_widget_assert (xml, "layout1")), NULL, NULL, NULL);
+ act->output =
+ psppire_output_view_new (GTK_LAYOUT (get_widget_assert (xml, "layout1")),
+ NULL);
pda->dialog = get_widget_assert (xml, "variable-info-dialog");
pda->source = get_widget_assert (xml, "treeview2");
pda->dialog = get_widget_assert (xml, "variable-info-dialog");
pda->source = get_widget_assert (xml, "treeview2");
@@
-188,7
+185,7
@@
psppire_dialog_action_var_info_activate (PsppireDialogAction *a)
NULL);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pda->source)),
NULL);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pda->source)),
-
"changed", G_CALLBACK (populate_output),
+ "changed", G_CALLBACK (populate_output),
act);
g_signal_connect (pda->dialog, "response", G_CALLBACK (jump_to),
act);
g_signal_connect (pda->dialog, "response", G_CALLBACK (jump_to),
@@
-197,14
+194,13
@@
psppire_dialog_action_var_info_activate (PsppireDialogAction *a)
psppire_dialog_action_set_valid_predicate (pda,
treeview_item_selected);
psppire_dialog_action_set_valid_predicate (pda,
treeview_item_selected);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_var_info_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_var_info_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_var_info_class_init (PsppireDialogActionVarInfoClass *class)
{
}
static void
psppire_dialog_action_var_info_class_init (PsppireDialogActionVarInfoClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_var_info_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_var_info_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}