X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-val-chooser.c;h=72ffac51119d88ae3f1943152bf0cfb36b940b45;hb=c06a38e1f023afb46a9641f4696e9e22080aa29f;hp=c2c273542cbb7c7872dd3b67f92027d01cc30782;hpb=14f4522a17db23e67a6fa17876633cc6260cb42b;p=pspp diff --git a/src/ui/gui/psppire-val-chooser.c b/src/ui/gui/psppire-val-chooser.c index c2c273542c..72ffac5111 100644 --- a/src/ui/gui/psppire-val-chooser.c +++ b/src/ui/gui/psppire-val-chooser.c @@ -30,43 +30,12 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid -static void psppire_val_chooser_base_finalize (PsppireValChooserClass *, gpointer); -static void psppire_val_chooser_base_init (PsppireValChooserClass *class); static void psppire_val_chooser_class_init (PsppireValChooserClass *class); static void psppire_val_chooser_init (PsppireValChooser *vc); static void psppire_val_chooser_realize (GtkWidget *w); - - -GType -psppire_val_chooser_get_type (void) -{ - static GType psppire_val_chooser_type = 0; - - if (!psppire_val_chooser_type) - { - static const GTypeInfo psppire_val_chooser_info = - { - sizeof (PsppireValChooserClass), - (GBaseInitFunc) psppire_val_chooser_base_init, - (GBaseFinalizeFunc) psppire_val_chooser_base_finalize, - (GClassInitFunc)psppire_val_chooser_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireValChooser), - 0, - (GInstanceInitFunc) psppire_val_chooser_init, - }; - - psppire_val_chooser_type = - g_type_register_static (GTK_TYPE_FRAME, "PsppireValChooser", - &psppire_val_chooser_info, 0); - } - - return psppire_val_chooser_type; -} - +G_DEFINE_TYPE (PsppireValChooser, psppire_val_chooser, GTK_TYPE_FRAME) static void psppire_val_chooser_finalize (GObject *object) @@ -83,7 +52,7 @@ enum }; -enum +enum { VC_VALUE, VC_SYSMIS, @@ -116,7 +85,7 @@ psppire_val_chooser_set_property (GObject *object, 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_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: @@ -145,6 +114,7 @@ psppire_val_chooser_get_property (GObject *object, break; case PROP_IS_STRING: g_value_set_boolean (value, vr->input_var_is_string); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -158,6 +128,8 @@ static void psppire_val_chooser_class_init (PsppireValChooserClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); + + object_class->finalize = psppire_val_chooser_finalize; GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); GParamSpec *is_string_spec = @@ -192,24 +164,6 @@ psppire_val_chooser_class_init (PsppireValChooserClass *class) } -static void -psppire_val_chooser_base_init (PsppireValChooserClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - - object_class->finalize = psppire_val_chooser_finalize; -} - - - -static void -psppire_val_chooser_base_finalize (PsppireValChooserClass *class, - gpointer class_data) -{ - -} - - /* Set the focus of B to follow the sensitivity of A */ static void focus_follows_sensitivity (GtkWidget *a, GParamSpec *pspec, GtkWidget *b) @@ -237,7 +191,7 @@ static void simple_set (PsppireValChooser *vr, struct old_value *ov, const struc { const gchar *text = gtk_entry_get_text (rw->e1); - if ( vr->input_var_is_string) + if (vr->input_var_is_string) { ov->type = OV_STRING; ov->v.s = g_strdup (text); @@ -252,7 +206,7 @@ static void simple_set (PsppireValChooser *vr, struct old_value *ov, const struc static void lo_up_set (PsppireValChooser *vr, struct old_value *ov, const struct range_widgets *rw) { const gchar *text = gtk_entry_get_text (rw->e1); - + ov->type = OV_LOW_UP; ov->v.range[1] = g_strtod (text, 0); } @@ -261,7 +215,7 @@ static void lo_up_set (PsppireValChooser *vr, struct old_value *ov, const struct static void hi_down_set (PsppireValChooser *vr, struct old_value *ov, const struct range_widgets *rw) { const gchar *text = gtk_entry_get_text (rw->e1); - + ov->type = OV_HIGH_DOWN; ov->v.range[0] = g_strtod (text, 0); } @@ -289,14 +243,14 @@ static void range_set (PsppireValChooser *vr, struct old_value *ov, const struct ov->type = OV_RANGE; ov->v.range[0] = g_strtod (text, 0); - + text = gtk_entry_get_text (rw->e2); ov->v.range[1] = g_strtod (text, 0); } static GtkWidget * range_entry (struct layout *l, struct range_widgets *rw) { - GtkWidget *vbox = gtk_vbox_new (3, FALSE); + GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); GtkWidget *entrylo = gtk_entry_new (); GtkWidget *label = gtk_label_new (_("through")); GtkWidget *entryhi = gtk_entry_new (); @@ -304,7 +258,11 @@ static GtkWidget * range_entry (struct layout *l, struct range_widgets *rw) rw->e1 = GTK_ENTRY (entrylo); rw->e2 = GTK_ENTRY (entryhi); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + g_object_set (G_OBJECT (label), + "valign", GTK_ALIGN_CENTER, + "halign", GTK_ALIGN_START, + NULL); + g_signal_connect (vbox, "notify::sensitive", G_CALLBACK (focus_follows_sensitivity), entrylo); @@ -325,7 +283,7 @@ static GtkWidget * simple_entry (struct layout *l, struct range_widgets *rw) } -static struct layout range_opt[n_VAL_CHOOSER_BUTTONS]= +static struct layout range_opt[n_VAL_CHOOSER_BUTTONS]= { {N_("_Value:"), simple_entry, simple_set }, {N_("_System Missing"), NULL, sysmis_set }, @@ -340,12 +298,14 @@ static void psppire_val_chooser_init (PsppireValChooser *vr) { gint i; - GtkWidget *aln = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - GtkWidget *table = gtk_table_new (11, 2, FALSE); + GtkWidget *grid = gtk_grid_new (); GSList *group = NULL; gint row = 0; - gtk_alignment_set_padding (GTK_ALIGNMENT (aln), 0, 0, 5, 5); + g_object_set (G_OBJECT (grid), + "margin-start", 5, + "margin-end", 5, + NULL); vr->input_var_is_string = FALSE; @@ -357,21 +317,26 @@ psppire_val_chooser_init (PsppireValChooser *vr) 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_misc_set_alignment (GTK_MISC (vr->rw[i].label), 0, 0.5); + g_object_set (G_OBJECT (vr->rw[i].label), + "valign", GTK_ALIGN_CENTER, + "halign", GTK_ALIGN_START, + NULL); group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (vr->rw[i].rb)); /* 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); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (vr->rw[i].rb), + 0, row, 1, 1); + + gtk_widget_set_hexpand (GTK_WIDGET (vr->rw[i].rb), FALSE); /* 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); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (vr->rw[i].label), + 1, row, 1, 1); + + gtk_widget_set_hexpand (GTK_WIDGET (vr->rw[i].label), TRUE); + + ++row; if (l->fill) @@ -380,8 +345,10 @@ psppire_val_chooser_init (PsppireValChooser *vr) gtk_widget_set_sensitive (fill, FALSE); - gtk_table_attach_defaults (GTK_TABLE (table), fill, 1, 2, - row, row + 1); + gtk_grid_attach (GTK_GRID (grid), fill, 1, row, 1, 1); + + gtk_widget_set_hexpand (fill, TRUE); + ++row; g_signal_connect (vr->rw[i].rb, "toggled", G_CALLBACK (set_sensitivity_from_toggle), fill); @@ -390,21 +357,11 @@ psppire_val_chooser_init (PsppireValChooser *vr) gtk_frame_set_shadow_type (GTK_FRAME (vr), GTK_SHADOW_ETCHED_IN); - gtk_container_add (GTK_CONTAINER (aln), table); - gtk_container_add (GTK_CONTAINER (vr), aln); - - gtk_widget_show_all (aln); -} - + gtk_container_add (GTK_CONTAINER (vr), grid); -GtkWidget* -psppire_val_chooser_new (void) -{ - return GTK_WIDGET (g_object_new (psppire_val_chooser_get_type (), NULL)); + gtk_widget_show_all (grid); } - - static void psppire_val_chooser_realize (GtkWidget *w) { @@ -429,7 +386,7 @@ old_value_copy (struct old_value *ov) { struct old_value *copy = g_memdup (ov, sizeof (*copy)); - if ( ov->type == OV_STRING ) + if (ov->type == OV_STRING) copy->v.s = g_strdup (ov->v.s); return copy; @@ -527,7 +484,7 @@ old_value_get_type (void) { static GType t = 0; - if (t == 0 ) + if (t == 0) { t = g_boxed_type_register_static ("psppire-recode-old-values", (GBoxedCopyFunc) old_value_copy, @@ -574,7 +531,7 @@ old_value_append_syntax (struct string *str, const struct old_value *ov) DBL_DIG + 1, ov->v.range[1]); break; case OV_LOW_UP: - ds_put_c_format (str, "LOWEST THRU %*gg", + ds_put_c_format (str, "LOWEST THRU %.*g", DBL_DIG + 1, ov->v.range[1]); break; case OV_HIGH_DOWN: @@ -598,13 +555,12 @@ psppire_val_chooser_get_status (PsppireValChooser *vr, struct old_value *ov) for (i = 0; i < n_VAL_CHOOSER_BUTTONS; ++i) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (vr->rw[i].rb))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (vr->rw[i].rb))) { + range_opt[i].set (vr, ov, &vr->rw[i]); break; } } - - range_opt[i].set (vr, ov, &vr->rw[i]); } /* This might need to be changed to something less naive. @@ -622,7 +578,7 @@ void psppire_val_chooser_set_status (PsppireValChooser *vr, const struct old_value *ov) { gint i; - if ( !ov ) + if (!ov) return; for (i = 0; i < n_VAL_CHOOSER_BUTTONS; ++i) @@ -640,14 +596,14 @@ psppire_val_chooser_set_status (PsppireValChooser *vr, const struct old_value *o gtk_toggle_button_set_active (vr->rw[0].rb, TRUE); gtk_entry_set_text (vr->rw[0].e1, ov->v.s); break; - + case OV_NUMERIC: { gchar *str; gtk_toggle_button_set_active (vr->rw[0].rb, TRUE); - + str = num_to_string (ov->v.v); - + gtk_entry_set_text (vr->rw[0].e1, str); g_free (str); }