diff --git a/src/medium-info.c b/src/medium-info.c index 2114389..a275f9a 100644 --- a/src/medium-info.c +++ b/src/medium-info.c @@ -346,7 +346,6 @@ void GuiCreateMediumInfoWindow() _utf("Medium info\n" "Properties of the currently inserted medium")); 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); @@ -407,82 +406,66 @@ void GuiCreateMediumInfoWindow() lab = gtk_label_new(_utf("Medium type:")); 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 */ @@ -496,32 +479,26 @@ void GuiCreateMediumInfoWindow() lab = gtk_label_new(_utf("Medium label:")); 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_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_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_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_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_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 */ @@ -535,32 +512,26 @@ void GuiCreateMediumInfoWindow() lab = gtk_label_new(_utf("Error correction data:")); 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_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_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_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_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_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:")); diff --git a/src/preferences.c b/src/preferences.c index 490d2fe..3eef759 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -2151,9 +2151,7 @@ void GuiCreatePreferencesWindow(void) gtk_table_attach(GTK_TABLE(table), tinybox, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 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); @@ -2939,9 +2937,7 @@ void GuiCreatePreferencesWindow(void) gtk_table_attach(GTK_TABLE(table), tinybox, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 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 13a82e8..6788526 100644 --- a/src/raw-editor.c +++ b/src/raw-editor.c @@ -936,12 +936,10 @@ void GuiCreateRawEditor(void) rec->leftLabel = label = gtk_label_new("Reed-Solomon Sudoku"); 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_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 bba5f61..b078195 100644 --- a/src/read-adaptive-window.c +++ b/src/read-adaptive-window.c @@ -345,7 +345,6 @@ void GuiCreateAdaptiveReadWindow(GtkWidget *parent) Closure->readAdaptiveHeadline = gtk_label_new(NULL); 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 56f76f6..0f7d712 100644 --- a/src/read-linear-window.c +++ b/src/read-linear-window.c @@ -355,7 +355,6 @@ void GuiCreateLinearReadWindow(GtkWidget *parent) Closure->readLinearHeadline = gtk_label_new(NULL); 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); @@ -387,12 +386,10 @@ void GuiCreateLinearReadWindow(GtkWidget *parent) hbox = Closure->readLinearFootlineBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); Closure->readLinearSpeed = gtk_label_new(NULL); 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_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"); diff --git a/src/rs01-verify.c b/src/rs01-verify.c index eacb5de..203219f 100644 --- a/src/rs01-verify.c +++ b/src/rs01-verify.c @@ -178,7 +178,6 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) wl->cmpHeadline = gtk_label_new(NULL); 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); @@ -213,47 +212,38 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) lab = gtk_label_new(NULL); 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_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_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_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_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_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_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_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_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 */ @@ -288,87 +278,70 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) lab = gtk_label_new(NULL); 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 441977c..e7c864a 100644 --- a/src/rs01-window.c +++ b/src/rs01-window.c @@ -111,7 +111,6 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent) wl->encHeadline = gtk_label_new(NULL); 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); @@ -128,7 +127,6 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent) gtk_label_set_markup(GTK_LABEL(wid), _utf("1. Calculating image sector checksums:")); 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(); @@ -138,7 +136,6 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent) gtk_label_set_markup(GTK_LABEL(wid), _utf("2. Creating error correction data:")); 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(); @@ -321,7 +318,6 @@ void CreateRS01FWindow(Method *method, GtkWidget *parent) wl->fixHeadline = gtk_label_new(NULL); 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); @@ -345,16 +341,13 @@ void CreateRS01FWindow(Method *method, GtkWidget *parent) wl->fixCorrected = gtk_label_new(NULL); 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_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_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"); diff --git a/src/rs02-verify.c b/src/rs02-verify.c index b8264e4..a8c8cc2 100644 --- a/src/rs02-verify.c +++ b/src/rs02-verify.c @@ -168,7 +168,6 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) wl->cmpHeadline = gtk_label_new(NULL); 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); @@ -194,67 +193,54 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) lab = gtk_label_new(NULL); 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_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_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_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_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_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_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_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_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_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_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_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_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 */ @@ -289,77 +275,62 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) lab = gtk_label_new(NULL); 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 e7b9546..d639fd1 100644 --- a/src/rs02-window.c +++ b/src/rs02-window.c @@ -60,7 +60,6 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent) wl->encHeadline = gtk_label_new(NULL); 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); @@ -76,7 +75,6 @@ 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_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(); @@ -86,7 +84,6 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent) gtk_label_set_markup(GTK_LABEL(wid), _utf("2. Creating error correction data:")); 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(); @@ -263,7 +260,6 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent) wl->fixHeadline = gtk_label_new(NULL); 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); @@ -287,16 +283,13 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent) wl->fixCorrected = gtk_label_new(NULL); 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_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_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"); @@ -785,7 +778,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 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); @@ -797,7 +789,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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); @@ -862,7 +853,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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); @@ -927,7 +917,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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); @@ -992,7 +981,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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); @@ -1056,7 +1044,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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); @@ -1120,7 +1107,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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); @@ -1186,7 +1172,6 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) GuiRegisterPreferencesHelpWindow(lwoh); 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 35bf2b1..fd26dc7 100644 --- a/src/rs03-verify.c +++ b/src/rs03-verify.c @@ -179,7 +179,6 @@ void CreateRS03VerifyWindow(Method *self, GtkWidget *parent) wl->cmpHeadline = gtk_label_new(NULL); 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); @@ -207,73 +206,60 @@ void CreateRS03VerifyWindow(Method *self, GtkWidget *parent) lab = gtk_label_new(NULL); 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_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_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_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_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_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_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_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_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_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_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_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_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 */ @@ -309,93 +295,76 @@ void CreateRS03VerifyWindow(Method *self, GtkWidget *parent) lab = gtk_label_new(NULL); 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 bea36bd..419e6dc 100644 --- a/src/rs03-window.c +++ b/src/rs03-window.c @@ -64,7 +64,6 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) wl->encHeadline = gtk_label_new(NULL); 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); @@ -81,7 +80,6 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) gtk_label_set_markup(GTK_LABEL(wid), _utf("1. Reserving space:")); 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(); @@ -91,7 +89,6 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) gtk_label_set_markup(GTK_LABEL(wid), _utf("2. Creating error correction data:")); 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(); @@ -100,35 +97,29 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent) wl->encLabel3 = wid = gtk_label_new(NULL); 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_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_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_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_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_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); @@ -300,7 +291,6 @@ void CreateRS03FixWindow(Method *method, GtkWidget *parent) wl->fixHeadline = gtk_label_new(NULL); 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); @@ -324,16 +314,13 @@ void CreateRS03FixWindow(Method *method, GtkWidget *parent) wl->fixCorrected = gtk_label_new(NULL); 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_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_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");