projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add "dictionary" property to PsppireVarStore and use it.
[pspp-builds.git]
/
src
/
ui
/
gui
/
compute-dialog.c
diff --git
a/src/ui/gui/compute-dialog.c
b/src/ui/gui/compute-dialog.c
index 17611ac8a9fcbc72f2078f8a153e067da774645e..c09c7571936fa4e4ca493bd0647b2586629caa6d 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-dialog.c
@@
-22,12
+22,13
@@
#include "psppire-keypad.h"
#include "psppire-data-window.h"
#include "psppire-var-store.h"
#include "psppire-keypad.h"
#include "psppire-data-window.h"
#include "psppire-var-store.h"
+#include "psppire-selector.h"
#include "dialog-common.h"
#include "dialog-common.h"
-#include
"dict-display.h"
+#include
<libpspp/i18n.h>
#include <language/expressions/public.h>
#include <language/syntax-string-source.h>
#include <language/expressions/public.h>
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
executor
.h"
static void function_list_populate (GtkTreeView *tv);
static void function_list_populate (GtkTreeView *tv);
@@
-47,7
+48,7
@@
static void insert_source_row_into_text_view (GtkTreeIter iter,
struct compute_dialog
{
struct compute_dialog
{
- G
ladeXML
*xml; /* The xml that generated the widgets */
+ G
tkBuilder
*xml; /* The xml that generated the widgets */
PsppireDict *dict;
gboolean use_type;
};
PsppireDict *dict;
gboolean use_type;
};
@@
-113,7
+114,7
@@
erase_selection (GtkTextBuffer *buffer)
static void
on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
{
static void
on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
{
- G
ladeXML
*xml = data;
+ G
tkBuilder
*xml = data;
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
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)
{
static void
erase (PsppireKeypad *kp, gpointer data)
{
- G
ladeXML
*xml = data;
+ G
tkBuilder
*xml = data;
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
@@
-370,7
+371,7
@@
compute_dialog (GObject *o, gpointer data)
PsppireVarStore *vs = NULL;
struct compute_dialog scd;
PsppireVarStore *vs = NULL;
struct compute_dialog scd;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");
@@
-388,7
+389,7
@@
compute_dialog (GObject *o, gpointer data)
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
-
scd.dict = vs->dict
;
+
g_object_get (vs, "dictionary", &scd.dict, NULL)
;
scd.use_type = FALSE;
g_signal_connect (expression, "toggled",
scd.use_type = FALSE;
g_signal_connect (expression, "toggled",
@@
-396,11
+397,10
@@
compute_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
-
- attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
- vs->dict,
- GTK_SELECTION_SINGLE, NULL);
-
+
+ g_object_set (dict_view, "dictionary", scd.dict,
+ "selection-mode", GTK_SELECTION_SINGLE,
+ NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
dict_view, syntax_area,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
dict_view, syntax_area,
@@
-447,6
+447,7
@@
compute_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-457,11
+458,7
@@
compute_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&scd);
{
gchar *syntax = generate_syntax (&scd);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
@@
-607,7
+604,6
@@
insert_source_row_into_text_view (GtkTreeIter iter,
gint *idx;
struct variable *var;
GtkTreeIter dict_iter;
gint *idx;
struct variable *var;
GtkTreeIter dict_iter;
- gchar *name;
GtkTextBuffer *buffer;
g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
GtkTextBuffer *buffer;
g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
@@
-635,13
+631,10
@@
insert_source_row_into_text_view (GtkTreeIter iter,
gtk_tree_path_free (path);
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);
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);
}
}