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
/
examine-dialog.c
diff --git
a/src/ui/gui/examine-dialog.c
b/src/ui/gui/examine-dialog.c
index 33f8b129e888ca0b375fd644d71a34dc564ad7dc..470c4dbbe37797ac23e23d3430741c56da0aa94b 100644
(file)
--- a/
src/ui/gui/examine-dialog.c
+++ b/
src/ui/gui/examine-dialog.c
@@
-28,7
+28,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include
<ui/gui/psppire-syntax-window.h>
+#include
"executor.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-240,9
+240,7
@@
examine_dialog (GObject *o, gpointer data)
struct examine_dialog ex_d;
struct examine_dialog ex_d;
-
- GladeXML *xml = XML_NEW ("examine.glade");
-
+ GtkBuilder *xml = builder_new ("examine.ui");
GtkWidget *dialog = get_widget_assert (xml, "examine-dialog");
GtkWidget *source = get_widget_assert (xml, "treeview1");
GtkWidget *dialog = get_widget_assert (xml, "examine-dialog");
GtkWidget *source = get_widget_assert (xml, "treeview1");
@@
-281,13
+279,10
@@
examine_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (ex_d.stats_dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (ex_d.opts_dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (ex_d.stats_dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (ex_d.opts_dialog), GTK_WINDOW (de));
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_get (vs, "dictionary", &ex_d.dict, NULL);
+ g_object_set (source, "dictionary", ex_d.dict, NULL);
-
- set_dest_model (GTK_TREE_VIEW (ex_d.dep_list), vs->dict);
- ex_d.dict = vs->dict;
+ set_dest_model (GTK_TREE_VIEW (ex_d.dep_list), ex_d.dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (dep_selector),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (dep_selector),
@@
-299,7
+294,7
@@
examine_dialog (GObject *o, gpointer data)
psppire_selector_set_allow (PSPPIRE_SELECTOR (dep_selector),
numeric_only);
psppire_selector_set_allow (PSPPIRE_SELECTOR (dep_selector),
numeric_only);
- set_dest_model (GTK_TREE_VIEW (ex_d.fct_list),
vs->
dict);
+ set_dest_model (GTK_TREE_VIEW (ex_d.fct_list),
ex_d.
dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (fct_selector),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (fct_selector),
@@
-346,13
+341,7
@@
examine_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ex_d);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ex_d);
-
- 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);
}
break;
g_free (syntax);
}
break;