X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=d5b41a98686cb13172f22c1e1e69f2ccded41617;hb=92c474055d5af5557c5f9341018f4e1642586af2;hp=178a834c7a0d8357c642997c649f81f9612488b6;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp-builds.git

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 178a834c..d5b41a98 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011  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
@@ -17,19 +17,20 @@
 #include <config.h>
 #include <gtk/gtk.h>
 
-#include "var-display.h"
 #include <data/variable.h>
 #include <data/format.h>
 #include <data/value-labels.h>
+#include <libpspp/i18n.h>
+
+#include "variable-info-dialog.h"
+#include "var-display.h"
+
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
-#include "psppire-var-store.h"
 #include "psppire-dictview.h"
+#include "psppire-var-store.h"
 #include "helper.h"
 
-#include <language/syntax-string-source.h>
-#include <libpspp/i18n.h>
-#include "helper.h"
 
 
 #include <gettext.h>
@@ -54,7 +55,7 @@ label_to_string (const struct variable *var)
 static void
 populate_text (PsppireDictView *treeview, gpointer data)
 {
-  gchar *text = 0;
+  gchar *text = NULL;
   GString *gstring;
   PsppireDict *dict;
 
@@ -65,8 +66,7 @@ populate_text (PsppireDictView *treeview, gpointer data)
   if ( var == NULL)
     return;
 
-  g_object_get (treeview,
-		"dictionary", &dict,
+  g_object_get (treeview, "model", &dict,
 		NULL);
 
   gstring = g_string_sized_new (200);
@@ -89,11 +89,8 @@ populate_text (PsppireDictView *treeview, gpointer data)
 			  text);
   g_free (text);
 
-  text = measure_to_string (var, NULL);
   g_string_append_printf (gstring, _("Measurement Level: %s\n"),
-			  text);
-  g_free (text);
-
+			  measure_to_string (var_get_measure (var)));
 
 
   /* Value Labels */
@@ -112,10 +109,10 @@ populate_text (PsppireDictView *treeview, gpointer data)
       for (i = 0; i < n_labels; i++)
         {
           const struct val_lab *vl = labels[i];
-	  gchar *const vstr  =
-	    value_to_text (vl->value,  dict, *var_get_print_format (var));
+	  gchar *const vstr  = value_to_text (vl->value,  var);
 
-	  g_string_append_printf (gstring, _("%s %s\n"), vstr, val_lab_get_label (vl));
+	  g_string_append_printf (gstring, _("%s %s\n"),
+                                  vstr, val_lab_get_escaped_label (vl));
 
 	  g_free (vstr);
 	}
@@ -146,26 +143,25 @@ static gchar * generate_syntax (PsppireDictView *treeview);
 
 
 void
-variable_info_dialog (GObject *o, gpointer data)
+variable_info_dialog (PsppireDataWindow *de)
 {
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
   gint response ;
 
-  GtkBuilder *xml = builder_new ("variable-info-dialog.ui");
+  GtkBuilder *xml = builder_new ("variable-info.ui");
 
   GtkWidget *dialog = get_widget_assert (xml, "variable-info-dialog");
   GtkWidget *treeview = get_widget_assert (xml, "treeview2");
   GtkWidget *textview = get_widget_assert (xml, "textview1");
 
   PsppireVarStore *vs = NULL;
+  PsppireDict *dict = NULL;
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  g_object_set (treeview,
-		"dictionary", vs->dict,
+  g_object_get (vs, "dictionary", &dict, NULL);
+  g_object_set (treeview, "model", dict,
 		"selection-mode", GTK_SELECTION_SINGLE,
 		NULL);
 
@@ -199,7 +195,7 @@ variable_info_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (PSPPIRE_DICT_VIEW (treeview));
-        paste_syntax_in_new_window (syntax);
+        paste_syntax_to_window (syntax);
 
 	g_free (syntax);
       }