/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2011 Free Software Foundation
+ Copyright (C) 2011, 2014 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
#include <config.h>
+#include <float.h>
#include <gtk/gtk.h>
+#include "dialog-common.h"
#include "psppire-val-chooser.h"
#include "libpspp/str.h"
{
PROP_0,
PROP_IS_STRING,
+ PROP_SHOW_ELSE
};
+enum
+ {
+ VC_VALUE,
+ VC_SYSMIS,
+ VC_MISSING,
+ VC_RANGE,
+ VC_LOW_UP,
+ VC_HIGH_DOWN,
+ VC_ELSE
+ };
+
static void
psppire_val_chooser_set_property (GObject *object,
guint prop_id,
switch (prop_id)
{
+ case PROP_SHOW_ELSE:
+ {
+ gboolean x = g_value_get_boolean (value);
+ gtk_widget_set_visible (GTK_WIDGET (vr->rw[VC_ELSE].rb), x);
+ gtk_widget_set_visible (GTK_WIDGET (vr->rw[VC_ELSE].label), x);
+ }
+ break;
case PROP_IS_STRING:
vr->input_var_is_string = g_value_get_boolean (value);
-
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[1].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[2].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[3].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[4].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[5].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_SYSMIS].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_MISSING].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_RANGE].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_LOW_UP].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_HIGH_DOWN].rb), !vr->input_var_is_string);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
switch (prop_id)
{
+ case PROP_SHOW_ELSE:
+ {
+ gboolean x =
+ gtk_widget_get_visible (GTK_WIDGET (vr->rw[VC_ELSE].rb));
+ g_value_set_boolean (value, x);
+ }
+ break;
case PROP_IS_STRING:
g_value_set_boolean (value, vr->input_var_is_string);
default:
FALSE,
G_PARAM_READWRITE);
+ GParamSpec *show_else_spec =
+ g_param_spec_boolean ("show-else",
+ "Show Else",
+ "Should the \"All other values\" item be visible",
+ TRUE,
+ G_PARAM_READWRITE);
+
+
parent_class = g_type_class_peek_parent (class);
object_class->set_property = psppire_val_chooser_set_property;
g_object_class_install_property (object_class,
PROP_IS_STRING,
is_string_spec);
+
+ g_object_class_install_property (object_class,
+ PROP_SHOW_ELSE,
+ show_else_spec);
}
static struct layout range_opt[n_VAL_CHOOSER_BUTTONS]=
{
- {N_("Value:"), simple_entry, simple_set },
- {N_("System Missing"), NULL, sysmis_set },
- {N_("System or User Missing"), NULL, missing_set},
- {N_("Range:"), range_entry, range_set },
- {N_("Range, LOWEST thru value"), simple_entry, lo_up_set },
- {N_("Range, value thru HIGHEST"), simple_entry, hi_down_set},
- {N_("All other values"), NULL, else_set }
+ {N_("_Value:"), simple_entry, simple_set },
+ {N_("_System Missing"), NULL, sysmis_set },
+ {N_("System _or User Missing"), NULL, missing_set},
+ {N_("_Range:"), range_entry, range_set },
+ {N_("Range, _LOWEST thru value"), simple_entry, lo_up_set },
+ {N_("Range, value thru _HIGHEST"), simple_entry, hi_down_set},
+ {N_("_All other values"), NULL, else_set }
};
-static void
-set_sensitivity_from_toggle (GtkToggleButton *togglebutton, GtkWidget *w)
-{
- gboolean active = gtk_toggle_button_get_active (togglebutton);
-
- gtk_widget_set_sensitive (w, active);
-}
-
static void
psppire_val_chooser_init (PsppireValChooser *vr)
{
for (i = 0; i < n_VAL_CHOOSER_BUTTONS; ++i)
{
struct layout *l = &range_opt[i];
- GtkWidget *label = gtk_label_new (gettext (l->label));
+ vr->rw[i].label = GTK_LABEL (gtk_label_new (gettext (l->label)));
+ gtk_label_set_use_underline (vr->rw[i].label, TRUE);
vr->rw[i].rb = GTK_TOGGLE_BUTTON (gtk_radio_button_new (group));
+ gtk_label_set_mnemonic_widget (vr->rw[i].label, GTK_WIDGET (vr->rw[i].rb));
- gtk_widget_set_sensitive (label, FALSE);
- g_signal_connect (vr->rw[i].rb, "toggled", G_CALLBACK (set_sensitivity_from_toggle), label);
-
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (vr->rw[i].label), 0, 0.5);
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (vr->rw[i].rb));
- gtk_table_attach_defaults (GTK_TABLE (table), GTK_WIDGET (vr->rw[i].rb), 0, 1,
- row, row + 1);
-
-
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2,
- row, row + 1);
+ /* Attach the buttons */
+ gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (vr->rw[i].rb),
+ 0, 1, row, row + 1,
+ 0, GTK_EXPAND | GTK_FILL,
+ 0, 0);
+
+ /* Attach the labels */
+ gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (vr->rw[i].label),
+ 1, 2, row, row + 1,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
+ 0, 0);
++row;
if (l->fill)
{
case OV_NUMERIC:
{
- gchar *text = g_strdup_printf ("%g", ov->v.v);
+ gchar *text = g_strdup_printf ("%.*g", DBL_DIG + 1, ov->v.v);
g_value_set_string (dest, text);
g_free (text);
}
g_unichar_to_utf8 (0x2013, en_dash);
- text = g_strdup_printf ("%g %s %g",
- ov->v.range[0],
- en_dash,
- ov->v.range[1]);
+ text = g_strdup_printf ("%.*g %s %.*g",
+ DBL_DIG + 1, ov->v.range[0],
+ en_dash,
+ DBL_DIG + 1, ov->v.range[1]);
g_value_set_string (dest, text);
g_free (text);
}
g_unichar_to_utf8 (0x2013, en_dash);
- text = g_strdup_printf ("LOWEST %s %g",
+ text = g_strdup_printf ("LOWEST %s %.*g",
en_dash,
- ov->v.range[1]);
+ DBL_DIG + 1, ov->v.range[1]);
g_value_set_string (dest, text);
g_free (text);
g_unichar_to_utf8 (0x2013, en_dash);
- text = g_strdup_printf ("%g %s HIGHEST",
- ov->v.range[0],
+ text = g_strdup_printf ("%.*g %s HIGHEST",
+ DBL_DIG + 1, ov->v.range[0],
en_dash);
g_value_set_string (dest, text);
/* Generate a syntax fragment for NV and append it to STR */
void
-old_value_append_syntax (GString *str, const struct old_value *ov)
+old_value_append_syntax (struct string *str, const struct old_value *ov)
{
switch (ov->type)
{
case OV_NUMERIC:
- g_string_append_printf (str, "%g", ov->v.v);
+ ds_put_c_format (str, "%.*g", DBL_DIG + 1, ov->v.v);
break;
case OV_STRING:
{
struct string ds = DS_EMPTY_INITIALIZER;
syntax_gen_string (&ds, ss_cstr (ov->v.s));
- g_string_append (str, ds_cstr (&ds));
+ ds_put_cstr (str, ds_cstr (&ds));
ds_destroy (&ds);
}
break;
case OV_MISSING:
- g_string_append (str, "MISSING");
+ ds_put_cstr (str, "MISSING");
break;
case OV_SYSMIS:
- g_string_append (str, "SYSMIS");
+ ds_put_cstr (str, "SYSMIS");
break;
case OV_ELSE:
- g_string_append (str, "ELSE");
+ ds_put_cstr (str, "ELSE");
break;
case OV_RANGE:
- g_string_append_printf (str, "%g THRU %g",
- ov->v.range[0],
- ov->v.range[1]);
+ ds_put_c_format (str, "%.*g THRU %.*g",
+ DBL_DIG + 1, ov->v.range[0],
+ DBL_DIG + 1, ov->v.range[1]);
break;
case OV_LOW_UP:
- g_string_append_printf (str, "LOWEST THRU %g",
- ov->v.range[1]);
+ ds_put_c_format (str, "LOWEST THRU %*gg",
+ DBL_DIG + 1, ov->v.range[1]);
break;
case OV_HIGH_DOWN:
- g_string_append_printf (str, "%g THRU HIGHEST",
- ov->v.range[0]);
+ ds_put_c_format (str, "%.*g THRU HIGHEST",
+ DBL_DIG + 1, ov->v.range[0]);
break;
default:
g_warning ("Invalid type in old recode value");
- g_string_append (str, "???");
+ ds_put_cstr (str, "???");
break;
};
}
static gchar *
num_to_string (gdouble x)
{
- return g_strdup_printf ("%g", x);
+ return g_strdup_printf ("%.*g", DBL_DIG + 1, x);
}
break;
case OV_SYSMIS:
- gtk_toggle_button_set_active (vr->rw[1].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_SYSMIS].rb, TRUE);
break;
case OV_MISSING:
- gtk_toggle_button_set_active (vr->rw[2].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_MISSING].rb, TRUE);
break;
case OV_RANGE:
{
gchar *str = num_to_string (ov->v.range[0]);
- gtk_toggle_button_set_active (vr->rw[3].rb, TRUE);
- gtk_entry_set_text (vr->rw[3].e1, str);
+ gtk_toggle_button_set_active (vr->rw[VC_RANGE].rb, TRUE);
+ gtk_entry_set_text (vr->rw[VC_RANGE].e1, str);
g_free (str);
str = num_to_string (ov->v.range[1]);
- gtk_entry_set_text (vr->rw[3].e2, str);
+ gtk_entry_set_text (vr->rw[VC_RANGE].e2, str);
g_free (str);
}
break;
{
gchar *str = num_to_string (ov->v.range[1]);
- gtk_toggle_button_set_active (vr->rw[4].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_LOW_UP].rb, TRUE);
- gtk_entry_set_text (vr->rw[4].e1, str);
+ gtk_entry_set_text (vr->rw[VC_LOW_UP].e1, str);
g_free (str);
}
{
gchar *str = num_to_string (ov->v.range[0]);
- gtk_toggle_button_set_active (vr->rw[5].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_HIGH_DOWN].rb, TRUE);
- gtk_entry_set_text (vr->rw[5].e1, str);
+ gtk_entry_set_text (vr->rw[VC_HIGH_DOWN].e1, str);
g_free (str);
}
break;
case OV_ELSE:
- gtk_toggle_button_set_active (vr->rw[6].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_ELSE].rb, TRUE);
break;
default:
projects / pspp / blobdiff