Commit 4df9a1d5 authored by Michael Natterer's avatar Michael Natterer 😴

Get rid of gtk_misc_set_alignment(label) and use gtk_label_set_x,yalign()

parent d78d4ce8
......@@ -202,7 +202,7 @@ convert_precision_dialog_new (GimpImage *image,
gtk_widget_show (hbox);
label = gtk_label_new_with_mnemonic (_("_Layers:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_size_group_add_widget (size_group, label);
gtk_widget_show (label);
......@@ -224,7 +224,7 @@ convert_precision_dialog_new (GimpImage *image,
gtk_widget_show (hbox);
label = gtk_label_new_with_mnemonic (_("_Text Layers:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_size_group_add_widget (size_group, label);
gtk_widget_show (label);
......@@ -250,7 +250,7 @@ convert_precision_dialog_new (GimpImage *image,
gtk_widget_show (hbox);
label = gtk_label_new_with_mnemonic (_("_Channels and Masks:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_size_group_add_widget (size_group, label);
gtk_widget_show (label);
......
......@@ -110,7 +110,7 @@ file_open_location_dialog_new (Gimp *gimp)
gtk_widget_show (vbox);
label = gtk_label_new (_("Enter location (URI):"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -651,7 +651,7 @@ file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog,
g_free (markup);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (GIMP_MESSAGE_DIALOG (dialog)->box), label,
FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -140,13 +140,13 @@ layer_options_dialog_new (GimpImage *image,
/* The size labels */
label = gtk_label_new (_("Width:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Height:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
......
......@@ -210,7 +210,7 @@ module_dialog_new (Gimp *gimp)
gtk_widget_show (image);
dialog->error_label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (dialog->error_label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (dialog->error_label), 0.0);
gtk_box_pack_start (GTK_BOX (dialog->error_box),
dialog->error_label, TRUE, TRUE, 0);
gtk_widget_show (dialog->error_label);
......@@ -506,13 +506,13 @@ dialog_info_init (ModuleDialog *dialog,
for (i = 0; i < G_N_ELEMENTS (text); i++)
{
label = gtk_label_new (gettext (text[i]));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 2);
gtk_widget_show (label);
dialog->label[i] = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (dialog->label[i]), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (dialog->label[i]), 0.0);
gtk_label_set_ellipsize (GTK_LABEL (dialog->label[i]),
PANGO_ELLIPSIZE_END);
gtk_table_attach (GTK_TABLE (dialog->table), dialog->label[i],
......
......@@ -825,7 +825,7 @@ prefs_hint_box_new (const gchar *icon_name,
PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
-1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
......
......@@ -167,14 +167,14 @@ print_size_dialog_new (GimpImage *image,
private->size_entry = GIMP_SIZE_ENTRY (entry);
label = gtk_label_new_with_mnemonic (_("_Width:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), width);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
label = gtk_label_new_with_mnemonic (_("H_eight:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), height);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
......@@ -228,14 +228,14 @@ print_size_dialog_new (GimpImage *image,
gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH);
label = gtk_label_new_with_mnemonic (_("_X resolution:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), width);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
label = gtk_label_new_with_mnemonic (_("_Y resolution:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), height);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
......
......@@ -214,14 +214,14 @@ quit_close_all_dialog_new (Gimp *gimp,
else
dialog->lost_label = gtk_label_new (_("If you close these images now, "
"changes will be lost."));
gtk_misc_set_alignment (GTK_MISC (dialog->lost_label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (dialog->lost_label), 0.0);
gtk_label_set_line_wrap (GTK_LABEL (dialog->lost_label), TRUE);
gtk_box_pack_start (GTK_BOX (dialog->box), dialog->lost_label,
FALSE, FALSE, 0);
gtk_widget_show (dialog->lost_label);
dialog->hint_label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (dialog->hint_label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (dialog->hint_label), 0.0);
gtk_label_set_line_wrap (GTK_LABEL (dialog->hint_label), TRUE);
gtk_box_pack_start (GTK_BOX (dialog->box), dialog->hint_label,
FALSE, FALSE, 0);
......
......@@ -128,7 +128,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
label =
gtk_label_new (_("Measure the rulers and enter their lengths:"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gimp_label_set_attributes (GTK_LABEL (label),
PANGO_ATTR_SCALE, PANGO_SCALE_LARGE,
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
......
......@@ -191,7 +191,7 @@ tips_dialog_create (Gimp *gimp)
gtk_label_set_selectable (GTK_LABEL (tip_label), TRUE);
gtk_label_set_justify (GTK_LABEL (tip_label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (tip_label), TRUE);
gtk_misc_set_alignment (GTK_MISC (tip_label), 0.5, 0.0);
gtk_label_set_yalign (GTK_LABEL (tip_label), 0.0);
gtk_box_pack_start (GTK_BOX (vbox), tip_label, TRUE, TRUE, 0);
gtk_widget_show (tip_label);
......
......@@ -215,13 +215,13 @@ gimp_cursor_view_init (GimpCursorView *view)
gtk_widget_show (table);
view->priv->pixel_x_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->pixel_x_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->pixel_x_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X"), 0.5, 0.5,
view->priv->pixel_x_label, 1, FALSE);
view->priv->pixel_y_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->pixel_y_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->pixel_y_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y"), 0.5, 0.5,
view->priv->pixel_y_label, 1, FALSE);
......@@ -240,13 +240,13 @@ gimp_cursor_view_init (GimpCursorView *view)
gtk_widget_show (table);
view->priv->unit_x_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->unit_x_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->unit_x_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X"), 0.5, 0.5,
view->priv->unit_x_label, 1, FALSE);
view->priv->unit_y_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->unit_y_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->unit_y_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y"), 0.5, 0.5,
view->priv->unit_y_label, 1, FALSE);
......@@ -265,13 +265,13 @@ gimp_cursor_view_init (GimpCursorView *view)
gtk_widget_show (table);
view->priv->selection_x_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->selection_x_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->selection_x_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X"), 0.5, 0.5,
view->priv->selection_x_label, 1, FALSE);
view->priv->selection_y_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->selection_y_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->selection_y_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y"), 0.5, 0.5,
view->priv->selection_y_label, 1, FALSE);
......@@ -287,14 +287,14 @@ gimp_cursor_view_init (GimpCursorView *view)
gtk_widget_show (table);
view->priv->selection_width_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->selection_width_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->selection_width_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
/* Width */
_("W"), 0.5, 0.5,
view->priv->selection_width_label, 1, FALSE);
view->priv->selection_height_label = gtk_label_new (_("n/a"));
gtk_misc_set_alignment (GTK_MISC (view->priv->selection_height_label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (view->priv->selection_height_label), 1.0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
/* Height */
_("H"), 0.5, 0.5,
......
......@@ -218,7 +218,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
markup = g_strdup_printf ("<i><small>%s</small></i>", hint);
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_markup (GTK_LABEL (label), markup);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
......
......@@ -213,7 +213,6 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
statusbar);
statusbar->cursor_label = gtk_label_new ("8888, 8888");
gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), statusbar->cursor_label, FALSE, FALSE, 0);
gtk_widget_show (statusbar->cursor_label);
......
......@@ -159,7 +159,7 @@ create_levels_scale (GObject *config,
GtkWidget *scale;
label = gtk_label_new (left);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, col, col + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
......@@ -172,7 +172,7 @@ create_levels_scale (GObject *config,
gtk_widget_show (scale);
label = gtk_label_new (right);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, col, col + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
......
......@@ -411,7 +411,7 @@ gimp_gegl_tool_dialog (GimpFilterTool *filter_tool)
tool->description_label = gtk_label_new ("");
gtk_label_set_line_wrap (GTK_LABEL (tool->description_label), TRUE);
gtk_misc_set_alignment (GTK_MISC (tool->description_label), 0.0, 0.0);
gtk_label_set_xalign (GTK_LABEL (tool->description_label), 0.0);
gtk_box_pack_start (GTK_BOX (main_vbox), tool->description_label,
FALSE, FALSE, 0);
gtk_box_reorder_child (GTK_BOX (main_vbox), tool->description_label, 1);
......
......@@ -439,7 +439,7 @@ gimp_handle_transform_tool_dialog (GimpTransformTool *tr_tool)
{
GtkWidget *label = gtk_label_new (" ");
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_label_set_width_chars (GTK_LABEL (label), 12);
gtk_table_attach (GTK_TABLE (table), label,
x, x + 1, y, y + 1, GTK_EXPAND, GTK_FILL, 0, 0);
......
......@@ -1081,113 +1081,113 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
label = gtk_label_new (_("Distance:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
gtk_widget_show (label);
measure->distance_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
gtk_widget_show (label);
label = gtk_label_new (_("pixels"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
gtk_widget_show (label);
measure->distance_label[1] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 0, 1);
gtk_widget_show (label);
measure->unit_label[0] = label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
gtk_widget_show (label);
label = gtk_label_new (_("Angle:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
gtk_widget_show (label);
measure->angle_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2);
gtk_widget_show (label);
label = gtk_label_new ("\302\260");
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2);
gtk_widget_show (label);
measure->angle_label[1] = label = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 1, 2);
gtk_widget_show (label);
measure->unit_label[1] = label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 1, 2);
gtk_widget_show (label);
label = gtk_label_new (_("Width:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
gtk_widget_show (label);
measure->width_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3);
gtk_widget_show (label);
label = gtk_label_new (_("pixels"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
gtk_widget_show (label);
measure->width_label[1] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 2, 3);
gtk_widget_show (label);
measure->unit_label[2] = label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 2, 3);
gtk_widget_show (label);
label = gtk_label_new (_("Height:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
gtk_widget_show (label);
measure->height_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 3, 4);
gtk_widget_show (label);
label = gtk_label_new (_("pixels"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
gtk_widget_show (label);
measure->height_label[1] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
gtk_widget_show (label);
measure->unit_label[3] = label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 3, 4);
gtk_widget_show (label);
......
......@@ -144,7 +144,7 @@ gimp_perspective_tool_dialog (GimpTransformTool *tr_tool)
{
GtkWidget *label = gtk_label_new (" ");
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_label_set_width_chars (GTK_LABEL (label), 12);
gtk_table_attach (GTK_TABLE (table), label,
x, x + 1, y, y + 1, GTK_EXPAND, GTK_FILL, 0, 0);
......
......@@ -1551,7 +1551,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
"\n\n"
"You can edit the layer or create a new "
"text layer from its text attributes."));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -781,7 +781,7 @@ gimp_unified_transform_tool_dialog (GimpTransformTool *tr_tool)
{
GtkWidget *label = gtk_label_new (" ");
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_label_set_width_chars (GTK_LABEL (label), 12);
gtk_table_attach (GTK_TABLE (table), label,
x, x + 1, y, y + 1, GTK_EXPAND, GTK_FILL, 0, 0);
......
......@@ -169,7 +169,7 @@ gimp_buffer_source_box_constructed (GObject *object)
gtk_widget_show (box->priv->button);
box->priv->label = gtk_label_new (_("(none)"));
gtk_misc_set_alignment (GTK_MISC (box->priv->label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (box->priv->label), 0.0);
gtk_label_set_ellipsize (GTK_LABEL (box->priv->label), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (box), box->priv->label, TRUE, TRUE, 0);
gtk_widget_show (box->priv->label);
......
......@@ -159,14 +159,14 @@ gimp_color_frame_init (GimpColorFrame *frame)
gtk_widget_show (hbox);
frame->name_labels[i] = gtk_label_new (" ");
gtk_misc_set_alignment (GTK_MISC (frame->name_labels[i]), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (frame->name_labels[i]), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), frame->name_labels[i],
FALSE, FALSE, 0);
gtk_widget_show (frame->name_labels[i]);
frame->value_labels[i] = gtk_label_new (" ");
gtk_label_set_selectable (GTK_LABEL (frame->value_labels[i]), TRUE);
gtk_misc_set_alignment (GTK_MISC (frame->value_labels[i]), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (frame->value_labels[i]), 1.0);
gtk_box_pack_end (GTK_BOX (hbox), frame->value_labels[i],
FALSE, FALSE, 0);
gtk_widget_show (frame->value_labels[i]);
......
......@@ -186,7 +186,7 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
gtk_widget_show (hbox);
private->label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (private->label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (private->label), 0.0);
gtk_label_set_ellipsize (GTK_LABEL (private->label), PANGO_ELLIPSIZE_END);
gimp_label_set_attributes (GTK_LABEL (private->label),
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
......
......@@ -274,7 +274,7 @@ gimp_device_status_device_add (GimpContainer *devices,
gimp_label_set_attributes (GTK_LABEL (label),
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
-1);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -169,7 +169,7 @@ gimp_dynamics_editor_constructed (GObject *object)
for (i = 0; i < n_inputs; i++)
{
gtk_label_set_angle (GTK_LABEL (input_labels[i]), 90);
gtk_misc_set_alignment (GTK_MISC (input_labels[i]), 0.5, 1.0);
gtk_label_set_yalign (GTK_LABEL (input_labels[i]), 1.0);
gtk_table_attach (GTK_TABLE (table), input_labels[i],
i + 1, i + 2, 0, 1,
......@@ -335,7 +335,7 @@ gimp_dynamics_editor_add_output_row (GObject *config,
gint column = 1;
label = gtk_label_new (row_label);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
......
......@@ -171,7 +171,7 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
PANGO_ATTR_SCALE, PANGO_SCALE_SMALL,
-1);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_table_attach (GTK_TABLE (table), label, x, x + 1, y, y + 1,
GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
gtk_widget_show (label);
......
......@@ -717,7 +717,7 @@ gimp_item_tree_view_add_options (GimpItemTreeView *view,
}
label_widget = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label_widget), 0.0);
gtk_size_group_add_widget (view->priv->options_group, label_widget);
gtk_box_pack_start (GTK_BOX (hbox), label_widget, FALSE, FALSE, 0);
gtk_widget_show (label_widget);
......
......@@ -452,7 +452,7 @@ gimp_message_box_repeat (GimpMessageBox *box)
{
GtkWidget *label = box->label[2] = gtk_label_new (message);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gimp_label_set_attributes (GTK_LABEL (label),
PANGO_ATTR_STYLE, PANGO_STYLE_OBLIQUE,
-1);
......
......@@ -177,7 +177,7 @@ gimp_pickable_popup_constructed (GObject *object)
gtk_widget_show (vbox);
label = gtk_label_new (_("Images"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -204,7 +204,7 @@ gimp_pickable_popup_constructed (GObject *object)
popup->priv->layer_label = label =
gtk_label_new (_("Select an image in the left pane"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -165,7 +165,7 @@ gimp_prefs_box_init (GimpPrefsBox *box)
gtk_widget_show (hbox);
private->label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (private->label), 0.0, 0.5);
gtk_label_set_xalign (GTK_LABEL (private->label), 0.0);
gimp_label_set_attributes (GTK_LABEL (private->label),
PANGO_ATTR_SCALE, PANGO_SCALE_LARGE,
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
......
......@@ -84,7 +84,7 @@ gimp_progress_box_init (GimpProgressBox *box)