Remove unnecessary dependencies on gtksheet.h

[pspp-builds.git] / src / ui / gui / transpose-dialog.c

diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index 2c16c18dbddb5cc5e95e5ea2115ee9c69df30f85..621e196c2914ea43e9b2f5995be2acf8f1c0ea91 100644 (file)
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -37,7 +37,6 @@
 
 
 /* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
 #include "psppire-var-store.h"
 
 
@@ -55,6 +54,28 @@ 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)
 {
@@ -63,10 +84,7 @@ transpose_dialog (GObject *o, gpointer 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");
@@ -75,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);
@@ -84,19 +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), de->parent.window);
 
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+                                     dialog_state_valid, xml);
+
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
   switch (response)
@@ -145,7 +170,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));