X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Ftranspose-dialog.c;h=9e8c18f44e2ac601bb9a56bca1ab245b78dce963;hb=4c4f035bfad520dc54f0d5a9e30e36d4fb009efc;hp=45daa0f32167f999f713956cba1d9ff747fb3417;hpb=48386ee68a5283653435d05a9ea4e449710fd370;p=pspp-builds.git diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c index 45daa0f3..9e8c18f4 100644 --- a/src/ui/gui/transpose-dialog.c +++ b/src/ui/gui/transpose-dialog.c @@ -1,21 +1,18 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP - Copyright (C) 2007 Free Software Foundation +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2007 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #include @@ -23,10 +20,10 @@ #include "psppire-selector.h" #include "psppire-dialog.h" #include "helper.h" -#include "data-editor.h" +#include "psppire-data-window.h" #include "dict-display.h" #include -#include "syntax-editor.h" +#include "helper.h" #include "dialog-common.h" @@ -40,7 +37,6 @@ /* FIXME: These shouldn't be here */ -#include #include "psppire-var-store.h" @@ -58,18 +54,37 @@ refresh (PsppireDialog *dialog, gpointer data) gtk_entry_set_text (GTK_ENTRY (entry), ""); } +static gboolean +dialog_state_valid (gpointer data) +{ + GladeXML *xml = data; + + GtkWidget *tv = get_widget_assert (xml, "variables-treeview"); + GtkWidget *entry = get_widget_assert (xml, "new-name-entry"); + + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv)); + + gint n_rows = gtk_tree_model_iter_n_children (model, NULL); + + if ( n_rows == 0 ) + return FALSE; + + if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry)))) + return FALSE; + + return TRUE; +} + + void transpose_dialog (GObject *o, gpointer data) { gint response ; - struct data_editor *de = data; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); GladeXML *xml = XML_NEW ("psppire.glade"); - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); - - PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)); + PsppireVarStore *vs = NULL; GtkWidget *dialog = get_widget_assert (xml, "transpose-dialog"); GtkWidget *source = get_widget_assert (xml, "source-treeview"); @@ -78,6 +93,8 @@ transpose_dialog (GObject *o, gpointer data) GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3"); GtkWidget *new_name_entry = get_widget_assert (xml, "new-name-entry"); + g_object_get (de->data_editor, "var-store", &vs, NULL); + attach_dictionary_to_treeview (GTK_TREE_VIEW (source), vs->dict, GTK_SELECTION_MULTIPLE, NULL); @@ -87,17 +104,24 @@ transpose_dialog (GObject *o, gpointer data) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1), source, dest, insert_source_row_into_tree_view, + NULL, NULL); psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2), source, new_name_entry, insert_source_row_into_entry, - is_currently_in_entry); + is_currently_in_entry, + NULL); g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); + + psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog), + dialog_state_valid, xml); + response = psppire_dialog_run (PSPPIRE_DIALOG (dialog)); switch (response) @@ -105,6 +129,7 @@ transpose_dialog (GObject *o, gpointer data) case GTK_RESPONSE_OK: { gchar *syntax = generate_syntax (vs->dict, xml); + struct getl_interface *sss = create_syntax_string_source (syntax); execute_syntax (sss); @@ -114,11 +139,7 @@ transpose_dialog (GObject *o, gpointer data) case PSPPIRE_RESPONSE_PASTE: { gchar *syntax = generate_syntax (vs->dict, xml); - - 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); } @@ -146,7 +167,7 @@ generate_syntax (PsppireDict *dict, GladeXML *xml) g_string_append (string, " /VARIABLES = "); - append_variable_names (string, dict, GTK_TREE_VIEW (dest)); + append_variable_names (string, dict, GTK_TREE_VIEW (dest), 0); text = gtk_entry_get_text (GTK_ENTRY (entry));