projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor common code in dialog implementations
[pspp-builds.git]
/
src
/
ui
/
gui
/
oneway-anova-dialog.c
diff --git
a/src/ui/gui/oneway-anova-dialog.c
b/src/ui/gui/oneway-anova-dialog.c
index b3cff6be7143d7d9da574de56e1e76c8328795f5..45e888074cb586cc74f7de93fde4daedce62051a 100644
(file)
--- a/
src/ui/gui/oneway-anova-dialog.c
+++ b/
src/ui/gui/oneway-anova-dialog.c
@@
-23,8
+23,7
@@
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
-#include <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
@@
-32,7
+31,7
@@
#include <language/syntax-string-source.h>
#include <language/syntax-string-source.h>
-#include "
syntax-edito
r.h"
+#include "
helpe
r.h"
#include "gettext.h"
#include "gettext.h"
@@
-127,17
+126,14
@@
void
oneway_anova_dialog (GObject *o, gpointer data)
{
gint response;
oneway_anova_dialog (GObject *o, gpointer data)
{
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
- PsppireVarStore *vs;
+ PsppireVarStore *vs
= NULL
;
GladeXML *xml = XML_NEW ("oneway.glade");
struct oneway_anova_dialog ow;
GladeXML *xml = XML_NEW ("oneway.glade");
struct oneway_anova_dialog ow;
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
GtkWidget *dict_view =
get_widget_assert (xml, "oneway-anova-treeview1");
GtkWidget *dict_view =
get_widget_assert (xml, "oneway-anova-treeview1");
@@
-165,14
+161,14
@@
oneway_anova_dialog (GObject *o, gpointer data)
ow.homogeneity =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton2"));
ow.homogeneity =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton2"));
-
vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)
);
+
g_object_get (de->data_editor, "var-store", &vs, NULL
);
ow.dict = vs->dict;
ow.dialog =
GTK_WINDOW (get_widget_assert (xml, "oneway-anova-dialog"));
ow.dict = vs->dict;
ow.dialog =
GTK_WINDOW (get_widget_assert (xml, "oneway-anova-dialog"));
- gtk_window_set_transient_for (ow.dialog,
de->parent.window
);
+ gtk_window_set_transient_for (ow.dialog,
GTK_WINDOW (de)
);
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
vs->dict,
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
vs->dict,
@@
-184,13
+180,15
@@
oneway_anova_dialog (GObject *o, gpointer data)
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
dict_view, ow.vars_treeview,
insert_source_row_into_tree_view,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
dict_view, ow.vars_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
dict_view, ow.factor_entry,
insert_source_row_into_entry,
NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
dict_view, ow.factor_entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
@@
-224,7
+222,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
psppire_acr_set_entry (cd->acr, entry);
gtk_window_set_transient_for (GTK_WINDOW (cd->contrasts_dialog),
psppire_acr_set_entry (cd->acr, entry);
gtk_window_set_transient_for (GTK_WINDOW (cd->contrasts_dialog),
-
de->parent.window
);
+
GTK_WINDOW (de)
);
}
response = psppire_dialog_run (PSPPIRE_DIALOG (ow.dialog));
}
response = psppire_dialog_run (PSPPIRE_DIALOG (ow.dialog));
@@
-234,6
+232,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&ow);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&ow);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-243,11
+242,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ow);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ow);
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
@@
-271,7
+266,7
@@
static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
GString *str = g_string_new ("ONEWAY /VARIABLES=");
GString *str = g_string_new ("ONEWAY /VARIABLES=");
- append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview));
+ append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview)
, 0
);
g_string_append (str, " BY ");
g_string_append (str, " BY ");