Replace gtk_alignment in various functions

Gtk_alignment is deprecated and so change various uses to equivalent
x/yalign, x/yexpand and margin functions

src/gnome-utils/gnc-dense-cal.c

@@ -285,15 +285,13 @@ gnc_dense_cal_init(GncDenseCal *dcal)
 
     {
         GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-        GtkAlignment *label_align;
-        GtkLabel *label;
-        float right_align = 1.0, mid_align = 0.5, fill_x = 0.0, fill_y = 1.0;
+        GtkWidget *label = gtk_label_new (_("View:"));
 
         gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
-        label = GTK_LABEL(gtk_label_new(_("View:")));
-        label_align = GTK_ALIGNMENT(gtk_alignment_new(right_align, mid_align, fill_x, fill_y));
-        gtk_container_add(GTK_CONTAINER(label_align), GTK_WIDGET(label));
-        gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label_align), TRUE, TRUE, 0);
+        gtk_widget_set_halign (label, GTK_ALIGN_END);
+        gtk_widget_set_margin_end (label, 5);
+
+        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
         gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(dcal->view_options), FALSE, FALSE, 0);
 
         gtk_box_pack_start(GTK_BOX(dcal), GTK_WIDGET(hbox), FALSE, FALSE, 0);

src/gnome-utils/gnc-gui-query.c

@@ -293,7 +293,6 @@ gnc_choose_radio_option_dialog(GtkWidget *parent,
     GtkWidget *vbox;
     GtkWidget *main_vbox;
     GtkWidget *label;
-    GtkWidget *alignment;
     GtkWidget *radio_button;
     GtkWidget *dialog;
     GtkWidget *dvbox;
@@ -311,21 +310,17 @@ gnc_choose_radio_option_dialog(GtkWidget *parent,
     gtk_box_pack_start(GTK_BOX(main_vbox), label, FALSE, FALSE, 0);
     gtk_widget_show(label);
 
-    alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-    gtk_alignment_set_padding (GTK_ALIGNMENT(alignment), 0, 0, 12, 0);
-    gtk_box_pack_start(GTK_BOX(main_vbox), alignment, FALSE, FALSE, 0);
-    gtk_widget_show(alignment);
-
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
     gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
-    gtk_container_add(GTK_CONTAINER(alignment), vbox);
+    gtk_container_add(GTK_BOX(main_vbox), vbox);
     gtk_widget_show(vbox);
 
     for (node = radio_list, i = 0; node; node = node->next, i++)
     {
         radio_button = gtk_radio_button_new_with_mnemonic(group, node->data);
         group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
+        gtk_widget_set_halign (GTK_WIDGET(radio_button), GTK_ALIGN_START);
 
         if (i == default_value) /* default is first radio button */
         {

src/gnome-utils/gnc-period-select.c

@@ -110,7 +110,6 @@ struct _GncPeriodSelectPrivate
 
     GDate     *date_base;
     GtkWidget *date_label;
-    GtkWidget *date_align;
 };
 
 #define GNC_PERIOD_SELECT_GET_PRIVATE(o)  \
@@ -331,12 +330,14 @@ gnc_period_select_set_date_common (GncPeriodSelect *period, const GDate *date)
                                          g_date_get_year(date));
         if (priv->date_label == NULL)
         {
-            priv->date_align = gtk_alignment_new(0.5, 0.5, 0, 0);
-            gtk_alignment_set_padding(GTK_ALIGNMENT(priv->date_align), 0, 0, 6, 0);
-            gtk_box_pack_start(GTK_BOX(period), priv->date_align, TRUE, TRUE, 0);
             priv->date_label = gtk_label_new("");
-            gtk_container_add(GTK_CONTAINER(priv->date_align), priv->date_label);
-            gtk_widget_show_all(priv->date_align);
+#if GTK_CHECK_VERSION(3,12,0)
+            gtk_widget_set_margin_start (GTK_WIDGET(priv->date_label), 6);
+#else
+            gtk_widget_set_margin_left (GTK_WIDGET(priv->date_label), 6);
+#endif
+            gtk_box_pack_start(GTK_BOX(period), priv->date_label, TRUE, TRUE, 0);
+            gtk_widget_show_all(priv->date_label);
         }
         gnc_period_sample_update_date_label(period);
         return;
@@ -346,8 +347,7 @@ gnc_period_select_set_date_common (GncPeriodSelect *period, const GDate *date)
     {
         g_date_free(priv->date_base);
         priv->date_base = NULL;
-        gtk_widget_destroy(priv->date_align);
-        priv->date_align = NULL;
+        gtk_widget_destroy(priv->date_label);
         priv->date_label = NULL;
     }
 }

src/gnome/dialog-tax-info.c

@@ -1125,7 +1125,6 @@ identity_edit_clicked_cb (GtkButton *button,
     GtkWidget *content_area;
     GtkWidget *name_entry;
     GtkWidget *label;
-    GtkWidget *alignment;
     GtkWidget *table;
     GtkListStore *store;
     GList *types = NULL;
@@ -1152,16 +1151,10 @@ identity_edit_clicked_cb (GtkButton *button,
         gtk_entry_set_text (GTK_ENTRY (name_entry), ti_dialog->tax_name);
     label = gtk_label_new (_("Name"));
     gnc_label_set_alignment (label, 1.00, 0.50);
-    alignment = gtk_alignment_new(1.00, 0.50, 1.00, 0.00);
-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
-    gtk_container_add (GTK_CONTAINER (alignment), label);
     table = gtk_grid_new ();
-    gtk_grid_attach (GTK_GRID(table), alignment, 0, 0, 1, 1);
-
-    alignment = gtk_alignment_new(0.00, 0.50, 1.00, 0.00);
-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
-    gtk_container_add (GTK_CONTAINER (alignment), name_entry);
-    gtk_grid_attach (GTK_GRID(table), alignment, 1, 0, 1, 1);
+    gtk_grid_set_column_spacing (GTK_GRID(table), 12);
+    gtk_grid_attach (GTK_GRID(table), label, 0, 0, 1, 1);
+    gtk_grid_attach (GTK_GRID(table), name_entry, 1, 0, 1, 1);
 
     store = gtk_list_store_new (1, G_TYPE_STRING);
     gtk_list_store_clear(store);
@@ -1193,24 +1186,15 @@ identity_edit_clicked_cb (GtkButton *button,
     }
     label = gtk_label_new (_("Type"));
     gnc_label_set_alignment (label, 1.00, 0.50);
-    alignment = gtk_alignment_new(1.00, 0.50, 1.00, 0.00);
-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
-    gtk_container_add (GTK_CONTAINER (alignment), label);
-    gtk_grid_attach (GTK_GRID(table), alignment, 0, 1, 1, 1);
-
-    alignment = gtk_alignment_new(0.00, 0.50, 1.00, 0.00);
-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
-    gtk_container_add (GTK_CONTAINER (alignment), type_combo);
-    gtk_grid_attach (GTK_GRID(table), alignment, 1, 1, 1, 1);
+    gtk_grid_attach (GTK_GRID(table), label, 0, 1, 1, 1);
+    gtk_grid_attach (GTK_GRID(table), type_combo, 1, 1, 1, 1);
 
     label = gtk_label_new (_("CAUTION: If you set TXF categories, and later change 'Type', you will need to manually reset those categories one at a time"));
     gtk_label_set_max_width_chars (GTK_LABEL (label), 50);
     gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
     gnc_label_set_alignment (label, 0.50, 0.50);
-    alignment = gtk_alignment_new(0.50, 0.50, 1.00, 0.00);
-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 6, 4, 4);
-    gtk_container_add (GTK_CONTAINER (alignment), label);
-    gtk_grid_attach (GTK_GRID(table), alignment, 0, 2, 2, 1);
+    gtk_widget_set_margin_top (GTK_WIDGET(label), 5);
+    gtk_grid_attach (GTK_GRID(table), label, 0, 2, 2, 1);
 
     gtk_container_add (GTK_CONTAINER (content_area), table);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_APPLY);