/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2009, 2010, 2011, 2012 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
#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 "builder-wrapper.h"
#include "helper.h"
-#include <language/syntax-string-source.h>
-#include <libpspp/i18n.h>
-#include "helper.h"
#include <gettext.h>
static const gchar none[] = N_("None");
-static gchar *
-name_to_string (const struct variable *var, PsppireDict *dict)
-{
- const char *name = var_get_name (var);
- g_assert (name);
-
- return recode_string (UTF8, psppire_dict_encoding (dict),
- name, -1);
-}
-
-
-static gchar *
-label_to_string (const struct variable *var, PsppireDict *dict)
+static const gchar *
+label_to_string (const struct variable *var)
{
const char *label = var_get_label (var);
- if (! label) return g_strdup (none);
+ if (NULL == label) return g_strdup (none);
- return recode_string (UTF8, psppire_dict_encoding (dict),
- label, -1);
+ return label;
}
static void
populate_text (PsppireDictView *treeview, gpointer data)
{
- gchar *text = 0;
+ gchar *text = NULL;
GString *gstring;
PsppireDict *dict;
if ( var == NULL)
return;
- g_object_get (treeview,
- "dictionary", &dict,
+ g_object_get (treeview, "model", &dict,
NULL);
gstring = g_string_sized_new (200);
- text = name_to_string (var, dict);
- g_string_assign (gstring, text);
- g_free (text);
+ g_string_assign (gstring, var_get_name (var));
g_string_append (gstring, "\n");
- text = label_to_string (var, dict);
- g_string_append_printf (gstring, _("Label: %s\n"), text);
- g_free (text);
-
+ g_string_append_printf (gstring, _("Label: %s\n"), label_to_string (var));
{
const struct fmt_spec *fmt = var_get_print_format (var);
char buffer[FMT_STRING_LEN_MAX + 1];
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 */
if ( var_has_value_labels (var))
{
- struct val_labs_iterator *vli = 0;
- struct val_lab *vl;
- const struct val_labs *labs = var_get_value_labels (var);
+ const struct val_labs *vls = var_get_value_labels (var);
+ const struct val_lab **labels;
+ size_t n_labels;
+ size_t i;
g_string_append (gstring, "\n");
g_string_append (gstring, _("Value Labels:\n"));
- for (vl = val_labs_first_sorted (labs, &vli);
- vl;
- vl = val_labs_next (labs, &vli))
- {
- gchar *const vstr =
- value_to_text (vl->value, *var_get_print_format (var));
+ labels = val_labs_sorted (vls);
+ n_labels = val_labs_count (vls);
+ for (i = 0; i < n_labels; i++)
+ {
+ const struct val_lab *vl = labels[i];
+ gchar *const vstr = value_to_text (vl->value, var);
+ g_string_append_printf (gstring, _("%s %s\n"),
+ vstr, val_lab_get_escaped_label (vl));
- text = recode_string (UTF8, psppire_dict_encoding (dict),
- vl->label, -1);
-
- g_string_append_printf (gstring, _("%s %s\n"), vstr, text);
-
- g_free (text);
g_free (vstr);
}
+ free (labels);
}
gtk_text_buffer_set_text (textbuffer, gstring->str, gstring->len);
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);
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);
}