X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=debc412341eca9e5af6b9ed6eaa07fae2b25cee8;hb=e89158e8abd2dae27d985e3574eb5aa1d265fc66;hp=5d40d21639bbe68fd9d06d6ea35dd9f50fba4a40;hpb=db2b1501c7ef5912183d51340740dd4bd2ee45ac;p=pspp diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c index 5d40d21639..debc412341 100644 --- a/src/ui/gui/compute-dialog.c +++ b/src/ui/gui/compute-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010, 2011, 2012 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,17 +17,20 @@ #include #include #include "compute-dialog.h" -#include "helper.h" +#include "builder-wrapper.h" #include "psppire-dialog.h" #include "psppire-keypad.h" -#include "data-editor.h" +#include "psppire-data-window.h" #include "psppire-var-store.h" +#include "psppire-selector.h" #include "dialog-common.h" -#include "dict-display.h" +#include + #include -#include -#include "syntax-editor.h" +#include "executor.h" +#include "helper.h" + static void function_list_populate (GtkTreeView *tv); @@ -47,7 +50,7 @@ static void insert_source_row_into_text_view (GtkTreeIter iter, struct compute_dialog { - GladeXML *xml; /* The xml that generated the widgets */ + GtkBuilder *xml; /* The xml that generated the widgets */ PsppireDict *dict; gboolean use_type; }; @@ -113,7 +116,7 @@ erase_selection (GtkTextBuffer *buffer) static void on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *rhs = get_widget_assert (xml, "compute-textview1"); @@ -137,7 +140,7 @@ on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data) static void erase (PsppireKeypad *kp, gpointer data) { - GladeXML *xml = data; + GtkBuilder *xml = data; GtkWidget *rhs = get_widget_assert (xml, "compute-textview1"); @@ -362,15 +365,14 @@ contents_plausible (gpointer data) /* Pops up the Compute dialog box */ void -compute_dialog (GObject *o, gpointer data) +compute_dialog (PsppireDataWindow *de) { gint response; - struct data_editor *de = data; PsppireVarStore *vs = NULL; struct compute_dialog scd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("compute.ui"); GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog"); @@ -378,7 +380,6 @@ compute_dialog (GObject *o, gpointer data) GtkWidget *functions = get_widget_assert (xml, "compute-treeview2"); GtkWidget *keypad = get_widget_assert (xml, "psppire-keypad1"); GtkWidget *target = get_widget_assert (xml, "compute-entry1"); - GtkWidget *syntax_area = get_widget_assert (xml, "compute-textview1"); GtkWidget *var_selector = get_widget_assert (xml, "compute-selector1"); GtkWidget *func_selector = get_widget_assert (xml, "compute-selector2"); GtkWidget *type_and_label = get_widget_assert (xml, "compute-button1"); @@ -388,35 +389,26 @@ compute_dialog (GObject *o, gpointer data) g_object_get (de->data_editor, "var-store", &vs, NULL); - scd.dict = vs->dict; + g_object_get (vs, "dictionary", &scd.dict, NULL); scd.use_type = FALSE; g_signal_connect (expression, "toggled", G_CALLBACK(on_expression_toggle), &scd); - gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window); - + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); - attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view), - vs->dict, - GTK_SELECTION_SINGLE, NULL); - - - psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector), - dict_view, syntax_area, - insert_source_row_into_text_view, - NULL, - NULL); + + g_object_set (dict_view, "model", scd.dict, + "selection-mode", GTK_SELECTION_SINGLE, + NULL); + psppire_selector_set_select_func (PSPPIRE_SELECTOR (var_selector), + insert_source_row_into_text_view, NULL); function_list_populate (GTK_TREE_VIEW (functions)); - psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector), - functions, syntax_area, - insert_function_into_syntax_area, - NULL, - NULL); - + psppire_selector_set_select_func (PSPPIRE_SELECTOR (func_selector), + insert_function_into_syntax_area, NULL); scd.xml = xml; @@ -445,25 +437,10 @@ compute_dialog (GObject *o, gpointer data) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&scd); - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&scd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&scd); - - struct syntax_editor *se = - (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL); - - gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1); - - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&scd))); break; default: break; @@ -525,6 +502,7 @@ function_list_populate (GtkTreeView *tv) } gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore)); + g_object_unref (liststore); } @@ -606,7 +584,6 @@ insert_source_row_into_text_view (GtkTreeIter iter, gint *idx; struct variable *var; GtkTreeIter dict_iter; - gchar *name; GtkTextBuffer *buffer; g_return_if_fail (GTK_IS_TEXT_VIEW (dest)); @@ -634,13 +611,10 @@ insert_source_row_into_text_view (GtkTreeIter iter, gtk_tree_path_free (path); - name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dest)); erase_selection (buffer); - gtk_text_buffer_insert_at_cursor (buffer, name, -1); + gtk_text_buffer_insert_at_cursor (buffer, var_get_name (var), -1); - g_free (name); }