projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module psppire-var-view
[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 1b49d92130839f9db49f0d3cc8d57390043bd1b7..9d8502de058b34b2cfa301338978ccc69267f4e2 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-dialog.c
@@
-18,6
+18,7
@@
#include "checkbox-treeview.h"
#include "descriptives-dialog.h"
#include "checkbox-treeview.h"
#include "descriptives-dialog.h"
+#include "psppire-var-view.h"
#include <gtk/gtk.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <stdlib.h>
@@
-117,7
+118,7
@@
generate_syntax (const struct descriptives_dialog *scd)
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
-
append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (scd->stat_vars), 0, string
);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
@@
-212,7
+213,6
@@
descriptives_dialog (GObject *o, gpointer data)
GtkWidget *source = get_widget_assert (xml, "all-variables");
GtkWidget *source = get_widget_assert (xml, "all-variables");
- GtkWidget *selector = get_widget_assert (xml, "stat-var-selector");
GtkWidget *dest = get_widget_assert (xml, "stat-variables");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
GtkWidget *dest = get_widget_assert (xml, "stat-variables");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
@@
-226,16
+226,9
@@
descriptives_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 (source, "
dictionary
", dict,
+ g_object_set (source, "
model
", dict,
"predicate", var_is_numeric, NULL);
"predicate", var_is_numeric, NULL);
- set_dest_model (GTK_TREE_VIEW (dest), dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
B_DS_DEFAULT,
N_DESCRIPTIVE_STATS, stats);
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
B_DS_DEFAULT,
N_DESCRIPTIVE_STATS, stats);