/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011, 2012 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
#include <gtk/gtk.h>
#include "compute-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
#include "psppire-dialog.h"
#include "psppire-keypad.h"
#include "psppire-data-window.h"
-#include "psppire-var-store.h"
#include "psppire-selector.h"
#include "dialog-common.h"
+#include <libpspp/i18n.h>
+
#include <language/expressions/public.h>
-#include <language/syntax-string-source.h>
+#include "executor.h"
#include "helper.h"
+
static void function_list_populate (GtkTreeView *tv);
static void insert_function_into_syntax_area (GtkTreeIter iter,
cd->use_type = TRUE;
}
+static void
+on_type_toggled (GtkToggleButton *button, gpointer data)
+{
+ struct compute_dialog *cd = data;
+
+ GtkWidget *entry =
+ get_widget_assert (cd->xml, "type-and-label-width");
+
+ if ( gtk_toggle_button_get_active (button))
+ {
+ gtk_widget_set_sensitive (entry, TRUE);
+ gtk_widget_grab_focus (entry);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (entry, FALSE);
+ }
+}
static void
on_expression_toggle (GtkToggleButton *button, gpointer data)
}
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);
+ const char *label = var_get_label (target_var);
if ( label )
gtk_entry_set_text (GTK_ENTRY (entry), label);
gtk_entry_set_text (GTK_ENTRY (entry), "");
gtk_widget_set_sensitive (entry, TRUE);
+ gtk_widget_grab_focus (entry);
}
}
/* Pops up the Compute dialog box */
void
-compute_dialog (GObject *o, gpointer data)
+compute_dialog (PsppireDataWindow *de)
{
gint response;
- PsppireDataWindow *de = data;
- PsppireVarStore *vs = NULL;
struct compute_dialog scd;
- GtkBuilder *xml = builder_new ("psppire.ui");
+ GtkBuilder *xml = builder_new ("compute.ui");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");
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 *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");
GtkWidget *expression =
get_widget_assert (xml, "radio-button-expression-label");
+ GtkWidget *str_btn =
+ get_widget_assert (xml, "radio-button-string");
+
- g_object_get (de->data_editor, "var-store", &vs, NULL);
- scd.dict = vs->dict;
+ g_object_get (de->data_editor, "dictionary", &scd.dict, NULL);
scd.use_type = FALSE;
g_signal_connect (expression, "toggled",
G_CALLBACK(on_expression_toggle), &scd);
+ g_signal_connect (str_btn, "toggled",
+ G_CALLBACK(on_type_toggled), &scd);
+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_set (dict_view,
- "model", vs->dict,
+
+ 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,
- 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,
- NULL);
-
+ psppire_selector_set_select_func (PSPPIRE_SELECTOR (func_selector),
+ insert_function_into_syntax_area, NULL);
scd.xml = xml;
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
-
- paste_syntax_in_new_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;
}
gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore));
+ g_object_unref (liststore);
}
gint *idx;
struct variable *var;
GtkTreeIter dict_iter;
- gchar *name;
GtkTextBuffer *buffer;
g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
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);
}
projects / pspp / blobdiff