projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireSelector: new properties: "source-widget" and "dest-widget".
[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 7703640c4d553e81eb6584f28eb46841a0c3fe21..34f686162b44db3e94edbf08c826a0c10ea42bb4 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-dialog.c
@@
-24,10
+24,11
@@
#include "psppire-var-store.h"
#include "psppire-selector.h"
#include "dialog-common.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 <language/expressions/public.h>
#include <language/syntax-string-source.h>
-#include "
helpe
r.h"
+#include "
executo
r.h"
static void function_list_populate (GtkTreeView *tv);
static void function_list_populate (GtkTreeView *tv);
@@
-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,13
+397,12
@@
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));
- g_object_set (dict_view,
-
"dictionary", vs->
dict,
+
+
g_object_set (dict_view, "dictionary", scd.
dict,
"selection-mode", GTK_SELECTION_SINGLE,
NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
"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);
insert_source_row_into_text_view,
NULL,
NULL);
@@
-411,7
+411,6
@@
compute_dialog (GObject *o, gpointer data)
function_list_populate (GTK_TREE_VIEW (functions));
psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
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);
insert_function_into_syntax_area,
NULL,
NULL);
@@
-603,7
+602,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));
@@
-631,13
+629,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);
}
}