#include <language/expressions/public.h>
#include "psppire-var-view.h"
-
+#include "dict-display.h"
#include "psppire-dialog.h"
#include "psppire-keypad.h"
#include "psppire-selector.h"
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionCompute *cd = PSPPIRE_DIALOG_ACTION_COMPUTE (act);
gchar *text;
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
insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
GtkTreeModel *model,
- gpointer data
- )
+ gpointer data)
{
GtkTreePath *path;
+ GtkTreeModel *m;
PsppireDict *dict;
gint *idx;
struct variable *var;
g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
- if ( GTK_IS_TREE_MODEL_FILTER (model))
- {
- dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model
- (GTK_TREE_MODEL_FILTER(model)));
-
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER
- (model),
- &dict_iter, &iter);
- }
- else
- {
- dict = PSPPIRE_DICT (model);
- dict_iter = iter;
- }
+ get_base_model (model, &iter, &m, &dict_iter);
+ dict = PSPPIRE_DICT (m);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (dict), &dict_iter);
erase_selection (buffer);
gtk_text_buffer_insert_at_cursor (buffer, var_get_name (var), -1);
-
}
static void
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 (GtkAction *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);
GtkBuilder *xml = builder_new ("compute.ui");
+
pda->dialog = get_widget_assert (xml, "compute-variable-dialog");
pda->source = get_widget_assert (xml, "compute-treeview1");
G_CALLBACK (on_expression_toggle), pda);
g_signal_connect (act->str_btn, "toggled",
- G_CALLBACK (on_type_toggled), pda);
+ G_CALLBACK (on_type_toggled), pda);
g_object_set (pda->source,
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_compute_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_compute_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_compute_class_init (PsppireDialogActionComputeClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_compute_activate;
- action_class->activate = psppire_dialog_action_compute_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
projects / pspp / blobdiff