projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not rely on user to specify all variables in VARIABLE subcommand. Fixes bug 30389.
[pspp]
/
src
/
ui
/
gui
/
reliability-dialog.c
diff --git
a/src/ui/gui/reliability-dialog.c
b/src/ui/gui/reliability-dialog.c
index d087ed840db21557bd9f4d1c14ded406f1180bcf..8587b723f023eea6234aaadf344e3d075c53905e 100644
(file)
--- a/
src/ui/gui/reliability-dialog.c
+++ b/
src/ui/gui/reliability-dialog.c
@@
-24,6
+24,7
@@
#include "psppire-dialog.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
+#include "psppire-var-view.h"
#include "executor.h"
#include "helper.h"
#include "executor.h"
#include "helper.h"
@@
-109,20
+110,17
@@
dialog_state_valid (gpointer data)
/* Pops up the Reliability dialog box */
void
/* Pops up the Reliability dialog box */
void
-reliability_dialog (
GObject *o, gpointer data
)
+reliability_dialog (
PsppireDataWindow *de
)
{
struct reliability rd;
gint response;
GtkBuilder *xml = builder_new ("reliability.ui");
{
struct reliability rd;
gint response;
GtkBuilder *xml = builder_new ("reliability.ui");
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "reliability-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-view");
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "reliability-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-view");
- GtkWidget *selector = get_widget_assert (xml, "psppire-selector1");
-
rd.split_point_hbox = get_widget_assert (xml, "split-point-hbox");
rd.variables = get_widget_assert (xml, "treeview2");
rd.split_point_hbox = get_widget_assert (xml, "split-point-hbox");
rd.variables = get_widget_assert (xml, "treeview2");
@@
-140,13
+138,6
@@
reliability_dialog (GObject *o, gpointer data)
g_object_get (vs, "dictionary", &rd.dict, NULL);
g_object_set (source, "model", rd.dict, NULL);
g_object_get (vs, "dictionary", &rd.dict, NULL);
g_object_set (source, "model", rd.dict, NULL);
- set_dest_model (GTK_TREE_VIEW (rd.variables), rd.dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
{
GtkTreeModel *tm =
gtk_tree_view_get_model (GTK_TREE_VIEW (rd.variables));
{
GtkTreeModel *tm =
gtk_tree_view_get_model (GTK_TREE_VIEW (rd.variables));
@@
-182,7
+173,7
@@
reliability_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
- paste_syntax_
in_new
_window (syntax);
+ paste_syntax_
to
_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
@@
-204,7
+195,7
@@
generate_syntax (const struct reliability *rd)
GString *string = g_string_new ("RELIABILITY");
g_string_append (string, "\n\t/VARIABLES=");
GString *string = g_string_new ("RELIABILITY");
g_string_append (string, "\n\t/VARIABLES=");
-
append_variable_names (string, rd->dict, GTK_TREE_VIEW (rd->variables), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->variables), 0, string
);
g_string_append (string, "\n\t/MODEL=");
g_string_append (string, "\n\t/MODEL=");