X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Foneway-anova-dialog.c;h=1814dd6737562a1d922722141d9e6c6f3c2b0a63;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=b3cff6be7143d7d9da574de56e1e76c8328795f5;hpb=c65449a628d13f4683e7dc7125874608c7152017;p=pspp-builds.git diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c index b3cff6be..1814dd67 100644 --- a/src/ui/gui/oneway-anova-dialog.c +++ b/src/ui/gui/oneway-anova-dialog.c @@ -17,22 +17,21 @@ #include -#include #include #include "oneway-anova-dialog.h" #include "psppire-dict.h" #include "psppire-var-store.h" #include "helper.h" -#include -#include "data-editor.h" +#include "psppire-data-window.h" #include "psppire-dialog.h" #include "dialog-common.h" -#include "dict-display.h" #include "psppire-acr.h" +#include "psppire-selector.h" +#include "dict-display.h" #include -#include "syntax-editor.h" +#include "executor.h" #include "gettext.h" @@ -122,75 +121,73 @@ refresh (struct oneway_anova_dialog *ow) } + /* Pops up the dialog box */ void oneway_anova_dialog (GObject *o, gpointer data) { gint response; - struct data_editor *de = data; - - PsppireVarStore *vs; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GladeXML *xml = XML_NEW ("oneway.glade"); + PsppireVarStore *vs = NULL; struct oneway_anova_dialog ow; - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); + GtkBuilder *builder = builder_new ("oneway.ui"); GtkWidget *dict_view = - get_widget_assert (xml, "oneway-anova-treeview1"); + get_widget_assert (builder, "oneway-anova-treeview1"); GtkWidget *selector2 = - get_widget_assert (xml, "oneway-anova-selector2"); + get_widget_assert (builder, "oneway-anova-selector2"); GtkWidget *selector1 = - get_widget_assert (xml, "oneway-anova-selector1"); + get_widget_assert (builder, "oneway-anova-selector1"); GtkWidget *contrasts_button = - get_widget_assert (xml, "contrasts-button"); + get_widget_assert (builder, "contrasts-button"); g_signal_connect_swapped (contrasts_button, "clicked", G_CALLBACK (run_contrasts_dialog), &ow); - ow.factor_entry = get_widget_assert (xml, "oneway-anova-entry"); + ow.factor_entry = get_widget_assert (builder, "oneway-anova-entry"); ow.vars_treeview = - get_widget_assert (xml, "oneway-anova-treeview2"); + get_widget_assert (builder, "oneway-anova-treeview2"); ow.descriptives = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton1")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton1")); ow.homogeneity = - GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton2")); + GTK_TOGGLE_BUTTON (get_widget_assert (builder, "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; + g_object_get (vs, "dictionary", &ow.dict, NULL); ow.dialog = - GTK_WINDOW (get_widget_assert (xml, "oneway-anova-dialog")); + GTK_WINDOW (get_widget_assert (builder, "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, - GTK_SELECTION_MULTIPLE, NULL); + g_object_set (dict_view, "dictionary", ow.dict, NULL); - set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), vs->dict); + set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), ow.dict); 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, - is_currently_in_entry); + is_currently_in_entry, + NULL); @@ -204,16 +201,16 @@ oneway_anova_dialog (GObject *o, gpointer data) { struct contrasts_subdialog *cd = &ow.contrasts; - GtkEntry *entry = GTK_ENTRY (get_widget_assert (xml, "entry1")); + GtkEntry *entry = GTK_ENTRY (get_widget_assert (builder, "entry1")); - cd->acr = PSPPIRE_ACR (get_widget_assert (xml, "psppire-acr1")); - cd->contrasts_dialog = get_widget_assert (xml, "contrasts-dialog"); + cd->acr = PSPPIRE_ACR (get_widget_assert (builder, "psppire-acr1")); + cd->contrasts_dialog = get_widget_assert (builder, "contrasts-dialog"); - cd->next = get_widget_assert (xml, "next-button"); - cd->prev = get_widget_assert (xml, "prev-button"); - cd->ctotal = get_widget_assert (xml, "entry2"); + cd->next = get_widget_assert (builder, "next-button"); + cd->prev = get_widget_assert (builder, "prev-button"); + cd->ctotal = get_widget_assert (builder, "entry2"); - cd->stack_label = get_widget_assert (xml, "contrast-stack-label"); + cd->stack_label = get_widget_assert (builder, "contrast-stack-label"); /* Contrasts */ ow.contrasts_array = g_array_new (FALSE, FALSE, sizeof (GtkListStore *)); @@ -224,7 +221,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), - de->parent.window); + GTK_WINDOW (de)); } response = psppire_dialog_run (PSPPIRE_DIALOG (ow.dialog)); @@ -234,6 +231,7 @@ oneway_anova_dialog (GObject *o, gpointer data) case GTK_RESPONSE_OK: { gchar *syntax = generate_syntax (&ow); + struct getl_interface *sss = create_syntax_string_source (syntax); execute_syntax (sss); @@ -243,11 +241,7 @@ oneway_anova_dialog (GObject *o, gpointer data) 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); } @@ -258,7 +252,7 @@ oneway_anova_dialog (GObject *o, gpointer data) g_array_free (ow.contrasts_array, FALSE); - g_object_unref (xml); + g_object_unref (builder); } @@ -271,7 +265,7 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow) 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 ");