/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005, 2006 Free Software Foundation
+ Copyright (C) 2005, 2006, 2010 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
union value v;
v.f = 1234.56;
- sample_text = value_to_text (v, NULL, dialog->fmt_l);
+ sample_text = value_to_text (v, dialog->vs->dictionary, dialog->fmt_l);
gtk_label_set_text (GTK_LABEL (dialog->label_psample), sample_text);
g_free (sample_text);
v.f = -v.f;
- sample_text = value_to_text (v, NULL, dialog->fmt_l);
+ sample_text = value_to_text (v, dialog->vs->dictionary, dialog->fmt_l);
gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text);
g_free (sample_text);
}
dialog->fmt_l = custom_format;
dialog->fmt_l.type = *(int*) g_value_get_pointer (&the_value);
-
}
-
-
/* Create the structure */
struct var_type_dialog *
-var_type_dialog_create (GtkWindow *toplevel)
+var_type_dialog_create (GtkWindow *toplevel, PsppireVarStore *vs)
{
gint i;
struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui");
+ dialog->vs = vs;
+
dialog->window = get_widget_assert (xml,"var_type_dialog");
dialog->active_button = -1;
g_object_unref (list_store);
g_signal_connect (dialog->date_format_treeview, "cursor-changed",
- GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
+ G_CALLBACK (set_format_from_treeview), dialog);
/* populate the dollar treeview */
g_signal_connect (dialog->dollar_treeview,
"cursor-changed",
- GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
+ G_CALLBACK (set_format_from_treeview), dialog);
g_signal_connect_swapped (dialog->dollar_treeview,
"cursor-changed",
- GTK_SIGNAL_FUNC (update_width_decimals), dialog);
+ G_CALLBACK (update_width_decimals), dialog);
/* populate the custom treeview */
g_signal_connect (dialog->custom_treeview,
"cursor-changed",
- GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
+ G_CALLBACK (set_format_type_from_treeview), dialog);
g_signal_connect (dialog->custom_treeview,
"cursor-changed",
- GTK_SIGNAL_FUNC (preview_custom), dialog);
+ G_CALLBACK (preview_custom), dialog);
g_signal_connect (dialog->entry_width,
"changed",
- GTK_SIGNAL_FUNC (preview_custom), dialog);
+ G_CALLBACK (preview_custom), dialog);
g_signal_connect (dialog->entry_decimals,
"changed",
- GTK_SIGNAL_FUNC (preview_custom), dialog);
+ G_CALLBACK (preview_custom), dialog);
/* Connect to the OK button */
gint decimals = atoi (gtk_entry_get_text
(GTK_ENTRY (dialog->entry_decimals)));
- gint new_type = VAL_NUMERIC;
gint new_width = 0;
bool result = false;
struct fmt_spec spec;
switch (dialog->active_button)
{
case BUTTON_STRING:
- new_type = VAL_STRING;
new_width = width;
result = make_output_format_try (&spec, FMT_A, width, 0);
break;