xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert GtkTable to GtkGrid in rs02-verify

Browse Source
This commit is contained in:
Paul Dicker
2025-04-10 12:08:32 +02:00
committed by Stéphane Lesimple
parent dc23ed54b1
commit 0d0180167e
1 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/rs02-verify.c
View File

@@ -164,7 +164,7 @@ static gboolean draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) void CreateRS02VerifyWindow(Method *self, GtkWidget *parent)
{ RS02Widgets *wl = (RS02Widgets*)self->widgetList; { RS02Widgets *wl = (RS02Widgets*)self->widgetList;
GtkWidget *sep,*notebook,*table,*table2,*ignore,*lab,*frame,*d_area; GtkWidget *sep,*notebook,*grid,*grid2,*ignore,*lab,*frame,*d_area;
wl->cmpHeadline = gtk_label_new(NULL); wl->cmpHeadline = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0); gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0);
@@ -177,76 +177,90 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent)
sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(parent), sep, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(parent), sep, FALSE, FALSE, 0);
table = gtk_table_new(2, 2, FALSE); grid = gtk_grid_new();
gtk_container_set_border_width(GTK_CONTAINER(table), 5); gtk_widget_set_margin_start(grid, 5);
gtk_box_pack_start(GTK_BOX(parent), table, TRUE, TRUE, 0); gtk_widget_set_margin_end(grid, 5);
gtk_widget_set_margin_top(grid, 5);
gtk_widget_set_margin_bottom(grid, 5);
gtk_grid_set_column_spacing(GTK_GRID(grid), 10);
gtk_grid_set_row_spacing(GTK_GRID(grid), 10);
gtk_container_set_border_width(GTK_CONTAINER(grid), 5);
gtk_box_pack_start(GTK_BOX(parent), grid, TRUE, TRUE, 0);
/*** Image info */ /*** Image info */
frame = gtk_frame_new(_utf("Image file summary")); frame = gtk_frame_new(_utf("Image file summary"));
gtk_table_attach(GTK_TABLE(table), frame, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); gtk_widget_set_hexpand(frame, TRUE);
gtk_grid_attach(GTK_GRID(grid), frame, 1, 1, 1, 1);
table2 = gtk_table_new(2, 7, FALSE); grid2 = gtk_grid_new();
ignore = gtk_label_new("image info"); gtk_widget_set_margin_start(grid2, 5);
gtk_container_set_border_width(GTK_CONTAINER(table2), 5); gtk_widget_set_margin_end(grid2, 5);
gtk_container_add(GTK_CONTAINER(frame), table2); gtk_widget_set_margin_top(grid2, 2);
gtk_widget_set_margin_bottom(grid2, 2);
gtk_grid_set_column_spacing(GTK_GRID(grid2), 5);
gtk_grid_set_row_spacing(GTK_GRID(grid2), 4);
gtk_container_set_border_width(GTK_CONTAINER(grid2), 5);
gtk_container_add(GTK_CONTAINER(frame), grid2);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Medium sectors:")); GuiSetLabelText(lab, _("Medium sectors:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 1, 1, 1);
lab = wl->cmpImageSectors = gtk_label_new("0"); lab = wl->cmpImageSectors = gtk_label_new("0");
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 1, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Data checksum:")); GuiSetLabelText(lab, _("Data checksum:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 2, 1, 1);
lab = wl->cmpImageMd5Sum = gtk_label_new("0"); lab = wl->cmpImageMd5Sum = gtk_label_new("0");
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 2, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Ecc headers:")); GuiSetLabelText(lab, _("Ecc headers:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 3, 1, 1);
lab = wl->cmpEccHeaders = gtk_label_new("."); lab = wl->cmpEccHeaders = gtk_label_new(".");
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 3, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Data section:")); GuiSetLabelText(lab, _("Data section:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 4, 1, 1);
lab = wl->cmpDataSection = gtk_label_new("."); lab = wl->cmpDataSection = gtk_label_new(".");
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 4, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Crc section:")); GuiSetLabelText(lab, _("Crc section:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 5, 1, 1);
lab = wl->cmpCrcSection = gtk_label_new("."); lab = wl->cmpCrcSection = gtk_label_new(".");
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 6, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Ecc section:")); GuiSetLabelText(lab, _("Ecc section:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 6, 1, 1);
lab = wl->cmpEccSection= gtk_label_new("."); lab = wl->cmpEccSection= gtk_label_new(".");
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 6, 1, 1);
lab = wl->cmpImageResult = gtk_label_new(NULL); lab = wl->cmpImageResult = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); gtk_widget_set_margin_top(lab, 2);
gtk_grid_attach(GTK_GRID(grid2), lab, 1, 5, 2, 1);
/*** Image spiral */ /*** Image spiral */
frame = gtk_frame_new(_utf("Image state")); frame = gtk_frame_new(_utf("Image state"));
gtk_table_attach(GTK_TABLE(table), frame, 1, 2, 0, 2, GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5); gtk_widget_set_vexpand(frame, TRUE);
gtk_grid_attach(GTK_GRID(grid), frame, 2, 1, 1, 2);
wl->cmpSpiral = GuiCreateSpiral(&transparent, 10, 5, VERIFY_IMAGE_SEGMENTS); wl->cmpSpiral = GuiCreateSpiral(&transparent, 10, 5, VERIFY_IMAGE_SEGMENTS);
d_area = wl->cmpDrawingArea = gtk_drawing_area_new(); d_area = wl->cmpDrawingArea = gtk_drawing_area_new();
@@ -257,7 +271,9 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent)
/*** Ecc data info */ /*** Ecc data info */
frame = gtk_frame_new(_utf("Error correction data")); frame = gtk_frame_new(_utf("Error correction data"));
gtk_table_attach(GTK_TABLE(table), frame, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5); gtk_widget_set_hexpand(frame, TRUE);
gtk_widget_set_vexpand(frame, TRUE);
gtk_grid_attach(GTK_GRID(grid), frame, 1, 2, 1, 1);
notebook = wl->cmpEccNotebook = gtk_notebook_new(); notebook = wl->cmpEccNotebook = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
@@ -268,71 +284,77 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent)
lab = gtk_label_new(""); lab = gtk_label_new("");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), lab, ignore); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), lab, ignore);
table2 = gtk_table_new(2, 8, FALSE); grid2 = gtk_grid_new();
gtk_widget_set_margin_start(grid2, 5);
gtk_widget_set_margin_end(grid2, 5);
gtk_widget_set_margin_top(grid2, 2);
gtk_widget_set_margin_bottom(grid2, 2);
gtk_grid_set_column_spacing(GTK_GRID(grid2), 5);
gtk_grid_set_row_spacing(GTK_GRID(grid2), 4);
ignore = gtk_label_new("ecc info"); ignore = gtk_label_new("ecc info");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table2, ignore); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), grid2, ignore);
gtk_container_set_border_width(GTK_CONTAINER(table2), 5); gtk_container_set_border_width(GTK_CONTAINER(grid2), 5);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Created by:")); GuiSetLabelText(lab, _("Created by:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 1, 1, 1);
lab = wl->cmpEccCreatedBy = gtk_label_new(NULL); lab = wl->cmpEccCreatedBy = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 1, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Method:")); GuiSetLabelText(lab, _("Method:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 2, 1, 1);
lab = wl->cmpEccMethod = gtk_label_new(NULL); lab = wl->cmpEccMethod = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 2, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Requires:")); GuiSetLabelText(lab, _("Requires:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 3, 1, 1);
lab = wl->cmpEccRequires = gtk_label_new(NULL); lab = wl->cmpEccRequires = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 3, 1, 1);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Medium sectors:")); GuiSetLabelText(lab, _("Medium sectors:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 4, 1, 1);
lab = wl->cmpEccMediumSectors = gtk_label_new(NULL); lab = wl->cmpEccMediumSectors = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 4, 1, 1);
lab = wl->cmpEcc1Name = gtk_label_new(NULL); lab = wl->cmpEcc1Name = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Data checksum:")); GuiSetLabelText(lab, _("Data checksum:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 5, 1, 1);
lab = wl->cmpEcc1Msg = gtk_label_new(NULL); lab = wl->cmpEcc1Msg = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 5, 1, 1);
lab = wl->cmpEcc2Name = gtk_label_new(NULL); lab = wl->cmpEcc2Name = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("CRC checksum:")); GuiSetLabelText(lab, _("CRC checksum:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 6, 1, 1);
lab = wl->cmpEcc2Msg = gtk_label_new(NULL); lab = wl->cmpEcc2Msg = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 6, 1, 1);
lab = wl->cmpEcc3Name = gtk_label_new(NULL); lab = wl->cmpEcc3Name = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
GuiSetLabelText(lab, _("Ecc checksum:")); GuiSetLabelText(lab, _("Ecc checksum:"));
gtk_table_attach(GTK_TABLE(table2), lab, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 2 ); gtk_grid_attach(GTK_GRID(grid2), lab, 1, 7, 1, 1);
lab = wl->cmpEcc3Msg = gtk_label_new(NULL); lab = wl->cmpEcc3Msg = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_grid_attach(GTK_GRID(grid2), lab, 2, 7, 1, 1);
lab = wl->cmpEccResult = gtk_label_new(NULL); lab = wl->cmpEccResult = gtk_label_new(NULL);
gtk_label_set_xalign(GTK_LABEL(lab), 0.0); gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_table_attach(GTK_TABLE(table2), lab, 0, 2, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 4); gtk_widget_set_margin_top(lab, 2);
gtk_grid_attach(GTK_GRID(grid2), lab, 1, 8, 2, 1);
} }
#endif /* WITH_GUI_YES */ #endif /* WITH_GUI_YES */