#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;
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))
{
gtk_widget_set_sensitive (dialog->change_button, FALSE);
gtk_widget_set_sensitive (dialog->add_button, TRUE);
}
+
+ value_destroy (&v, var_get_width (dialog->pv));
}
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),
g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
+
+ value_destroy (&v, var_get_width (dialog->pv));
}
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)));
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 */
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)) ) )
- return ;
+ if (val_labs_add (dialog->labs, &v,
+ gtk_entry_get_text
+ ( GTK_ENTRY (dialog->label_entry)) ) )
+ {
+ gtk_widget_set_sensitive (dialog->add_button, FALSE);
- 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 */
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);
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);
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");
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\"",
+ gchar *const text = g_strdup_printf (_("%s = `%s'"),
vstr, val_lab_get_label (vl));
gtk_list_store_append (list_store, &iter);