projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separated psppire_selector_set_subjects into two individual functions
[pspp-builds.git]
/
src
/
ui
/
gui
/
descriptives-dialog.c
diff --git
a/src/ui/gui/descriptives-dialog.c
b/src/ui/gui/descriptives-dialog.c
index 7b9a958409a8cc8c06c95e9e32dbe8c808325364..c29e1d8d66c14a8cda6f6b98f8efc3e3ed6e2370 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-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)
@@
-206,7
+206,7
@@
descriptives_dialog (GObject *o, gpointer data)
struct descriptives_dialog scd;
struct descriptives_dialog scd;
- GtkBuilder *xml = builder_new ("descriptives
-dialog
.ui");
+ GtkBuilder *xml = builder_new ("descriptives.ui");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
@@
-218,23
+218,21
@@
descriptives_dialog (GObject *o, gpointer data)
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
PsppireVarStore *vs = NULL;
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
PsppireVarStore *vs = NULL;
+ PsppireDict *dict;
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &dict, NULL);
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 (source, "dictionary", vs->dict,
- "predicate", var_is_numeric, NULL);
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+ g_object_set (source, "model", dict,
+ "predicate", var_is_numeric, NULL);
+ set_dest_model (GTK_TREE_VIEW (dest), dict);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
+ insert_source_row_into_tree_view, NULL);
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
B_DS_DEFAULT,
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
B_DS_DEFAULT,
@@
-242,7
+240,9
@@
descriptives_dialog (GObject *o, gpointer data)
scd.stat_vars = GTK_TREE_VIEW (dest);
scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
scd.stat_vars = GTK_TREE_VIEW (dest);
scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
- scd.dict = vs->dict;
+
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+
scd.include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
scd.exclude_missing_listwise =
scd.include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
scd.exclude_missing_listwise =