X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftranspose-dialog.c;h=36640f6f752a71829b391c1310a243d97de8eb17;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=aa6ed5c583cf2c5256c4d1d1350790d7b00cd9f1;hpb=1d5a97ba2afec23855a8294ff2814ab052f6777a;p=pspp-builds.git
diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index aa6ed5c5..36640f6f 100644
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -1,37 +1,33 @@
-/*
- 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
#include "transpose-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
-#include "helper.h"
-#include "data-editor.h"
+#include "executor.h"
+#include "psppire-data-window.h"
#include "dict-display.h"
#include
-#include "syntax-editor.h"
+#include "helper.h"
#include "dialog-common.h"
#include
-#include
#include
@@ -40,36 +36,55 @@
/* FIXME: These shouldn't be here */
-#include
#include "psppire-var-store.h"
-static gchar * generate_syntax (PsppireDict *dict, GladeXML *xml);
+static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml);
static void
refresh (PsppireDialog *dialog, gpointer data)
{
- GladeXML *xml = data;
+ GtkBuilder *xml = data;
GtkWidget *dest = get_widget_assert (xml, "variables-treeview");
GtkWidget *entry = get_widget_assert (xml, "new-name-entry");
- GtkTreeModel *dmodel = gtk_tree_view_get_model (dest);
+ GtkTreeModel *dmodel = gtk_tree_view_get_model (GTK_TREE_VIEW (dest));
gtk_list_store_clear (GTK_LIST_STORE (dmodel));
gtk_entry_set_text (GTK_ENTRY (entry), "");
}
+static gboolean
+dialog_state_valid (gpointer data)
+{
+ GtkBuilder *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;
-
- GladeXML *xml = XML_NEW ("psppire.glade");
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+ PsppireDict *dict = NULL;
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ GtkBuilder *xml = builder_new ("psppire.ui");
- 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,33 +93,42 @@ 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");
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+ g_object_get (vs, "dictionary", &dict, NULL);
+ g_object_set (source, "dictionary", dict, NULL);
+
+ set_dest_model (GTK_TREE_VIEW (dest), dict);
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)
{
case GTK_RESPONSE_OK:
{
- gchar *syntax = generate_syntax (vs->dict, xml);
+ gchar *syntax = generate_syntax (dict, xml);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@ -113,12 +137,8 @@ transpose_dialog (GObject *o, gpointer data)
break;
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);
+ gchar *syntax = generate_syntax (dict, xml);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
@@ -135,7 +155,7 @@ transpose_dialog (GObject *o, gpointer data)
FLIP /VARIABLES=var_list /NEWNAMES=var_name.
*/
static gchar *
-generate_syntax (PsppireDict *dict, GladeXML *xml)
+generate_syntax (PsppireDict *dict, GtkBuilder *xml)
{
const gchar *text;
GString *string = g_string_new ("FLIP");
@@ -146,7 +166,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));