projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
variable-info-dialog.c
diff --git
a/src/ui/gui/variable-info-dialog.c
b/src/ui/gui/variable-info-dialog.c
index 612643b4351b4447f72b3b35449a1e63793dafd6..178a834c7a0d8357c642997c649f81f9612488b6 100644
(file)
--- 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2009
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
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
@@
-28,6
+28,7
@@
#include "helper.h"
#include <language/syntax-string-source.h>
#include "helper.h"
#include <language/syntax-string-source.h>
+#include <libpspp/i18n.h>
#include "helper.h"
#include "helper.h"
@@
-36,31
+37,44
@@
#define N_(msgid) msgid
#define N_(msgid) msgid
+static const gchar none[] = N_("None");
+
+
+static const gchar *
+label_to_string (const struct variable *var)
+{
+ const char *label = var_get_label (var);
+
+ if (NULL == label) return g_strdup (none);
+
+ return label;
+}
+
static void
populate_text (PsppireDictView *treeview, gpointer data)
{
gchar *text = 0;
GString *gstring;
static void
populate_text (PsppireDictView *treeview, gpointer data)
{
gchar *text = 0;
GString *gstring;
+ PsppireDict *dict;
- GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data));
+ GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW
(data));
const struct variable *var =
psppire_dict_view_get_selected_variable (treeview);
if ( var == NULL)
return;
const struct variable *var =
psppire_dict_view_get_selected_variable (treeview);
if ( var == NULL)
return;
+ g_object_get (treeview,
+ "dictionary", &dict,
+ NULL);
+
gstring = g_string_sized_new (200);
gstring = g_string_sized_new (200);
- text = name_to_string (var, NULL);
- g_string_assign (gstring, text);
- g_free (text);
+ g_string_assign (gstring, var_get_name (var));
g_string_append (gstring, "\n");
g_string_append (gstring, "\n");
- text = label_to_string (var, NULL);
- 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];
{
const struct fmt_spec *fmt = var_get_print_format (var);
char buffer[FMT_STRING_LEN_MAX + 1];
@@
-70,7
+84,7
@@
populate_text (PsppireDictView *treeview, gpointer data)
g_string_append_printf (gstring, _("Type: %s\n"), buffer);
}
g_string_append_printf (gstring, _("Type: %s\n"), buffer);
}
- text = missing_values_to_string (var, NULL);
+ text = missing_values_to_string (
dict,
var, NULL);
g_string_append_printf (gstring, _("Missing Values: %s\n"),
text);
g_free (text);
g_string_append_printf (gstring, _("Missing Values: %s\n"),
text);
g_free (text);
@@
-85,29
+99,27
@@
populate_text (PsppireDictView *treeview, gpointer data)
/* Value Labels */
if ( var_has_value_labels (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"));
g_string_append (gstring, "\n");
g_string_append (gstring, _("Value Labels:\n"));
-#if 1
-
for (vl = val_labs_first_sorted (labs, &vli
);
- vl;
- vl = val_labs_next (labs, &vli))
- {
+ 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 =
gchar *const vstr =
- value_to_text (vl->value, *var_get_print_format (var));
-
- text = pspp_locale_to_utf8 (vl->label, -1, NULL);
+ value_to_text (vl->value, dict, *var_get_print_format (var));
- g_string_append_printf (gstring, _("%s %s\n"), vstr,
text
);
+ g_string_append_printf (gstring, _("%s %s\n"), vstr,
val_lab_get_label (vl)
);
- g_free (text);
g_free (vstr);
}
g_free (vstr);
}
-#endif
+ free (labels);
}
gtk_text_buffer_set_text (textbuffer, gstring->str, gstring->len);
}
gtk_text_buffer_set_text (textbuffer, gstring->str, gstring->len);