X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftranspose-dialog.c;h=cdd3364d8fa7aa9d5a1971be51d0fd8c4fb453a4;hb=d32776c387defa54d9b853c3925211f17028b99e;hp=cc2ac6dd4bc0fa93e67c05abaf820cb6124b0335;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index cc2ac6dd4b..cdd3364d8f 100644
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -55,6 +55,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)
 {
@@ -84,17 +106,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)
@@ -143,7 +172,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));