projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
src
/
ui
/
gui
/
missing-val-dialog.c
diff --git
a/src/ui/gui/missing-val-dialog.c
b/src/ui/gui/missing-val-dialog.c
index 09e17c1aaff4046989f0866e7529ab5bb6e45dfb..3ee221d7613a45ccac3a39ba763fefd421fcc8c5 100644
(file)
--- a/
src/ui/gui/missing-val-dialog.c
+++ b/
src/ui/gui/missing-val-dialog.c
@@
-196,12
+196,13
@@
err_dialog (const gchar *msg, GtkWindow *window)
static gboolean
try_missing_value(const PsppireMissingValDialog *dialog, const gchar *text, union value *vp)
{
static gboolean
try_missing_value(const PsppireMissingValDialog *dialog, const gchar *text, union value *vp)
{
- const int var_width = fmt_var_width (
&
dialog->format);
+ const int var_width = fmt_var_width (dialog->format);
char *error_txt = NULL;
value_init(vp, var_width);
error_txt = data_in (ss_cstr(text), "UTF-8", dialog->format.type,
char *error_txt = NULL;
value_init(vp, var_width);
error_txt = data_in (ss_cstr(text), "UTF-8", dialog->format.type,
- vp, var_width, dialog->encoding);
+ settings_get_fmt_settings (), vp, var_width,
+ dialog->encoding);
if (error_txt)
{
err_dialog (error_txt, GTK_WINDOW (dialog));
if (error_txt)
{
err_dialog (error_txt, GTK_WINDOW (dialog));
@@
-232,7
+233,7
@@
static gboolean
missing_val_dialog_acceptable (gpointer data)
{
PsppireMissingValDialog *dialog = data;
missing_val_dialog_acceptable (gpointer data)
{
PsppireMissingValDialog *dialog = data;
- int var_width = fmt_var_width (
&
dialog->format);
+ int var_width = fmt_var_width (dialog->format);
if (gtk_toggle_button_get_active (dialog->button_discrete))
{
if (gtk_toggle_button_get_active (dialog->button_discrete))
{
@@
-375,7
+376,8
@@
psppire_missing_val_dialog_constructor (GType type,
type, n_properties, properties);
dialog = PSPPIRE_MISSING_VAL_DIALOG (obj);
type, n_properties, properties);
dialog = PSPPIRE_MISSING_VAL_DIALOG (obj);
- g_object_set (dialog, "help_page", "Missing-Observations", NULL);
+ g_object_set (dialog, "help-page", "Missing-Observations",
+ "title", _("Missing Values"), NULL);
content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog));
xml = builder_new ("missing-val-dialog.ui");
content_area = GTK_CONTAINER (PSPPIRE_DIALOG (dialog));
xml = builder_new ("missing-val-dialog.ui");
@@
-433,7
+435,7
@@
psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
else
mv_copy (&dialog->mvl, vmv);
dialog->encoding = g_strdup (var_get_encoding (var));
else
mv_copy (&dialog->mvl, vmv);
dialog->encoding = g_strdup (var_get_encoding (var));
- dialog->format =
*
var_get_print_format (var);
+ dialog->format = var_get_print_format (var);
}
else
{
}
else
{
@@
-450,7
+452,7
@@
psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
gtk_widget_set_sensitive (dialog->high, FALSE);
gtk_widget_set_sensitive (dialog->discrete, FALSE);
gtk_widget_set_sensitive (dialog->high, FALSE);
gtk_widget_set_sensitive (dialog->discrete, FALSE);
- var_type = val_type_from_width (fmt_var_width (
&
dialog->format));
+ var_type = val_type_from_width (fmt_var_width (dialog->format));
gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_range),
var_type == VAL_NUMERIC);
gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_range),
var_type == VAL_NUMERIC);
@@
-471,8
+473,8
@@
psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
mv_get_range (&dialog->mvl, &low.f, &high.f);
mv_get_range (&dialog->mvl, &low.f, &high.f);
- low_text = value_to_text__ (low,
&
dialog->format, dialog->encoding);
- high_text = value_to_text__ (high,
&
dialog->format, dialog->encoding);
+ low_text = value_to_text__ (low, dialog->format, dialog->encoding);
+ high_text = value_to_text__ (high, dialog->format, dialog->encoding);
gtk_entry_set_text (GTK_ENTRY (dialog->low), low_text);
gtk_entry_set_text (GTK_ENTRY (dialog->high), high_text);
gtk_entry_set_text (GTK_ENTRY (dialog->low), low_text);
gtk_entry_set_text (GTK_ENTRY (dialog->high), high_text);
@@
-483,7
+485,7
@@
psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
{
gchar *text;
text = value_to_text__ (*mv_get_value (&dialog->mvl, 0),
{
gchar *text;
text = value_to_text__ (*mv_get_value (&dialog->mvl, 0),
-
&
dialog->format, dialog->encoding);
+ dialog->format, dialog->encoding);
gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
g_free (text);
}
gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
g_free (text);
}
@@
-505,7
+507,7
@@
psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog,
gchar *text ;
text = value_to_text__ (*mv_get_value (&dialog->mvl, i),
gchar *text ;
text = value_to_text__ (*mv_get_value (&dialog->mvl, i),
-
&
dialog->format, dialog->encoding);
+ dialog->format, dialog->encoding);
gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
g_free (text);
}
gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
g_free (text);
}