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
/
frequencies-dialog.c
diff --git
a/src/ui/gui/frequencies-dialog.c
b/src/ui/gui/frequencies-dialog.c
index 978bfcd2eda7eb095ff729fa889ea4eb0760e295..8706f3a4e63ac105e0caee6a46e597cee048fc40 100644
(file)
--- a/
src/ui/gui/frequencies-dialog.c
+++ b/
src/ui/gui/frequencies-dialog.c
@@
-29,7
+29,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/helper.h>
+#include
"executor.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-311,7
+311,7
@@
frequencies_dialog (GObject *o, gpointer data)
struct frequencies_dialog fd;
struct frequencies_dialog fd;
- G
ladeXML *xml = XML_NEW ("frequencies.glade
");
+ G
tkBuilder *xml = builder_new ("frequencies.ui
");
GtkWidget *dialog = get_widget_assert (xml, "frequencies-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-treeview");
GtkWidget *dialog = get_widget_assert (xml, "frequencies-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-treeview");
@@
-333,11
+333,11
@@
frequencies_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 (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_get (vs, "dictionary", &fd.dict, NULL);
+ g_object_set (source, "dictionary", fd.dict, NULL);
+
- set_dest_model (GTK_TREE_VIEW (dest),
vs->
dict);
+ set_dest_model (GTK_TREE_VIEW (dest),
fd.
dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
@@
-349,7
+349,6
@@
frequencies_dialog (GObject *o, gpointer data)
fd.stat_vars = GTK_TREE_VIEW (dest);
fd.stat_vars = GTK_TREE_VIEW (dest);
- fd.dict = vs->dict;
fd.table_button = get_widget_assert (xml, "checkbutton1");
fd.format_dialog = get_widget_assert (xml, "format-dialog");
fd.maximum_cats = get_widget_assert (xml, "hbox5");
fd.table_button = get_widget_assert (xml, "checkbutton1");
fd.format_dialog = get_widget_assert (xml, "format-dialog");
fd.maximum_cats = get_widget_assert (xml, "hbox5");