X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=8a98bb3dcac48d8158812d5f9b96bb7c4df6b687;hb=b94025a12799b6826a772731b8f58907dca2cf5c;hp=843a25244b6bb238ce6e6f095c3320ec0f7c363a;hpb=a84eb76b976646ae9b0315ae6b856bf0f71da567;p=pspp-builds.git diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c index 843a2524..8a98bb3d 100644 --- a/src/ui/gui/compute-dialog.c +++ b/src/ui/gui/compute-dialog.c @@ -14,39 +14,43 @@ 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-data-window.h" #include "psppire-var-store.h" +#include "psppire-selector.h" #include "dialog-common.h" -#include "dict-display.h" +#include #include #include -#include "syntax-editor.h" +#include "executor.h" 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 ); struct compute_dialog { - GladeXML *xml; /* The xml that generated the widgets */ + GtkBuilder *xml; /* The xml that generated the widgets */ + PsppireDict *dict; + gboolean use_type; }; @@ -76,18 +80,15 @@ refresh (GObject *obj, const struct compute_dialog *cd) GtkTreeSelection *selection; - /* Clear the target variable entry box */ gtk_entry_set_text (GTK_ENTRY (target), ""); g_signal_emit_by_name (target, "changed"); - /* Clear the syntax area textbuffer */ gtk_text_buffer_get_start_iter (buffer, &start); gtk_text_buffer_get_end_iter (buffer, &end); gtk_text_buffer_delete (buffer, &start, &end); - /* Unselect all items in the treeview */ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (varlist)); gtk_tree_selection_unselect_all (selection); @@ -113,7 +114,7 @@ erase_selection (GtkTextBuffer *buffer) static void on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *rhs = get_widget_assert (xml, "compute-textview1"); @@ -137,7 +138,7 @@ on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data) static void erase (PsppireKeypad *kp, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *rhs = get_widget_assert (xml, "compute-textview1"); @@ -152,7 +153,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"); @@ -177,13 +178,18 @@ generate_syntax (const struct compute_dialog *cd) string = g_string_sized_new (64); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle))) + if ( cd-> use_type && + NULL == psppire_dict_lookup_var (cd->dict, target_name )) { - const char *w = gtk_entry_get_text (GTK_ENTRY(width_entry)); - g_string_append_printf (string, "STRING %s (a%s).\n", target_name, w); + if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle))) + { + const char *w = gtk_entry_get_text (GTK_ENTRY(width_entry)); + g_string_append_printf (string, + "STRING %s (a%s).\n", target_name, w); + } + else + g_string_append_printf (string, "NUMERIC %s.\n", target_name); } - else - g_string_append_printf (string, "NUMERIC %s.\n", target_name); if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (user_label_toggle))) label = gtk_entry_get_text (GTK_ENTRY (label_entry)); @@ -195,11 +201,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); @@ -207,6 +218,74 @@ generate_syntax (const struct compute_dialog *cd) return text; } +static void +reset_type_label_dialog (struct compute_dialog *cd) +{ + const gchar *target_name; + struct variable *target_var; + + GtkWidget *width_entry = + get_widget_assert (cd->xml, "type-and-label-width"); + + GtkWidget *label_entry = + get_widget_assert (cd->xml, "type-and-label-label-entry"); + + GtkWidget *numeric_target = + get_widget_assert (cd->xml, "radio-button-numeric"); + + GtkWidget *string_target = + get_widget_assert (cd->xml, "radio-button-string"); + + + target_name = gtk_entry_get_text + (GTK_ENTRY (get_widget_assert (cd->xml, "compute-entry1"))); + + + if ( (target_var = psppire_dict_lookup_var (cd->dict, target_name)) ) + { + /* Existing Variable */ + const gchar *label ; + GtkWidget *user_label = + get_widget_assert (cd->xml, "radio-button-user-label"); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (user_label), TRUE); + + label = var_get_label (target_var); + + if ( label ) + { + gtk_entry_set_text (GTK_ENTRY (label_entry), label); + } + + gtk_widget_set_sensitive (width_entry, FALSE); + + if ( var_is_numeric (target_var)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (numeric_target), + TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (string_target), + TRUE); + + gtk_widget_set_sensitive (numeric_target, FALSE); + gtk_widget_set_sensitive (string_target, FALSE); + } + else + { + GtkWidget *expression = + get_widget_assert (cd->xml, "radio-button-expression-label"); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (expression), TRUE); + + gtk_widget_set_sensitive (width_entry, TRUE); + gtk_widget_set_sensitive (numeric_target, TRUE); + gtk_widget_set_sensitive (string_target, TRUE); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (numeric_target), + TRUE); + } + +} + static void run_type_label_dialog (GtkButton *b, gpointer data) { @@ -218,63 +297,123 @@ run_type_label_dialog (GtkButton *b, gpointer data) gtk_window_set_transient_for (GTK_WINDOW (subdialog), GTK_WINDOW (dialog)); + reset_type_label_dialog (cd); response = psppire_dialog_run (PSPPIRE_DIALOG (subdialog)); + if ( response == PSPPIRE_RESPONSE_CONTINUE) + cd->use_type = TRUE; } +static void +on_expression_toggle (GtkToggleButton *button, gpointer data) +{ + struct compute_dialog *cd = data; + + GtkWidget *entry = + get_widget_assert (cd->xml, "type-and-label-label-entry"); + + if ( gtk_toggle_button_get_active (button)) + { + gtk_entry_set_text (GTK_ENTRY (entry), ""); + gtk_widget_set_sensitive (entry, FALSE); + } + else + { + const char *label; + struct variable *target_var; + const gchar *target_name = gtk_entry_get_text + (GTK_ENTRY (get_widget_assert (cd->xml, "compute-entry1"))); + + target_var = psppire_dict_lookup_var (cd->dict, target_name); + if ( target_var ) + { + label = var_get_label (target_var); + + 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) { gint response; - struct data_editor *de = data; + PsppireDataWindow *de = data; - PsppireVarStore *vs; + PsppireVarStore *vs = NULL; struct compute_dialog scd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog"); - GtkWidget *dict_view = get_widget_assert (xml, "compute-treeview1"); - GtkWidget *functions = get_widget_assert (xml, "compute-treeview2"); - GtkWidget *keypad = get_widget_assert (xml, "psppire-keypad1"); - GtkWidget *target = get_widget_assert (xml, "compute-entry1"); - GtkWidget *syntax_area = get_widget_assert (xml, "compute-textview1"); + GtkWidget *dict_view = get_widget_assert (xml, "compute-treeview1"); + GtkWidget *functions = get_widget_assert (xml, "compute-treeview2"); + GtkWidget *keypad = get_widget_assert (xml, "psppire-keypad1"); + GtkWidget *target = get_widget_assert (xml, "compute-entry1"); GtkWidget *var_selector = get_widget_assert (xml, "compute-selector1"); GtkWidget *func_selector = get_widget_assert (xml, "compute-selector2"); GtkWidget *type_and_label = get_widget_assert (xml, "compute-button1"); - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); - - vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)); + GtkWidget *expression = + get_widget_assert (xml, "radio-button-expression-label"); - gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window); + g_object_get (de->data_editor, "var-store", &vs, NULL); + g_object_get (vs, "dictionary", &scd.dict, NULL); + scd.use_type = FALSE; + g_signal_connect (expression, "toggled", + G_CALLBACK(on_expression_toggle), &scd); - attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view), - vs->dict, - GTK_SELECTION_SINGLE, NULL); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); + + g_object_set (dict_view, "model", scd.dict, + "selection-mode", GTK_SELECTION_SINGLE, + NULL); - psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector), - dict_view, syntax_area, - insert_source_row_into_text_view, - NULL); - + psppire_selector_set_select_func (PSPPIRE_SELECTOR (var_selector), + insert_source_row_into_text_view, NULL); function_list_populate (GTK_TREE_VIEW (functions)); - psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector), - functions, syntax_area, - insert_function_into_syntax_area, - NULL); - + psppire_selector_set_select_func (PSPPIRE_SELECTOR (func_selector), + insert_function_into_syntax_area, 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); @@ -299,6 +438,7 @@ compute_dialog (GObject *o, gpointer data) case GTK_RESPONSE_OK: { gchar *syntax = generate_syntax (&scd); + struct getl_interface *sss = create_syntax_string_source (syntax); execute_syntax (sss); @@ -309,10 +449,7 @@ compute_dialog (GObject *o, gpointer data) { gchar *syntax = generate_syntax (&scd); - struct syntax_editor *se = - (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL); - - gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1); + paste_syntax_in_new_window (syntax); g_free (syntax); } @@ -326,9 +463,9 @@ compute_dialog (GObject *o, gpointer data) enum { - COL_NAME, - COL_USAGE, - COL_ARITY + COMPUTE_COL_NAME, + COMPUTE_COL_USAGE, + COMPUTE_COL_ARITY }; @@ -350,9 +487,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); } @@ -373,7 +510,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)); @@ -385,7 +522,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; @@ -400,8 +538,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); @@ -448,7 +586,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; @@ -456,7 +595,6 @@ insert_source_row_into_text_view (GtkTreeIter iter, gint *idx; struct variable *var; GtkTreeIter dict_iter; - gchar *name; GtkTextBuffer *buffer; g_return_if_fail (GTK_IS_TEXT_VIEW (dest)); @@ -484,13 +622,10 @@ insert_source_row_into_text_view (GtkTreeIter iter, gtk_tree_path_free (path); - name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dest)); erase_selection (buffer); - gtk_text_buffer_insert_at_cursor (buffer, name, -1); + gtk_text_buffer_insert_at_cursor (buffer, var_get_name (var), -1); - g_free (name); }