Whitespace changes only.

[pspp] / src / ui / gui / psppire-val-chooser.c

diff --git a/src/ui/gui/psppire-val-chooser.c b/src/ui/gui/psppire-val-chooser.c
index de48ba37f4ead835d8280233f835388ae646dc7d..09c0ec35d044e3a3dbd56b46b43931ada560707d 100644 (file)
--- a/src/ui/gui/psppire-val-chooser.c
+++ b/src/ui/gui/psppire-val-chooser.c
@@ -83,7 +83,7 @@ enum
 };
 
 
-enum 
+enum
   {
     VC_VALUE,
     VC_SYSMIS,
@@ -116,7 +116,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:
@@ -237,7 +237,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 +252,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 +261,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 +289,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 (FALSE, 3);
+  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 +304,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 +329,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 +344,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 +363,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 +391,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,10 +403,9 @@ 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_container_add (GTK_CONTAINER (vr), grid);
 
-  gtk_widget_show_all (aln);
+  gtk_widget_show_all (grid);
 }
 
 
@@ -429,7 +441,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 +539,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,
@@ -598,13 +610,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 +633,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 +651,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);
       }