X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=5d40d21639bbe68fd9d06d6ea35dd9f50fba4a40;hb=e93857e0338c2a71794db2b57e3659bbe6946240;hp=739d6b17cc504862631abed82986149452a5d141;hpb=385e6bef2325222dc5ed089848a8d1754a041dc5;p=pspp-builds.git
diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 739d6b17..5d40d216 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -14,14 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-
+#include
#include
#include "compute-dialog.h"
#include "helper.h"
#include "psppire-dialog.h"
#include "psppire-keypad.h"
#include "data-editor.h"
-#include
#include "psppire-var-store.h"
#include "dialog-common.h"
#include "dict-display.h"
@@ -34,12 +33,14 @@ static void function_list_populate (GtkTreeView *tv);
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,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
);
@@ -151,7 +152,7 @@ generate_syntax (const struct compute_dialog *cd)
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");
@@ -176,7 +177,7 @@ generate_syntax (const struct compute_dialog *cd)
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)))
@@ -199,11 +200,16 @@ generate_syntax (const struct compute_dialog *cd)
target_name,
label);
- g_string_append_printf (string, "COMPUTE %s = %s.",
+ g_string_append_printf (string, "COMPUTE %s = %s.\n",
target_name,
expression
);
+ g_string_append (string, "EXECUTE.\n");
+
+
+ g_free (expression);
+
text = string->str;
g_string_free (string, FALSE);
@@ -318,15 +324,42 @@ on_expression_toggle (GtkToggleButton *button, gpointer data)
(GTK_ENTRY (get_widget_assert (cd->xml, "compute-entry1")));
target_var = psppire_dict_lookup_var (cd->dict, target_name);
- label = var_get_label (target_var);
+ if ( target_var )
+ {
+ label = var_get_label (target_var);
- if ( label )
- gtk_entry_set_text (GTK_ENTRY (entry), label);
+ if ( label )
+ gtk_entry_set_text (GTK_ENTRY (entry), label);
+ }
+ else
+ gtk_entry_set_text (GTK_ENTRY (entry), "");
gtk_widget_set_sensitive (entry, TRUE);
}
}
+
+/* Return TRUE if the dialog box's widgets' state are such that clicking OK
+ might not result in erroneous syntax being generated */
+static gboolean
+contents_plausible (gpointer data)
+{
+ struct compute_dialog *cd = data;
+
+ GtkWidget *target = get_widget_assert (cd->xml, "compute-entry1");
+ GtkWidget *syntax_area = get_widget_assert (cd->xml, "compute-textview1");
+ GtkTextBuffer *buffer =
+ gtk_text_view_get_buffer (GTK_TEXT_VIEW (syntax_area));
+
+ if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (target))))
+ return FALSE;
+
+ if ( gtk_text_buffer_get_char_count (buffer) == 0 )
+ return FALSE;
+
+ return TRUE;
+}
+
/* Pops up the Compute dialog box */
void
compute_dialog (GObject *o, gpointer data)
@@ -334,7 +367,7 @@ compute_dialog (GObject *o, gpointer data)
gint response;
struct data_editor *de = data;
- PsppireVarStore *vs;
+ PsppireVarStore *vs = NULL;
struct compute_dialog scd;
GladeXML *xml = XML_NEW ("psppire.glade");
@@ -354,11 +387,7 @@ compute_dialog (GObject *o, gpointer data)
get_widget_assert (xml, "radio-button-expression-label");
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
- vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
-
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
scd.dict = vs->dict;
scd.use_type = FALSE;
@@ -376,6 +405,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,
+ NULL,
NULL);
@@ -384,11 +414,15 @@ compute_dialog (GObject *o, gpointer data)
psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
functions, syntax_area,
insert_function_into_syntax_area,
+ NULL,
NULL);
scd.xml = xml;
+ psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+ contents_plausible, &scd);
+
g_signal_connect (target, "changed", G_CALLBACK (on_target_change), &scd);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &scd);
@@ -405,7 +439,6 @@ compute_dialog (GObject *o, gpointer data)
-
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
@@ -441,9 +474,9 @@ compute_dialog (GObject *o, gpointer data)
enum {
- COL_NAME,
- COL_USAGE,
- COL_ARITY
+ COMPUTE_COL_NAME,
+ COMPUTE_COL_USAGE,
+ COMPUTE_COL_ARITY
};
@@ -465,9 +498,9 @@ function_list_populate (GtkTreeView *tv)
gtk_list_store_append (liststore, &iter);
gtk_list_store_set (liststore, &iter,
- COL_NAME, expr_operation_get_name (op),
- COL_USAGE, expr_operation_get_prototype (op),
- COL_ARITY, expr_operation_get_arg_cnt (op),
+ COMPUTE_COL_NAME, expr_operation_get_name (op),
+ COMPUTE_COL_USAGE, expr_operation_get_prototype (op),
+ COMPUTE_COL_ARITY, expr_operation_get_arg_cnt (op),
-1);
}
@@ -488,7 +521,7 @@ function_list_populate (GtkTreeView *tv)
gtk_tree_view_column_pack_start (col, renderer, TRUE);
- gtk_tree_view_column_add_attribute (col, renderer, "text", COL_USAGE);
+ gtk_tree_view_column_add_attribute (col, renderer, "text", COMPUTE_COL_USAGE);
}
gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore));
@@ -500,7 +533,8 @@ function_list_populate (GtkTreeView *tv)
static void
insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GString *string;
@@ -515,8 +549,8 @@ insert_function_into_syntax_area (GtkTreeIter iter,
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
- gtk_tree_model_get_value (model, &iter, COL_NAME, &name_value);
- gtk_tree_model_get_value (model, &iter, COL_ARITY, &arity_value);
+ gtk_tree_model_get_value (model, &iter, COMPUTE_COL_NAME, &name_value);
+ gtk_tree_model_get_value (model, &iter, COMPUTE_COL_ARITY, &arity_value);
arity = g_value_get_int (&arity_value);
@@ -563,7 +597,8 @@ insert_function_into_syntax_area (GtkTreeIter iter,
static void
insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GtkTreePath *path;