Convert gtk_misc_set_alignment to gtk_label_set_(x|y)align

This commit is contained in:
Paul Dicker
2025-04-07 11:45:46 +02:00
committed by Stéphane Lesimple
parent 222429df10
commit 93be13b0ee
14 changed files with 348 additions and 181 deletions

View File

@@ -59,7 +59,8 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent)
RS02Widgets *wl = method->widgetList;
wl->encHeadline = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->encHeadline), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(wl->encHeadline), 0.0);
gtk_label_set_yalign(GTK_LABEL(wl->encHeadline), 0.0);
gtk_misc_set_padding(GTK_MISC(wl->encHeadline), 5, 0);
gtk_box_pack_start(GTK_BOX(parent), wl->encHeadline, FALSE, FALSE, 3);
@@ -74,7 +75,8 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent)
wl->encLabel1 = wid = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(wid),_utf("<b>1. Preparing image:</b>"));
gtk_misc_set_alignment(GTK_MISC(wid), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(wid), 0.0);
gtk_label_set_yalign(GTK_LABEL(wid), 0.0);
gtk_table_attach(GTK_TABLE(table), wid, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 20, 20);
pbar = wl->encPBar1 = gtk_progress_bar_new();
@@ -83,19 +85,20 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent)
wl->encLabel2 = wid = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(wid),
_utf("<b>2. Creating error correction data:</b>"));
gtk_misc_set_alignment(GTK_MISC(wid), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(wid), 0.0);
gtk_label_set_yalign(GTK_LABEL(wid), 0.0);
gtk_table_attach(GTK_TABLE(table), wid, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 20, 20);
pbar = wl->encPBar2 = gtk_progress_bar_new();
gtk_table_attach(GTK_TABLE(table), pbar, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 20, 20);
wl->encFootline = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->encFootline), 0.0, 0.5);
gtk_label_set_xalign(GTK_LABEL(wl->encFootline), 0.0);
gtk_misc_set_padding(GTK_MISC(wl->encFootline), 20, 0);
gtk_box_pack_start(GTK_BOX(parent), wl->encFootline, FALSE, FALSE, 3);
wl->encFootline2 = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->encFootline2), 0.0, 0.5);
gtk_label_set_xalign(GTK_LABEL(wl->encFootline2), 0.0);
gtk_misc_set_padding(GTK_MISC(wl->encFootline2), 20, 0);
gtk_box_pack_start(GTK_BOX(parent), wl->encFootline2, FALSE, FALSE, 3);
}
@@ -259,7 +262,8 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent)
else wl = method->widgetList;
wl->fixHeadline = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->fixHeadline), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(wl->fixHeadline), 0.0);
gtk_label_set_yalign(GTK_LABEL(wl->fixHeadline), 0.0);
gtk_misc_set_padding(GTK_MISC(wl->fixHeadline), 5, 0);
gtk_box_pack_start(GTK_BOX(parent), wl->fixHeadline, FALSE, FALSE, 3);
@@ -282,22 +286,24 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent)
gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
wl->fixCorrected = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->fixCorrected), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(wl->fixCorrected), 0.0);
gtk_label_set_yalign(GTK_LABEL(wl->fixCorrected), 0.0);
gtk_box_pack_start(GTK_BOX(hbox), wl->fixCorrected, TRUE, TRUE, 0);
wl->fixProgress = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->fixProgress), 0.5, 0.0);
gtk_label_set_yalign(GTK_LABEL(wl->fixProgress), 0.0);
gtk_box_pack_start(GTK_BOX(hbox), wl->fixProgress, TRUE, TRUE, 0);
wl->fixUncorrected = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(wl->fixUncorrected), 1.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(wl->fixUncorrected), 1.0);
gtk_label_set_yalign(GTK_LABEL(wl->fixUncorrected), 0.0);
gtk_box_pack_start(GTK_BOX(hbox), wl->fixUncorrected, TRUE, TRUE, 0);
ignore = gtk_label_new("progress_tab");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, ignore);
wl->fixFootline = gtk_label_new("Footline");
gtk_misc_set_alignment(GTK_MISC(wl->fixFootline), 0.0, 0.5);
gtk_label_set_xalign(GTK_LABEL(wl->fixFootline), 0.0);
gtk_misc_set_padding(GTK_MISC(wl->fixFootline), 5, 0);
ignore = gtk_label_new("footer_tab");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), wl->fixFootline, ignore);
@@ -778,7 +784,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
table = gtk_table_new(5, 6, FALSE);
gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -789,7 +796,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("CD-R / CD-RW:"), _("CD-R / CD-RW:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -853,7 +861,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("DVD 1 layer:"), _("DVD 1 layer:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -917,7 +926,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("DVD 2 layers:"), _("DVD 2 layers:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -981,7 +991,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("BD 1 layer:"), _("BD 1 layer:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -1044,7 +1055,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("BD 2 layers:"), _("BD 2 layers:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -1107,7 +1119,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("BDXL 3 layers:"), _("BDXL 3 layers:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);
@@ -1172,7 +1185,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
lwoh = GuiCreateLabelWithOnlineHelp(_("BDXL 4 layers:"), _("BDXL 4 layers:"));
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0);
gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0);
tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0);