diff --git a/src/help-dialogs.c b/src/help-dialogs.c index 121d111..cdd9475 100644 --- a/src/help-dialogs.c +++ b/src/help-dialogs.c @@ -268,7 +268,8 @@ void GuiAddHelpParagraph(LabelWithOnlineHelp *lwoh, char *format, ...) g_free(utf); g_free(text); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(lwoh->vbox), label, FALSE, FALSE, 0); /* Work around some bugs in the gtk line wrapper code. @@ -294,7 +295,8 @@ void GuiAddHelpListItem(LabelWithOnlineHelp *lwoh, char *format, ...) gtk_box_pack_start(GTK_BOX(lwoh->vbox), hbox, FALSE, FALSE, 0); - gtk_misc_set_alignment(GTK_MISC(bullet), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(bullet), 0.0); + gtk_label_set_yalign(GTK_LABEL(bullet), 0.0); gtk_box_pack_start(GTK_BOX(hbox), bullet, FALSE, FALSE, 0); va_start(argp, format); @@ -306,7 +308,8 @@ void GuiAddHelpListItem(LabelWithOnlineHelp *lwoh, char *format, ...) g_free(utf); g_free(text); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); /* Work around some bugs in the gtk line wrapper code. @@ -558,7 +561,8 @@ GtkWidget* GuiShowTextfile(char *title, char *explanation, char *file, utf = g_locale_to_utf8(explanation, -1, NULL, NULL, NULL); gtk_label_set_markup(GTK_LABEL(lab), utf); g_free(utf); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_box_pack_start(GTK_BOX(vbox), lab, FALSE, FALSE, 0); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); @@ -637,7 +641,8 @@ void GuiAboutText(GtkWidget *parent, char *format, ...) tmp = g_strdup_vprintf(format, argp); utf_text = g_locale_to_utf8(tmp, -1, NULL, NULL, NULL); gtk_label_set_markup(GTK_LABEL(lab), utf_text); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_box_pack_start(GTK_BOX(parent), lab, FALSE, FALSE, 0); g_free(tmp); diff --git a/src/main-window.c b/src/main-window.c index 401088a..8aec7d1 100644 --- a/src/main-window.c +++ b/src/main-window.c @@ -489,8 +489,9 @@ void GuiCreateMainWindow(int *argc, char ***argv) Closure->status = gtk_label_new(NULL); gtk_label_set_ellipsize(GTK_LABEL(Closure->status), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment(GTK_MISC(Closure->status), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(status_box), GTK_WIDGET(Closure->status), TRUE, TRUE, 5); + gtk_label_set_xalign(GTK_LABEL(Closure->status), 0.0); + gtk_label_set_yalign(GTK_LABEL(Closure->status), 0.0); + gtk_box_pack_start(GTK_BOX(status_box), GTK_WIDGET(Closure->status), TRUE, TRUE, 5); button = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); diff --git a/src/medium-info.c b/src/medium-info.c index c0d30da..2114389 100644 --- a/src/medium-info.c +++ b/src/medium-info.c @@ -345,7 +345,8 @@ void GuiCreateMediumInfoWindow() gtk_label_set_markup(GTK_LABEL(lab), _utf("Medium info\n" "Properties of the currently inserted medium")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_box_pack_start(GTK_BOX(vbox), lab, FALSE, FALSE, 0); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); @@ -405,67 +406,83 @@ void GuiCreateMediumInfoWindow() gtk_container_add(GTK_CONTAINER(frame), table); lab = gtk_label_new(_utf("Medium type:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->physicalType = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Book type:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->bookType = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Manuf.-ID:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->manufID = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Drive profile:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->profileDescr = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Disc status:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->discStatus = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Used sectors:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->usedCapacity1 = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(" "); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->usedCapacity2 = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Blank capacity:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->blankCapacity = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); /*** Filesystem info */ @@ -478,27 +495,33 @@ void GuiCreateMediumInfoWindow() gtk_container_add(GTK_CONTAINER(frame), table); lab = gtk_label_new(_utf("Medium label:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->isoLabel = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("File system size:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->isoSize = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Creation time:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->isoTime = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); /*** Error correction info */ @@ -511,35 +534,43 @@ void GuiCreateMediumInfoWindow() gtk_container_add(GTK_CONTAINER(frame), table); lab = gtk_label_new(_utf("Error correction data:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->eccState = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Augmented image size:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->eccSize = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("dvdisaster version:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->eccVersion = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(_utf("Exhaustive search:")); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = gtk_label_new(" "); mi->exhaustiveSearch = lab; - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); mi->exhaustiveSearchButton = gtk_button_new_with_label(_utf("Run exhaustive search")); g_signal_connect(G_OBJECT(mi->exhaustiveSearchButton), "clicked", G_CALLBACK(es_cb), mi); diff --git a/src/misc-gui.c b/src/misc-gui.c index 66f78a8..fb11467 100644 --- a/src/misc-gui.c +++ b/src/misc-gui.c @@ -582,7 +582,8 @@ void GuiLockLabelSize(GtkWidget *wid, char *format, ...) pango_layout_get_pixel_extents(layout, NULL, &rect); gtk_widget_set_size_request(wid, rect.width, rect.height); - 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); g_free(text); } diff --git a/src/preferences.c b/src/preferences.c index 6370947..490d2fe 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -2150,8 +2150,10 @@ void GuiCreatePreferencesWindow(void) gtk_table_attach(GTK_TABLE(table), tinybox, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_misc_set_alignment(GTK_MISC(lwoh->normalLabel), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0); + gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0); + gtk_label_set_xalign(GTK_LABEL(lwoh->normalLabel), 0.0); + gtk_label_set_yalign(GTK_LABEL(lwoh->normalLabel), 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); @@ -2936,8 +2938,10 @@ void GuiCreatePreferencesWindow(void) gtk_table_attach(GTK_TABLE(table), tinybox, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_misc_set_alignment(GTK_MISC(lwoh->normalLabel), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lwoh->linkLabel), 0.0); + gtk_label_set_yalign(GTK_LABEL(lwoh->linkLabel), 0.0); + gtk_label_set_xalign(GTK_LABEL(lwoh->normalLabel), 0.0); + gtk_label_set_yalign(GTK_LABEL(lwoh->normalLabel), 0.0); gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_MIDDLE); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); diff --git a/src/raw-editor.c b/src/raw-editor.c index f334649..13a82e8 100644 --- a/src/raw-editor.c +++ b/src/raw-editor.c @@ -935,11 +935,13 @@ void GuiCreateRawEditor(void) gtk_box_pack_start(GTK_BOX(outer_box), hbox, FALSE, FALSE, 0); rec->leftLabel = label = gtk_label_new("Reed-Solomon Sudoku"); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); rec->rightLabel = label = gtk_label_new(_("Please load a raw sector file!")); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); diff --git a/src/read-adaptive-window.c b/src/read-adaptive-window.c index 004f1d1..bba5f61 100644 --- a/src/read-adaptive-window.c +++ b/src/read-adaptive-window.c @@ -344,7 +344,8 @@ void GuiCreateAdaptiveReadWindow(GtkWidget *parent) { GtkWidget *sep,*d_area; Closure->readAdaptiveHeadline = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(Closure->readAdaptiveHeadline), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(Closure->readAdaptiveHeadline), 0.0); + gtk_label_set_yalign(GTK_LABEL(Closure->readAdaptiveHeadline), 0.0); gtk_misc_set_padding(GTK_MISC(Closure->readAdaptiveHeadline), 5, 0); gtk_label_set_ellipsize(GTK_LABEL(Closure->readAdaptiveHeadline), PANGO_ELLIPSIZE_END); gtk_box_pack_start(GTK_BOX(parent), Closure->readAdaptiveHeadline, FALSE, FALSE, 3); diff --git a/src/read-linear-window.c b/src/read-linear-window.c index 8f286f0..56f76f6 100644 --- a/src/read-linear-window.c +++ b/src/read-linear-window.c @@ -354,7 +354,8 @@ void GuiCreateLinearReadWindow(GtkWidget *parent) { GtkWidget *sep,*ignore,*curve,*spiral,*notebook,*hbox; Closure->readLinearHeadline = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(Closure->readLinearHeadline), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(Closure->readLinearHeadline), 0.0); + gtk_label_set_yalign(GTK_LABEL(Closure->readLinearHeadline), 0.0); gtk_misc_set_padding(GTK_MISC(Closure->readLinearHeadline), 5, 0); gtk_label_set_ellipsize(GTK_LABEL(Closure->readLinearHeadline), PANGO_ELLIPSIZE_END); gtk_box_pack_start(GTK_BOX(parent), Closure->readLinearHeadline, FALSE, FALSE, 3); @@ -385,18 +386,20 @@ void GuiCreateLinearReadWindow(GtkWidget *parent) hbox = Closure->readLinearFootlineBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); Closure->readLinearSpeed = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(Closure->readLinearSpeed), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(Closure->readLinearSpeed), 0.0); + gtk_label_set_yalign(GTK_LABEL(Closure->readLinearSpeed), 0.0); gtk_box_pack_start(GTK_BOX(hbox), Closure->readLinearSpeed, FALSE, FALSE, 0); Closure->readLinearErrors = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(Closure->readLinearErrors), 1.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(Closure->readLinearErrors), 1.0); + gtk_label_set_yalign(GTK_LABEL(Closure->readLinearErrors), 0.0); gtk_box_pack_start(GTK_BOX(hbox), Closure->readLinearErrors, TRUE, TRUE, 0); ignore = gtk_label_new("progress_tab"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, ignore); Closure->readLinearFootline = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(Closure->readLinearFootline), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(Closure->readLinearFootline), 0.0); gtk_misc_set_padding(GTK_MISC(Closure->readLinearFootline), 5, 0); ignore = gtk_label_new("footer_tab"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), Closure->readLinearFootline, ignore); diff --git a/src/rs01-verify.c b/src/rs01-verify.c index e43820b..eacb5de 100644 --- a/src/rs01-verify.c +++ b/src/rs01-verify.c @@ -177,7 +177,8 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) GtkWidget *sep,*notebook,*table,*table2,*ignore,*lab,*frame,*d_area; wl->cmpHeadline = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(wl->cmpHeadline), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0); + gtk_label_set_yalign(GTK_LABEL(wl->cmpHeadline), 0.0); gtk_misc_set_padding(GTK_MISC(wl->cmpHeadline), 5, 0); gtk_box_pack_start(GTK_BOX(parent), wl->cmpHeadline, FALSE, FALSE, 3); @@ -211,39 +212,48 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) gtk_container_set_border_width(GTK_CONTAINER(table2), 5); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Medium sectors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageSectors = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Checksum errors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpChkSumErrors = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Missing Sectors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpMissingSectors = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Image checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageMd5Sum = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpImageResult = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); /*** Image spiral */ @@ -277,71 +287,88 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) gtk_container_set_border_width(GTK_CONTAINER(table2), 5); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Created by:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccCreatedBy = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Method:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccMethod = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Requires:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccRequires = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Medium sectors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccMediumSectors = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Image checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccImgMd5Sum = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Fingerprint:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccFingerprint = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc blocks:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccBlocks = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccMd5Sum = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpEccResult = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, 8, 9, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); } #endif /* WITH_GUI_YES */ diff --git a/src/rs01-window.c b/src/rs01-window.c index f8f1555..441977c 100644 --- a/src/rs01-window.c +++ b/src/rs01-window.c @@ -110,7 +110,8 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent) GtkWidget *sep,*wid,*pbar,*table,*hbox; 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); @@ -126,7 +127,8 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent) wl->encLabel1 = wid = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(wid), _utf("1. Calculating image sector checksums:")); - 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(); @@ -135,19 +137,20 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent) wl->encLabel2 = wid = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(wid), _utf("2. Creating error correction data:")); - 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); @@ -317,7 +320,8 @@ void CreateRS01FWindow(Method *method, GtkWidget *parent) GtkWidget *sep,*ignore,*d_area,*notebook,*hbox; 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); @@ -340,22 +344,24 @@ void CreateRS01FWindow(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); diff --git a/src/rs02-verify.c b/src/rs02-verify.c index ac13ebb..b8264e4 100644 --- a/src/rs02-verify.c +++ b/src/rs02-verify.c @@ -167,7 +167,8 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) GtkWidget *sep,*notebook,*table,*table2,*ignore,*lab,*frame,*d_area; wl->cmpHeadline = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(wl->cmpHeadline), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0); + gtk_label_set_yalign(GTK_LABEL(wl->cmpHeadline), 0.0); gtk_misc_set_padding(GTK_MISC(wl->cmpHeadline), 5, 0); gtk_box_pack_start(GTK_BOX(parent), wl->cmpHeadline, FALSE, FALSE, 3); @@ -192,55 +193,68 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) gtk_container_add(GTK_CONTAINER(frame), table2); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Medium sectors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageSectors = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Data checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageMd5Sum = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc headers:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccHeaders = gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Data section:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpDataSection = gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Crc section:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpCrcSection = gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc section:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccSection= gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpImageResult = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); /*** Image spiral */ @@ -274,63 +288,78 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) gtk_container_set_border_width(GTK_CONTAINER(table2), 5); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Created by:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccCreatedBy = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Method:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccMethod = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Requires:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccRequires = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Medium sectors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccMediumSectors = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpEcc1Name = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Data checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEcc1Msg = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpEcc2Name = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("CRC checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEcc2Msg = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpEcc3Name = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEcc3Msg = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); lab = wl->cmpEccResult = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); } diff --git a/src/rs02-window.c b/src/rs02-window.c index df9f752..e7b9546 100644 --- a/src/rs02-window.c +++ b/src/rs02-window.c @@ -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("1. Preparing image:")); - 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("2. Creating error correction data:")); - 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); diff --git a/src/rs03-verify.c b/src/rs03-verify.c index b1dd158..35bf2b1 100644 --- a/src/rs03-verify.c +++ b/src/rs03-verify.c @@ -178,7 +178,8 @@ void CreateRS03VerifyWindow(Method *self, GtkWidget *parent) int y1,y2; wl->cmpHeadline = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(wl->cmpHeadline), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0); + gtk_label_set_yalign(GTK_LABEL(wl->cmpHeadline), 0.0); gtk_misc_set_padding(GTK_MISC(wl->cmpHeadline), 5, 0); gtk_box_pack_start(GTK_BOX(parent), wl->cmpHeadline, FALSE, FALSE, 3); @@ -205,61 +206,74 @@ void CreateRS03VerifyWindow(Method *self, GtkWidget *parent) y1=0; y2=1; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Type:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccType = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Method:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccMethod = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Created by:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccCreatedBy = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Requires:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccRequires = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = wl->cmpEccDataCrc = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Data checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccDataCrcVal = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Fingerprint:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccFingerprint = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = wl->cmpEccResult = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); /*** Image spiral */ @@ -294,77 +308,94 @@ void CreateRS03VerifyWindow(Method *self, GtkWidget *parent) y1=0; y2=1; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Medium sectors:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageSectors = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Data checksum:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageMd5Sum = gtk_label_new("0"); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Data section:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpDataSection = gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Crc section:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpCrcSection = gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc section:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccSection= gtk_label_new("."); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = wl->cmpEccSynLabel = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); GuiSetLabelText(lab, _("Ecc block test:")); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpEccSyndromes = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = wl->cmpImageErasure = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImageErasureCnt = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = wl->cmpImagePrognosis = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); lab = wl->cmpImagePrognosisMsg = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, y1, y2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); y1++; y2++; lab = wl->cmpImageResult = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(lab), 0.0); + gtk_label_set_yalign(GTK_LABEL(lab), 0.0); gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, y1, y2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); } diff --git a/src/rs03-window.c b/src/rs03-window.c index 5dabfe5..bea36bd 100644 --- a/src/rs03-window.c +++ b/src/rs03-window.c @@ -63,7 +63,8 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) RS03Widgets *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); @@ -79,7 +80,8 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) wl->encLabel1 = wid = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(wid), _utf("1. Reserving space:")); - 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, 10, 20); pbar = wl->encPBar1 = gtk_progress_bar_new(); @@ -88,7 +90,8 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) wl->encLabel2 = wid = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(wid), _utf("2. Creating error correction data:")); - 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, 10, 20); pbar = wl->encPBar2 = gtk_progress_bar_new(); @@ -96,39 +99,45 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) wl->encLabel3 = wid = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(wid), 1.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(wid), 1.0); + gtk_label_set_yalign(GTK_LABEL(wid), 0.0); gtk_label_set_markup(GTK_LABEL(wid),_utf("Encoder info:")); gtk_table_attach(GTK_TABLE(table), wid, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 10, 5); wl->encThreads = wid = gtk_label_new(NULL); - 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, 1, 2, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 10,5); wl->encLabel4 = wid = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(wid), 1.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(wid), 1.0); + gtk_label_set_yalign(GTK_LABEL(wid), 0.0); gtk_label_set_markup(GTK_LABEL(wid),_utf("Performance:")); gtk_table_attach(GTK_TABLE(table), wid, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 10, 5); wl->encPerformance = wid = gtk_label_new(NULL); - 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, 1, 2, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 10, 5); wl->encLabel5 = wid = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(wid), 1.0, 0.0); + gtk_label_set_xalign(GTK_LABEL(wid), 1.0); + gtk_label_set_yalign(GTK_LABEL(wid), 0.0); gtk_label_set_markup(GTK_LABEL(wid),_utf("State:")); gtk_table_attach(GTK_TABLE(table), wid, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 10, 5); wl->encBottleneck = wid = gtk_label_new(NULL); - 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, 1, 2, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 10, 5); 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); } @@ -290,7 +299,8 @@ void CreateRS03FixWindow(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); @@ -313,22 +323,24 @@ void CreateRS03FixWindow(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);