string = g_string_sized_new (64);
- if ( cd->use_type &&
- NULL == psppire_dict_lookup_var (act->dict, target_name ))
+ if (cd->use_type &&
+ NULL == psppire_dict_lookup_var (act->dict, target_name))
{
- if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->str_btn)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->str_btn)))
{
const char *w = gtk_entry_get_text (GTK_ENTRY (cd->width_entry));
g_string_append_printf (string,
g_string_append_printf (string, "NUMERIC %s.\n", target_name);
}
- if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->user_label)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->user_label)))
label = gtk_entry_get_text (GTK_ENTRY (cd->entry));
else
label = expression;
- if ( strlen (label) > 0 )
+ if (strlen (label) > 0)
g_string_append_printf (string, "VARIABLE LABEL %s '%s'.\n",
target_name,
label);
g_string_append_printf (string, "COMPUTE %s = %s.\n",
target_name,
expression
- );
+ );
g_string_append (string, "EXECUTE.\n");
GtkTreeIter iter;
gint i;
- const gint n_funcs = expr_get_function_cnt ();
+ const gint n_funcs = expr_get_n_functions ();
liststore = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
gtk_list_store_set (liststore, &iter,
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),
+ COMPUTE_COL_ARITY, expr_operation_get_n_args (op),
-1);
}
target_name = gtk_entry_get_text (GTK_ENTRY (cd->target));
- if ( (target_var = psppire_dict_lookup_var (pda->dict, target_name)) )
+ if ((target_var = psppire_dict_lookup_var (pda->dict, target_name)))
{
/* Existing Variable */
const gchar *label = var_get_label (target_var);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cd->user_label), TRUE);
- if ( label )
+ if (label)
{
gtk_entry_set_text (GTK_ENTRY (cd->entry), label);
}
gtk_widget_set_sensitive (cd->width_entry, FALSE);
- if ( var_is_numeric (target_var))
+ if (var_is_numeric (target_var))
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cd->numeric_target),
TRUE);
else
reset_type_label_dialog (cd);
response = psppire_dialog_run (PSPPIRE_DIALOG (cd->subdialog));
- if ( response == PSPPIRE_RESPONSE_CONTINUE)
+ if (response == PSPPIRE_RESPONSE_CONTINUE)
cd->use_type = TRUE;
}
on_type_toggled (GtkToggleButton *button, gpointer data)
{
PsppireDialogActionCompute *cd = PSPPIRE_DIALOG_ACTION_COMPUTE (data);
- if ( gtk_toggle_button_get_active (button))
+ if (gtk_toggle_button_get_active (button))
{
gtk_widget_set_sensitive (cd->width_entry, TRUE);
gtk_widget_grab_focus (cd->width_entry);
PsppireDialogActionCompute *cd = PSPPIRE_DIALOG_ACTION_COMPUTE (data);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (data);
- if ( gtk_toggle_button_get_active (button))
+ if (gtk_toggle_button_get_active (button))
{
gtk_entry_set_text (GTK_ENTRY (cd->entry), "");
gtk_widget_set_sensitive (cd->entry, FALSE);
{
const gchar *target_name = gtk_entry_get_text (GTK_ENTRY (cd->target));
const struct variable *target_var = psppire_dict_lookup_var (pda->dict, target_name);
- if ( target_var )
+ if (target_var)
{
const char *label = var_get_label (target_var);
- if ( label )
+ if (label)
gtk_entry_set_text (GTK_ENTRY (cd->entry), label);
}
else
string = g_string_new (g_value_get_string (&name_value));
g_string_append (string, "(");
- for ( i = 0 ; i < arity -1 ; ++i )
+ for (i = 0 ; i < arity -1 ; ++i)
{
g_string_append (string, "?,");
}
GtkTextIter selectbound;
GtkTextMark *cursor = gtk_text_buffer_get_insert (buffer);
gtk_text_buffer_get_iter_at_mark (buffer, &insert, cursor);
- for ( i = 0 ; i < arity ; ++i )
+ for (i = 0 ; i < arity ; ++i)
{
gtk_text_iter_backward_cursor_position (&insert);
gtk_text_iter_backward_cursor_position (&insert);
}
-
-static void
-psppire_dialog_action_compute_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_compute_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionCompute *act = PSPPIRE_DIALOG_ACTION_COMPUTE (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("compute.ui");
- g_hash_table_insert (thing, a, xml);
+ GtkBuilder *xml = builder_new ("compute.ui");
- pda->dialog = get_widget_assert (xml, "compute-variable-dialog");
- pda->source = get_widget_assert (xml, "compute-treeview1");
+ pda->dialog = get_widget_assert (xml, "compute-variable-dialog");
+ pda->source = get_widget_assert (xml, "compute-treeview1");
- act->textview = get_widget_assert (xml, "compute-textview1");
- act->entry =
- get_widget_assert (xml, "type-and-label-label-entry");
+ act->textview = get_widget_assert (xml, "compute-textview1");
+ act->entry =
+ get_widget_assert (xml, "type-and-label-label-entry");
- act->width_entry =
- get_widget_assert (xml, "type-and-label-width");
+ act->width_entry =
+ get_widget_assert (xml, "type-and-label-width");
- act->functions = get_widget_assert (xml, "compute-treeview2");
- act->keypad = get_widget_assert (xml, "psppire-keypad1");
- act->target = get_widget_assert (xml, "compute-entry1");
- act->var_selector = get_widget_assert (xml, "compute-selector1");
- act->func_selector = get_widget_assert (xml, "compute-selector2");
- act->type_and_label = get_widget_assert (xml, "compute-button1");
+ act->functions = get_widget_assert (xml, "compute-treeview2");
+ act->keypad = get_widget_assert (xml, "psppire-keypad1");
+ act->target = get_widget_assert (xml, "compute-entry1");
+ act->var_selector = get_widget_assert (xml, "compute-selector1");
+ act->func_selector = get_widget_assert (xml, "compute-selector2");
+ act->type_and_label = get_widget_assert (xml, "compute-button1");
- act->subdialog = get_widget_assert (xml, "type-and-label-dialog");
+ act->subdialog = get_widget_assert (xml, "type-and-label-dialog");
- act->numeric_target = get_widget_assert (xml, "radio-button-numeric");
- act->expression = get_widget_assert (xml, "radio-button-expression-label");
- act->user_label = get_widget_assert (xml, "radio-button-user-label");
- act->str_btn = get_widget_assert (xml, "radio-button-string");
+ act->numeric_target = get_widget_assert (xml, "radio-button-numeric");
+ act->expression = get_widget_assert (xml, "radio-button-expression-label");
+ act->user_label = get_widget_assert (xml, "radio-button-user-label");
+ act->str_btn = get_widget_assert (xml, "radio-button-string");
- g_signal_connect (act->expression, "toggled",
- G_CALLBACK (on_expression_toggle), pda);
+ g_signal_connect (act->expression, "toggled",
+ G_CALLBACK (on_expression_toggle), pda);
- g_signal_connect (act->str_btn, "toggled",
- G_CALLBACK (on_type_toggled), pda);
+ g_signal_connect (act->str_btn, "toggled",
+ G_CALLBACK (on_type_toggled), pda);
- g_object_set (pda->source,
- "selection-mode", GTK_SELECTION_SINGLE,
- NULL);
+ g_object_set (pda->source,
+ "selection-mode", GTK_SELECTION_SINGLE,
+ NULL);
- psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->var_selector),
- insert_source_row_into_text_view, NULL);
+ psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->var_selector),
+ insert_source_row_into_text_view, NULL);
- function_list_populate (GTK_TREE_VIEW (act->functions));
+ function_list_populate (GTK_TREE_VIEW (act->functions));
- psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->func_selector),
- insert_function_into_syntax_area, NULL);
+ psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->func_selector),
+ insert_function_into_syntax_area, NULL);
- g_signal_connect (act->target, "changed", G_CALLBACK (on_target_change), act);
+ g_signal_connect (act->target, "changed", G_CALLBACK (on_target_change), act);
- g_signal_connect (act->keypad, "insert-syntax",
- G_CALLBACK (on_keypad_button), act);
+ g_signal_connect (act->keypad, "insert-syntax",
+ G_CALLBACK (on_keypad_button), act);
- g_signal_connect (act->keypad, "erase",
- G_CALLBACK (erase), act);
+ g_signal_connect (act->keypad, "erase",
+ G_CALLBACK (erase), act);
- g_signal_connect (act->type_and_label, "clicked",
- G_CALLBACK (run_type_label_dialog), pda);
+ g_signal_connect (act->type_and_label, "clicked",
+ G_CALLBACK (run_type_label_dialog), pda);
- psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
- psppire_dialog_action_set_refresh (pda, refresh);
- }
+ psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
+ psppire_dialog_action_set_refresh (pda, refresh);
+ return xml;
}
static void
psppire_dialog_action_compute_class_init (PsppireDialogActionComputeClass *class)
{
- psppire_dialog_action_set_activation (class, psppire_dialog_action_compute_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_compute_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
projects / pspp / blobdiff