projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Move some formatting functions into PSPP core.
[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 cbc4d5cadb97eedc10b929e4532da9e820d7df3d..d5b41a98686cb13172f22c1e1e69f2ccded41617 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, 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
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 <config.h>
#include <gtk/gtk.h>
-#include "var-display.h"
#include <data/variable.h>
#include <data/format.h>
#include <data/value-labels.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-data-window.h"
#include "psppire-dialog.h"
-#include "psppire-var-store.h"
#include "psppire-dictview.h"
#include "psppire-dictview.h"
+#include "psppire-var-store.h"
#include "helper.h"
#include "helper.h"
-#include <language/syntax-string-source.h>
-#include <libpspp/i18n.h>
-#include "helper.h"
#include <gettext.h>
#include <gettext.h>
@@
-54,7
+55,7
@@
label_to_string (const struct variable *var)
static void
populate_text (PsppireDictView *treeview, gpointer data)
{
static void
populate_text (PsppireDictView *treeview, gpointer data)
{
- gchar *text =
0
;
+ gchar *text =
NULL
;
GString *gstring;
PsppireDict *dict;
GString *gstring;
PsppireDict *dict;
@@
-88,11
+89,8
@@
populate_text (PsppireDictView *treeview, gpointer data)
text);
g_free (text);
text);
g_free (text);
- text = measure_to_string (var, NULL);
g_string_append_printf (gstring, _("Measurement Level: %s\n"),
g_string_append_printf (gstring, _("Measurement Level: %s\n"),
- text);
- g_free (text);
-
+ measure_to_string (var_get_measure (var)));
/* Value Labels */
/* Value Labels */
@@
-111,10
+109,10
@@
populate_text (PsppireDictView *treeview, gpointer data)
for (i = 0; i < n_labels; i++)
{
const struct val_lab *vl = labels[i];
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);
}
g_free (vstr);
}
@@
-145,10
+143,8
@@
static gchar * generate_syntax (PsppireDictView *treeview);
void
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.ui");
gint response ;
GtkBuilder *xml = builder_new ("variable-info.ui");
@@
-199,7
+195,7
@@
variable_info_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (PSPPIRE_DICT_VIEW (treeview));
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);
}
g_free (syntax);
}