value-labels: Interpret \n as new-line in value labels.

[pspp-builds.git] / src / ui / gui / val-labs-dialog.c

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 765be7fd16d71765cf59322f0f5e7370af66c8c2..605be36f7d608b991fcc0aeb5beef89e35f3e5f2 100644 (file)
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2005, 2009  Free Software Foundation
+   Copyright (C) 2005, 2009, 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
@@ -30,11 +30,16 @@
 #include "psppire-var-store.h"
 #include <libpspp/i18n.h>
 
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 struct val_labs_dialog
 {
   GtkWidget *window;
 
   PsppireVarStore *var_store;
+  PsppireDict *dict;
 
   /* The variable to be updated */
   struct variable *pv;
@@ -71,10 +76,10 @@ on_label_entry_change (GtkEntry *entry, gpointer data)
 
   text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
-  text_to_value (text, &v,
-                dialog->var_store->dict,
-               *var_get_write_format (dialog->pv));
-
+  text_to_value (text,
+                dialog->dict,
+                dialog->pv,
+                &v);
 
   if (val_labs_find (dialog->labs, &v))
     {
@@ -86,6 +91,8 @@ on_label_entry_change (GtkEntry *entry, gpointer data)
       gtk_widget_set_sensitive (dialog->change_button, FALSE);
       gtk_widget_set_sensitive (dialog->add_button, TRUE);
     }
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 
@@ -142,9 +149,10 @@ on_value_entry_change (GtkEntry *entry, gpointer data)
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
   union value v;
-  text_to_value (text, &v,
-                dialog->var_store->dict,
-               *var_get_write_format (dialog->pv));
+  text_to_value (text,
+                dialog->dict,
+                dialog->pv,
+                &v);
 
 
   g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
@@ -168,6 +176,8 @@ on_value_entry_change (GtkEntry *entry, gpointer data)
 
   g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
                         dialog->change_handler_id);
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 
@@ -251,7 +261,11 @@ get_selected_tuple (struct val_labs_dialog *dialog,
   if (valuep != NULL)
     *valuep = value;
   if (label != NULL)
-    *label = val_labs_find (dialog->labs, &value);
+    {
+      struct val_lab *vl = val_labs_lookup (dialog->labs, &value);
+      if (vl != NULL)
+        *label = val_lab_get_escaped_label (vl);
+    }
 }
 
 
@@ -267,9 +281,10 @@ on_change (GtkWidget *w, gpointer data)
 
   union value v;
 
-  text_to_value (val_text, &v,
-                dialog->var_store->dict,
-               *var_get_write_format (dialog->pv));
+  text_to_value (val_text,
+                dialog->dict,
+                dialog->pv,
+                &v);
 
   val_labs_replace (dialog->labs, &v,
                    gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
@@ -278,6 +293,8 @@ on_change (GtkWidget *w, gpointer data)
 
   repopulate_dialog (dialog);
   gtk_widget_grab_focus (dialog->value_entry);
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 /* Callback which occurs when the "Add" button is clicked */
@@ -290,20 +307,22 @@ on_add (GtkWidget *w, gpointer data)
 
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
-  text_to_value (text, &v,
-                dialog->var_store->dict,
-               *var_get_write_format (dialog->pv));
+  text_to_value (text,
+                dialog->dict,
+                dialog->pv,
+                &v);
 
+  if (val_labs_add (dialog->labs, &v,
+                   gtk_entry_get_text
+                   ( GTK_ENTRY (dialog->label_entry)) ) )
+    {
+      gtk_widget_set_sensitive (dialog->add_button, FALSE);
 
-  if ( ! val_labs_add (dialog->labs, &v,
-                      gtk_entry_get_text
-                      ( GTK_ENTRY (dialog->label_entry)) ) )
-    return ;
-
-  gtk_widget_set_sensitive (dialog->add_button, FALSE);
+      repopulate_dialog (dialog);
+      gtk_widget_grab_focus (dialog->value_entry);
+    }
 
-  repopulate_dialog (dialog);
-  gtk_widget_grab_focus (dialog->value_entry);
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 /* Callback which occurs when the "Remove" button is clicked */
@@ -313,7 +332,7 @@ on_remove (GtkWidget *w, gpointer data)
   struct val_labs_dialog *dialog = data;
 
   union value value;
-  const struct val_lab *vl;
+  struct val_lab *vl;
 
   get_selected_tuple (dialog, &value, NULL);
   vl = val_labs_lookup (dialog->labs, &value);
@@ -341,7 +360,7 @@ on_select_row (GtkTreeView *treeview, gpointer data)
   gchar *text;
 
   get_selected_tuple (dialog, &value, &label);
-  text = value_to_text (value, dialog->var_store->dict, *var_get_write_format (dialog->pv));
+  text = value_to_text (value, dialog->dict, *var_get_write_format (dialog->pv));
 
   g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
                         dialog->value_handler_id);
@@ -381,6 +400,7 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store)
   struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
 
   dialog->var_store = var_store;
+  g_object_get (var_store, "dictionary", &dialog->dict, NULL);
   dialog->window = get_widget_assert (xml,"val_labs_dialog");
   dialog->value_entry = get_widget_assert (xml,"value_entry");
   dialog->label_entry = get_widget_assert (xml,"label_entry");
@@ -493,11 +513,11 @@ repopulate_dialog (struct val_labs_dialog *dialog)
       const struct val_lab *vl = labels[i];
 
       gchar *const vstr  =
-       value_to_text (vl->value, dialog->var_store->dict,
+       value_to_text (vl->value, dialog->dict,
                      *var_get_write_format (dialog->pv));
 
-      gchar *const text = g_strdup_printf ("%s = \"%s\"",
-                                          vstr, val_lab_get_label (vl));
+      gchar *const text = g_strdup_printf (_("%s = `%s'"), vstr,
+                                           val_lab_get_escaped_label (vl));
 
       gtk_list_store_append (list_store, &iter);
       gtk_list_store_set (list_store, &iter,