X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=533021e762cb45f73e1a996444cde856e725689a;hb=56ec3543af35ae753a206142d36eb8393f7b4bb3;hp=bf770dcbaf30f009e3da1f32599f6617013457d1;hpb=a1fa03b1638263a959df0b2943478a0a4ca4b11a;p=pspp-builds.git

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index bf770dcb..533021e7 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -1,36 +1,32 @@
-/*
-    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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <gtksheet/gtksheet.h>
 
 #include "dict-display.h"
 #include "var-display.h"
 #include <data/variable.h>
+#include <data/format.h>
 #include <data/value-labels.h>
 #include "data-editor.h"
 #include "psppire-dialog.h"
 #include "psppire-var-store.h"
 #include "helper.h"
-#include <gtksheet/gtksheet.h>
 
 #include <language/syntax-string-source.h>
 #include "syntax-editor.h"
@@ -79,6 +75,8 @@ populate_text (GtkTreeView *treeview, gpointer data)
 
   GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data));
   const struct variable *var = get_selected_variable (treeview);
+  if ( var == NULL)
+    return;
 
   gstring = g_string_sized_new (200);
   text = name_to_string (var, NULL);
@@ -145,6 +143,21 @@ populate_text (GtkTreeView *treeview, gpointer data)
   g_string_free (gstring, TRUE);
 }
 
+static gboolean
+treeview_item_selected (gpointer data)
+{
+  GtkTreeView *tv = GTK_TREE_VIEW (data);
+  GtkTreeModel *model = gtk_tree_view_get_model (tv);
+
+  gint n_rows = gtk_tree_model_iter_n_children  (model, NULL);
+
+  if ( n_rows == 0 )
+    return FALSE;
+
+  return TRUE;
+}
+
+
 static gchar * generate_syntax (GtkTreeView *treeview);
 
 
@@ -161,11 +174,9 @@ variable_info_dialog (GObject *o, gpointer data)
   GtkWidget *treeview = get_widget_assert (xml, "treeview2");
   GtkWidget *textview = get_widget_assert (xml, "textview1");
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
+  PsppireVarStore *vs = NULL;
 
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
 
@@ -181,39 +192,24 @@ variable_info_dialog (GObject *o, gpointer data)
 
   gtk_text_view_set_indent (GTK_TEXT_VIEW (textview), -5);
 
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+				      treeview_item_selected, treeview);
+
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
   switch (response)
     {
     case PSPPIRE_RESPONSE_GOTO:
       {
-	gint row, col;
-	GtkNotebook *notebook = GTK_NOTEBOOK
-	  (get_widget_assert (de->xml,"notebook"));
-
 	const struct variable *var =
 	  get_selected_variable (GTK_TREE_VIEW (treeview));
 
+	if ( NULL == var)
+	  goto done;
 
-	if (PAGE_VAR_SHEET == gtk_notebook_get_current_page (notebook))
-	  {
-	    GtkSheet *var_sheet =
-	      GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-	    gtk_sheet_get_active_cell (var_sheet, &row, &col);
-	    row = var_get_dict_index (var);
-	    gtk_sheet_set_active_cell (var_sheet, row, col);
-	  }
-	else
-	  {
-	    GtkSheet *data_sheet =
-	      GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-	    gtk_sheet_get_active_cell (data_sheet, &row, &col);
-	    col = var_get_dict_index (var);
-	    gtk_sheet_set_active_cell (data_sheet, row, col);
-	  }
+	g_object_set (de->data_editor, "current-variable",  var_get_dict_index (var), NULL);
       }
+
       break;
     case PSPPIRE_RESPONSE_PASTE:
       {
@@ -231,8 +227,8 @@ variable_info_dialog (GObject *o, gpointer data)
       break;
     }
 
+ done:
   g_object_unref (xml);
-
 }
 
 static gchar *