projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added valid predicates to transpose and sort dialogs.
[pspp]
/
src
/
ui
/
gui
/
compute-dialog.c
diff --git
a/src/ui/gui/compute-dialog.c
b/src/ui/gui/compute-dialog.c
index 3386680d35163a2ad6d107e8b3c018402dad9f21..3e8677ba48fd95863555e9bb84de59ef30b7146f 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-dialog.c
@@
-34,12
+34,14
@@
static void function_list_populate (GtkTreeView *tv);
static void insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
static void insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
);
static void insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
);
static void insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
);
);
@@
-151,7
+153,7
@@
generate_syntax (const struct compute_dialog *cd)
gchar *text;
GString *string ;
const gchar *target_name ;
gchar *text;
GString *string ;
const gchar *target_name ;
-
const
gchar *expression;
+ gchar *expression;
const gchar *label;
GtkTextIter start, end;
GtkWidget *target = get_widget_assert (cd->xml, "compute-entry1");
const gchar *label;
GtkTextIter start, end;
GtkWidget *target = get_widget_assert (cd->xml, "compute-entry1");
@@
-176,7
+178,7
@@
generate_syntax (const struct compute_dialog *cd)
string = g_string_sized_new (64);
string = g_string_sized_new (64);
- if ( cd-> use_type &&
+ if ( cd-> use_type &&
NULL == psppire_dict_lookup_var (cd->dict, target_name ))
{
if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle)))
NULL == psppire_dict_lookup_var (cd->dict, target_name ))
{
if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle)))
@@
-199,11
+201,16
@@
generate_syntax (const struct compute_dialog *cd)
target_name,
label);
target_name,
label);
- g_string_append_printf (string, "COMPUTE %s = %s.",
+ g_string_append_printf (string, "COMPUTE %s = %s.
\n
",
target_name,
expression
);
target_name,
expression
);
+ g_string_append (string, "EXECUTE.\n");
+
+
+ g_free (expression);
+
text = string->str;
g_string_free (string, FALSE);
text = string->str;
g_string_free (string, FALSE);
@@
-399,6
+406,7
@@
compute_dialog (GObject *o, gpointer data)
psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
dict_view, syntax_area,
insert_source_row_into_text_view,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
dict_view, syntax_area,
insert_source_row_into_text_view,
+ NULL,
NULL);
NULL);
@@
-407,6
+415,7
@@
compute_dialog (GObject *o, gpointer data)
psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
functions, syntax_area,
insert_function_into_syntax_area,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
functions, syntax_area,
insert_function_into_syntax_area,
+ NULL,
NULL);
NULL);
@@
-525,7
+534,8
@@
function_list_populate (GtkTreeView *tv)
static void
insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
static void
insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GString *string;
)
{
GString *string;
@@
-588,7
+598,8
@@
insert_function_into_syntax_area (GtkTreeIter iter,
static void
insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
static void
insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GtkTreePath *path;
)
{
GtkTreePath *path;