Convert gtk_(h|v)box_new to gtk_box_new

This commit is contained in:
Paul Dicker
2025-04-07 10:27:10 +02:00
committed by Stéphane Lesimple
parent cc9f4dd817
commit 5ea0011dce
12 changed files with 144 additions and 137 deletions

View File

@@ -142,10 +142,10 @@ LabelWithOnlineHelp* GuiCreateLabelWithOnlineHelp(char *title, char *ascii_text)
/* Create the main layout of the window */
lwoh->vbox = vbox = gtk_vbox_new(FALSE, 0);
lwoh->vbox = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
@@ -288,7 +288,7 @@ void GuiAddHelpParagraph(LabelWithOnlineHelp *lwoh, char *format, ...)
void GuiAddHelpListItem(LabelWithOnlineHelp *lwoh, char *format, ...)
{ GtkWidget *label = gtk_label_new(NULL);
GtkWidget *bullet = gtk_label_new(" - ");
GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
va_list argp;
char *text,*utf;
@@ -550,7 +550,7 @@ GtkWidget* GuiShowTextfile(char *title, char *explanation, char *file,
gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 600);
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
vbox = gtk_vbox_new(FALSE, 0);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
@@ -684,7 +684,7 @@ void GuiAboutTextWithLink(GtkWidget *parent, char *text, char *action)
link_end = strchr(head, ']');
if(link_start && link_end)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
*link_start++ = *link_end++ = 0;
@@ -730,7 +730,7 @@ void GuiAboutDialog()
g_signal_connect_swapped(about, "response", G_CALLBACK(gtk_widget_destroy), about);
vbox = gtk_vbox_new(FALSE, 0);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(about))), vbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);

View File

@@ -256,7 +256,7 @@ static GtkWidget *create_button(char *label, char *icon)
button = gtk_button_new();
box = gtk_vbox_new(FALSE, 0);
box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_LARGE_TOOLBAR);
lab = gtk_label_new(utf_label);
g_free(utf_label);
@@ -275,8 +275,9 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook)
int window_number = FIRST_CREATE_WINDOW;
unsigned int i;
outer_vbox = gtk_vbox_new(TRUE, 0);
vbox = gtk_vbox_new(FALSE, 0); /* needed for vertical spacing */
outer_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous(GTK_BOX(outer_vbox), TRUE);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); /* needed for vertical spacing */
gtk_box_pack_start(GTK_BOX(outer_vbox), vbox, TRUE, TRUE, 3);
/*** Read */
@@ -287,12 +288,12 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook)
GuiAttachTooltip(wid, _("tooltip|Read Image"),
_("Reads an optical disc image into a file (or tries to complete an existing image file)."));
content = gtk_vbox_new(FALSE, 0); /* read linear window */
content = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); /* read linear window */
ignore = gtk_label_new("read_tab_l");
gtk_notebook_append_page(notebook, content, ignore);
GuiCreateLinearReadWindow(content);
content = gtk_vbox_new(FALSE, 0); /* read adaptive window */
content = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); /* read adaptive window */
ignore = gtk_label_new("read_tab_a");
gtk_notebook_append_page(notebook, content, ignore);
GuiCreateAdaptiveReadWindow(content);
@@ -362,21 +363,21 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook)
/* Create window */
content = gtk_vbox_new(FALSE, 0);
content = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
ignore = gtk_label_new("create_tab");
gtk_notebook_append_page(notebook, content, ignore);
method->createCreateWindow(method, content);
/* Fix window */
content = gtk_vbox_new(FALSE, 0);
content = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
ignore = gtk_label_new("fix_tab");
gtk_notebook_append_page(notebook, content, ignore);
method->createFixWindow(method, content);
/* Verify window */
content = gtk_vbox_new(FALSE, 0);
content = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
ignore = gtk_label_new("verify_tab");
gtk_notebook_append_page(notebook, content, ignore);
method->createVerifyWindow(method, content);
@@ -441,7 +442,7 @@ void GuiCreateMainWindow(int *argc, char ***argv)
/*** Create the sub parts of the GUI */
outer_box = gtk_vbox_new(FALSE, 0);
outer_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), outer_box);
/* Menu and tool bar */
@@ -460,7 +461,7 @@ void GuiCreateMainWindow(int *argc, char ***argv)
sep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(outer_box), sep, FALSE, FALSE, 0);
middle_box = gtk_hbox_new(FALSE, 0);
middle_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(outer_box), middle_box, TRUE, TRUE, 0);
wid = Closure->notebook = gtk_notebook_new();
@@ -478,7 +479,7 @@ void GuiCreateMainWindow(int *argc, char ***argv)
/* Status bar enclosure */
status_box = gtk_hbox_new(FALSE, 0);
status_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(outer_box), status_box, FALSE, FALSE, 0);
sep = gtk_hseparator_new();
@@ -499,7 +500,7 @@ void GuiCreateMainWindow(int *argc, char ***argv)
_("tooltip|Protocol for current action"),
_("Displays additional information created during the current or last action."));
box = gtk_hbox_new(FALSE, 0);
box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add(GTK_CONTAINER(button), box);
icon = gtk_image_new_from_stock("dvdisaster-gtk-index", GTK_ICON_SIZE_SMALL_TOOLBAR);

View File

@@ -337,7 +337,7 @@ void GuiCreateMediumInfoWindow()
/*** Inner vbox and title */
vbox = gtk_vbox_new(FALSE, 0);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
@@ -358,7 +358,7 @@ void GuiCreateMediumInfoWindow()
frame = gtk_frame_new(_utf("Drive selection"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_container_add(GTK_CONTAINER(frame), hbox);

View File

@@ -434,7 +434,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent)
/*** Create the toolbar */
box = gtk_hbox_new(FALSE, 0);
box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
/*** Drive selection */

View File

@@ -370,7 +370,7 @@ static GtkWidget *create_page(GtkWidget *notebook, char *label)
{ GtkWidget *vbox,*tab_label;
tab_label = gtk_label_new(label);
vbox = gtk_vbox_new(FALSE, 5);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, tab_label);
@@ -814,7 +814,7 @@ static GtkWidget* non_linear_scale(GtkWidget **hbox_out, non_linear_info *nli,
nli->values = values;
nli->pc = pc;
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
scale = gtk_hscale_new_with_range(0,n-1,1);
gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_RIGHT);
gtk_range_set_increments(GTK_RANGE(scale), 1, 1);
@@ -1171,7 +1171,7 @@ void GuiCreatePreferencesWindow(void)
/* Create the main layout of the window */
outer_box = gtk_vbox_new(FALSE, 0);
outer_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), outer_box);
notebook = pc->mainNotebook = gtk_notebook_new();
@@ -1180,7 +1180,7 @@ void GuiCreatePreferencesWindow(void)
space = gtk_image_new();
gtk_box_pack_start(GTK_BOX(outer_box), space, FALSE, FALSE, 4);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(outer_box), hbox, FALSE, FALSE, 0);
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
@@ -1196,7 +1196,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Image creation"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 20);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -1207,7 +1207,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *lab, *radio1, *radio2;
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);
@@ -1255,7 +1255,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *toggle,*spin1, *spin2;
// toggle = gtk_check_button_new_with_label(_utf("Read/Scan from sector"));
@@ -1308,7 +1308,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Error correction data recognization"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -1319,7 +1319,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1360,7 +1360,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1399,7 +1399,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Image properties"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -1410,7 +1410,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1451,7 +1451,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1486,7 +1486,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Image format"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -1497,7 +1497,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1539,7 +1539,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *check, *entry;
check = gtk_check_button_new();
@@ -1610,7 +1610,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh_clone);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *spin;
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);
@@ -1645,7 +1645,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Raw reading parameters"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -1656,7 +1656,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *lab, *radio1, *radio2, *radio3, *entry;
char value[11];
@@ -1752,7 +1752,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh_clone);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *spin;
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);
@@ -1800,7 +1800,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *toggle;
toggle = gtk_check_button_new();
@@ -1841,7 +1841,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *toggle;
toggle = gtk_check_button_new();
@@ -1881,7 +1881,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Sector read errors"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 20);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -1892,7 +1892,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2089,7 +2089,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *spin;
GtkWidget *label;
@@ -2126,7 +2126,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Raw sector caching"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 20);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2138,8 +2138,8 @@ void GuiCreatePreferencesWindow(void)
for(i=0; i<2; i++)
{ GtkWidget *table = gtk_table_new(3,2,FALSE);
GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
GtkWidget *tinybox = gtk_hbox_new(FALSE, 0);
GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *label = gtk_label_new(Closure->dDumpDir);
GtkWidget *select = gtk_button_new_with_label(_utf("Select"));
@@ -2153,7 +2153,7 @@ void GuiCreatePreferencesWindow(void)
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
gtk_misc_set_alignment(GTK_MISC(lwoh->normalLabel), 0.0, 0.0);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_table_attach(GTK_TABLE(table), hbox,
1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -2205,7 +2205,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);
@@ -2239,7 +2239,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *chooser;
int j;
@@ -2304,7 +2304,7 @@ void GuiCreatePreferencesWindow(void)
for(i=0; i<Closure->methodList->len; i++)
{ Method *method = g_ptr_array_index(Closure->methodList, i);
GtkWidget *vbox2 = gtk_vbox_new(FALSE, 0);
GtkWidget *vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
GtkWidget *ignore = gtk_label_new("method_tab");
if(method->createPrefsPage)
@@ -2332,7 +2332,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Local files (on hard disk)"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2341,7 +2341,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2371,7 +2371,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Automatic file creation and deletion"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2382,7 +2382,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2414,7 +2414,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2443,7 +2443,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Confirm file overwriting"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2454,7 +2454,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2489,7 +2489,7 @@ void GuiCreatePreferencesWindow(void)
table = gtk_table_new(2, 4, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
vbox3 = gtk_vbox_new(FALSE, 0);
vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_table_attach(GTK_TABLE(table), vbox3,
0, 1, 0, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -2498,7 +2498,7 @@ void GuiCreatePreferencesWindow(void)
gtk_box_pack_start(GTK_BOX(vbox3), gtk_label_new(NULL), TRUE, TRUE, 0);
vbox2 = gtk_vbox_new(FALSE, 20);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2508,7 +2508,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->greenSector);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->greenSector);
@@ -2538,7 +2538,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->yellowSector);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->yellowSector);
@@ -2568,7 +2568,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->redSector);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->redSector);
@@ -2598,7 +2598,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->darkSector);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->darkSector);
@@ -2628,7 +2628,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->blueSector);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->blueSector);
@@ -2659,7 +2659,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->whiteSector);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->whiteSector);
@@ -2690,7 +2690,7 @@ void GuiCreatePreferencesWindow(void)
gtk_table_attach(GTK_TABLE(table), frame,
1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 5, 5);
vbox2 = gtk_vbox_new(FALSE, 20);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2700,7 +2700,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->greenText);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->greenText);
@@ -2730,7 +2730,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->redText);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->redText);
@@ -2759,7 +2759,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Curve colors"));
gtk_table_attach(GTK_TABLE(table), frame,
1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 5, 5);
vbox2 = gtk_vbox_new(FALSE, 20);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2769,7 +2769,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->curveColor);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->curveColor);
@@ -2800,7 +2800,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->logColor);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->logColor);
@@ -2832,7 +2832,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
button = gtk_color_button_new_with_rgba(Closure->barColor);
g_signal_connect(G_OBJECT(button), "color-set", G_CALLBACK(color_set_cb), Closure->barColor);
@@ -2880,7 +2880,7 @@ void GuiCreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Logging"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 15);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -2889,7 +2889,7 @@ void GuiCreatePreferencesWindow(void)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *button = gtk_check_button_new();
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2923,8 +2923,8 @@ void GuiCreatePreferencesWindow(void)
for(i=0; i<2; i++)
{ GtkWidget *table = gtk_table_new(4,2,FALSE);
GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
GtkWidget *tinybox = gtk_hbox_new(FALSE, 0);
GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *tinybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *label = gtk_label_new(Closure->logFile);
GtkWidget *select = gtk_button_new_with_label(_utf("Select"));
GtkWidget *delete = gtk_button_new_with_label(_utf("Delete"));
@@ -2940,7 +2940,7 @@ void GuiCreatePreferencesWindow(void)
gtk_misc_set_alignment(GTK_MISC(lwoh->normalLabel), 0.0, 0.0);
gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_MIDDLE);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
gtk_table_attach(GTK_TABLE(table), hbox,
0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);

View File

@@ -928,10 +928,10 @@ void GuiCreateRawEditor(void)
/* Create the main layout of the window */
outer_box = gtk_vbox_new(FALSE, 0);
outer_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), outer_box);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(outer_box), hbox, FALSE, FALSE, 0);
rec->leftLabel = label = gtk_label_new("Reed-Solomon Sudoku");
@@ -942,10 +942,10 @@ void GuiCreateRawEditor(void)
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(outer_box), hbox, TRUE, TRUE, 0);
vbox = gtk_vbox_new(FALSE, 0);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 5);
/* Actions for browsing the raw samples */
@@ -953,13 +953,13 @@ void GuiCreateRawEditor(void)
label = gtk_label_new(_utf("Browsing"));
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 10);
hbox2 = gtk_hbox_new(FALSE, 0);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
vbox1 = gtk_vbox_new(FALSE, 0);
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(hbox2), vbox1, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 0);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(hbox2), vbox2, FALSE, FALSE, 0);
button = gtk_button_new_with_label(_utf("button|Load"));
@@ -998,13 +998,16 @@ void GuiCreateRawEditor(void)
label = gtk_label_new(_utf("Editing"));
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 10);
hbox2 = gtk_hbox_new(TRUE, 0);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous(GTK_BOX(hbox2), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
vbox1 = gtk_vbox_new(TRUE, 0);
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous(GTK_BOX(vbox1), TRUE);
gtk_box_pack_start(GTK_BOX(hbox2), vbox1, TRUE, TRUE, 0);
vbox2 = gtk_vbox_new(TRUE, 0);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous(GTK_BOX(vbox2), TRUE);
gtk_box_pack_start(GTK_BOX(hbox2), vbox2, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_utf("button|Load Buf"));

View File

@@ -365,7 +365,7 @@ void GuiCreateLinearReadWindow(GtkWidget *parent)
sep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(parent), sep, FALSE, FALSE, 0);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(parent), hbox, TRUE, TRUE, 0);
curve = Closure->readLinearCurveArea = gtk_drawing_area_new();
@@ -383,7 +383,7 @@ void GuiCreateLinearReadWindow(GtkWidget *parent)
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
gtk_box_pack_end(GTK_BOX(parent), notebook, FALSE, FALSE, 0);
hbox = Closure->readLinearFootlineBox = gtk_hbox_new(FALSE, 0);
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_box_pack_start(GTK_BOX(hbox), Closure->readLinearSpeed, FALSE, FALSE, 0);

View File

@@ -151,7 +151,7 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent)
gtk_misc_set_padding(GTK_MISC(wl->encFootline2), 20, 0);
gtk_box_pack_start(GTK_BOX(parent), wl->encFootline2, FALSE, FALSE, 3);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
wid = gtk_label_new(NULL);
@@ -336,7 +336,8 @@ void CreateRS01FWindow(Method *method, GtkWidget *parent)
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
gtk_box_pack_end(GTK_BOX(parent), notebook, FALSE, FALSE, 0);
hbox = wl->fixFootlineBox = gtk_hbox_new(TRUE, 0);
hbox = wl->fixFootlineBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
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);
@@ -617,7 +618,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent)
frame = gtk_frame_new(_utf("Redundancy for new error correction files"));
gtk_box_pack_start(GTK_BOX(parent), frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new(FALSE, 10);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -627,7 +628,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new(NULL);
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -657,7 +658,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(i?wl->radio1B:wl->radio1A));
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -688,7 +689,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ hbox = gtk_hbox_new(FALSE, 4);
{ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(i?wl->radio1B:wl->radio1A));
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -736,7 +737,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ hbox = gtk_hbox_new(FALSE, 4);
{ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(i?wl->radio1B:wl->radio1A));
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -830,7 +831,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent)
GuiLockLabelSize(lwoh->linkLabel, _utf("%d MiB of file cache"), 2222);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
int n_entries = sizeof(cache_size)/sizeof(int);
lab = gtk_label_new(_utf("Use"));

View File

@@ -278,7 +278,8 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent)
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
gtk_box_pack_end(GTK_BOX(parent), notebook, FALSE, FALSE, 0);
hbox = wl->fixFootlineBox = gtk_hbox_new(TRUE, 0);
hbox = wl->fixFootlineBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
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);
@@ -728,11 +729,11 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
frame = gtk_frame_new(_utf("Maximum image size"));
gtk_box_pack_start(GTK_BOX(parent), frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new(FALSE, 10);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* Drive capacity table header */
@@ -741,7 +742,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
_("Use smallest possible size from following table (in sectors):"));
GuiRegisterPreferencesHelpWindow(lwoh);
vbox2 = gtk_vbox_new(FALSE, 0);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
for(i=0; i<2; i++)
@@ -754,7 +755,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
gtk_box_pack_start(GTK_BOX(vbox2), radio, FALSE, FALSE, 0);
}
else
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
wl->radio1B = radio;
gtk_box_pack_start(GTK_BOX(hbox), radio, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -778,7 +779,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 5, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -789,7 +790,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -809,7 +810,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->cdUndoButtonA), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->cdUndoButtonA, 3, 4, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -853,7 +854,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -873,7 +874,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->dvdUndoButton1A), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->dvdUndoButton1A, 3, 4, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -917,7 +918,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -937,7 +938,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->dvdUndoButton2A), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->dvdUndoButton2A, 3, 4, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -981,7 +982,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -1001,7 +1002,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->bdUndoButton1A), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->bdUndoButton1A, 3, 4, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -1044,7 +1045,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -1064,7 +1065,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->bdUndoButton2A), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->bdUndoButton2A, 3, 4, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -1107,7 +1108,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -1127,7 +1128,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->bdUndoButton3A), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->bdUndoButton3A, 3, 4, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -1172,7 +1173,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
tinybox = gtk_hbox_new(FALSE, 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);
gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
@@ -1192,7 +1193,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
g_signal_connect(G_OBJECT(wl->bdUndoButton4A), "clicked", G_CALLBACK(query_cb), wl);
gtk_table_attach(GTK_TABLE(table), wl->bdUndoButton4A, 3, 4, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5);
hbox = gtk_hbox_new(FALSE, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
@@ -1258,7 +1259,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *entry;
if(!i) wl->radio2A = radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(wl->radio1A));
@@ -1334,7 +1335,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
GuiLockLabelSize(lwoh->linkLabel, _utf("%d MiB of file cache"), 2222);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
int n_entries = sizeof(cache_size)/sizeof(int);
lab = gtk_label_new(_utf("Use"));

View File

@@ -489,7 +489,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
frame = gtk_frame_new(_utf("Error correction data storage"));
gtk_box_pack_start(GTK_BOX(parent), frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new(FALSE, 10);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -498,7 +498,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *radio1, *radio2;
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);
@@ -577,7 +577,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
/* real entry for error correction files */
vbox = gtk_vbox_new(FALSE, 10);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_notebook_append_page(GTK_NOTEBOOK(wl->redundancyNotebook), vbox,
gtk_label_new(""));
@@ -588,7 +588,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new(NULL);
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -619,7 +619,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(i?wl->radio1B:wl->radio1A));
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -649,7 +649,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ hbox = gtk_hbox_new(FALSE, 4);
{ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(i?wl->radio1B:wl->radio1A));
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -697,7 +697,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ hbox = gtk_hbox_new(FALSE, 4);
{ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
radio = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(i?wl->radio1B:wl->radio1A));
g_signal_connect(G_OBJECT(radio), "toggled", G_CALLBACK(toggle_cb), method);
@@ -783,7 +783,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
frame = gtk_frame_new(_utf("I/O parameters"));
gtk_box_pack_start(GTK_BOX(parent), frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new(FALSE, 10);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -797,7 +797,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiLockLabelSize(lwoh->linkLabel, _utf("%d sectors"), 2222);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
int n_entries = sizeof(prefetch_size)/sizeof(int);
lab = gtk_label_new(_utf("Preload"));
@@ -845,7 +845,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *radio1, *radio2;
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);
@@ -913,7 +913,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiLockLabelSize(lwoh->linkLabel, _utf("%d threads"), 22);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
int n_entries = sizeof(threads_count)/sizeof(int);
lab = gtk_label_new(_utf("Use"));
@@ -963,7 +963,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
frame = gtk_frame_new(_utf("Encoding algorithm"));
gtk_box_pack_start(GTK_BOX(parent), frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new(FALSE, 10);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -972,7 +972,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent)
GuiRegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
{ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
GtkWidget *radio1, *radio2, *radio3=NULL, *radio4;
gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0);

View File

@@ -309,7 +309,8 @@ void CreateRS03FixWindow(Method *method, GtkWidget *parent)
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
gtk_box_pack_end(GTK_BOX(parent), notebook, FALSE, FALSE, 0);
hbox = wl->fixFootlineBox = gtk_hbox_new(TRUE, 0);
hbox = wl->fixFootlineBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
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);

View File

@@ -52,7 +52,7 @@ void GuiCreateWelcomePage(GtkNotebook *notebook)
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
ignore = gtk_label_new("welcome_tab");
box = show_msg ? gtk_vbox_new(FALSE, 0) : gtk_hbox_new(FALSE, 10);
box = show_msg ? gtk_box_new(GTK_ORIENTATION_VERTICAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_notebook_append_page(notebook, align, ignore);