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
/
weight-cases-dialog.c
diff --git
a/src/ui/gui/weight-cases-dialog.c
b/src/ui/gui/weight-cases-dialog.c
index 8b46ca5e8d7c988cfb1f2bd2649c55e92dd28fee..b43d49c3f50d64c244b4ff17ee62877def5a68cf 100644
(file)
--- a/
src/ui/gui/weight-cases-dialog.c
+++ b/
src/ui/gui/weight-cases-dialog.c
@@
-19,11
+19,11
@@
#include "weight-cases-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "weight-cases-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
-#include "
helpe
r.h"
-#include "
data-editor
.h"
+#include "
executo
r.h"
+#include "
psppire-data-window
.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
syntax-edito
r.h"
+#include "
helpe
r.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-103,7
+103,7
@@
void
weight_cases_dialog (GObject *o, gpointer data)
{
gint response;
weight_cases_dialog (GObject *o, gpointer data)
{
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
struct weight_cases_dialog wcd;
GtkBuilder *xml = builder_new ("psppire.ui");
struct weight_cases_dialog wcd;
GtkBuilder *xml = builder_new ("psppire.ui");
@@
-120,8
+120,9
@@
weight_cases_dialog (GObject *o, gpointer data)
PsppireVarStore *vs = NULL;
g_object_get (de->data_editor, "var-store", &vs, NULL);
PsppireVarStore *vs = NULL;
g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &wcd.dict, NULL);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
g_signal_connect (radiobutton1, "toggled", G_CALLBACK (on_toggle), entry);
g_signal_connect (selector, "selected", G_CALLBACK (on_select),
g_signal_connect (radiobutton1, "toggled", G_CALLBACK (on_toggle), entry);
g_signal_connect (selector, "selected", G_CALLBACK (on_select),
@@
-130,22
+131,18
@@
weight_cases_dialog (GObject *o, gpointer data)
g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
radiobutton1);
g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
radiobutton1);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-
vs->
dict,
- GTK_SELECTION_SINGLE,
- var_is_numeric
- );
+
+
g_object_set (source, "dictionary", wcd.
dict,
+
"selection-mode",
GTK_SELECTION_SINGLE,
+ "predicate", var_is_numeric,
+
NULL
);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- entry,
insert_source_row_into_entry,
is_currently_in_entry,
NULL
);
insert_source_row_into_entry,
is_currently_in_entry,
NULL
);
-
- wcd.dict = vs->dict;
wcd.entry = GTK_ENTRY (entry);
wcd.status = GTK_LABEL (status);
wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
wcd.entry = GTK_ENTRY (entry);
wcd.status = GTK_LABEL (status);
wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
@@
-171,12
+168,7
@@
weight_cases_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&wcd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&wcd);
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;