Replace GtkAlignment widget

This commit is contained in:
Paul Dicker
2025-04-07 15:08:11 +02:00
committed by Stéphane Lesimple
parent 3757f9c9a8
commit 697b116374
3 changed files with 16 additions and 17 deletions

View File

@@ -601,17 +601,17 @@ static void dont_ask_again_cb(GtkWidget *widget, gpointer data)
} }
static void insert_button(GtkDialog *dialog) static void insert_button(GtkDialog *dialog)
{ GtkWidget *check,*align; { GtkWidget *check,*hbox;
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), align, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0);
check = gtk_check_button_new_with_label(_utf("Do not ask again")); check = gtk_check_button_new_with_label(_utf("Do not ask again"));
gtk_container_add(GTK_CONTAINER(align), check); gtk_box_set_center_widget(GTK_BOX(hbox), check);
gtk_container_set_border_width(GTK_CONTAINER(align), 10); gtk_container_set_border_width(GTK_CONTAINER(check), 10);
g_signal_connect(G_OBJECT(check), "toggled", G_CALLBACK(dont_ask_again_cb), NULL); g_signal_connect(G_OBJECT(check), "toggled", G_CALLBACK(dont_ask_again_cb), NULL);
gtk_widget_show(align); gtk_widget_show(hbox);
gtk_widget_show(check); gtk_widget_show(check);
} }

View File

@@ -44,21 +44,21 @@ static void no_rs02_cb(GtkWidget *widget, gpointer data)
} }
static void insert_buttons(GtkDialog *dialog) static void insert_buttons(GtkDialog *dialog)
{ GtkWidget *check,*align; { GtkWidget *check,*hbox;
gtk_dialog_add_buttons(dialog, gtk_dialog_add_buttons(dialog,
_utf("Skip RS02 test"), 1, _utf("Skip RS02 test"), 1,
_utf("Continue searching"), 0, NULL); _utf("Continue searching"), 0, NULL);
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), align, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0);
check = gtk_check_button_new_with_label(_utf("Disable RS02 initialization in the preferences")); check = gtk_check_button_new_with_label(_utf("Disable RS02 initialization in the preferences"));
gtk_container_add(GTK_CONTAINER(align), check); gtk_box_set_center_widget(GTK_BOX(hbox), check);
gtk_container_set_border_width(GTK_CONTAINER(align), 10); gtk_container_set_border_width(GTK_CONTAINER(check), 10);
g_signal_connect(G_OBJECT(check), "toggled", G_CALLBACK(no_rs02_cb), NULL); g_signal_connect(G_OBJECT(check), "toggled", G_CALLBACK(no_rs02_cb), NULL);
gtk_widget_show(align); gtk_widget_show(hbox);
gtk_widget_show(check); gtk_widget_show(check);
} }
#endif /* WITH_GUI_YES */ #endif /* WITH_GUI_YES */

View File

@@ -45,18 +45,17 @@ static void toggle_cb(GtkWidget *widget, gpointer data)
*/ */
void GuiCreateWelcomePage(GtkNotebook *notebook) void GuiCreateWelcomePage(GtkNotebook *notebook)
{ GtkWidget *box,*button,*align,*ignore; { GtkWidget *box,*button,*ignore;
int show_msg; int show_msg;
show_msg = Closure->welcomeMessage || Closure->version != Closure->dotFileVersion; show_msg = Closure->welcomeMessage || Closure->version != Closure->dotFileVersion;
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
ignore = gtk_label_new("welcome_tab"); ignore = gtk_label_new("welcome_tab");
box = show_msg ? gtk_box_new(GTK_ORIENTATION_VERTICAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 10); box = show_msg ? gtk_box_new(GTK_ORIENTATION_VERTICAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
gtk_widget_set_valign(box, GTK_ALIGN_CENTER);
gtk_notebook_append_page(notebook, align, ignore); gtk_notebook_append_page(notebook, box, ignore);
gtk_container_add(GTK_CONTAINER(align), box);
if(!show_msg) if(!show_msg)
{ return; // simply leave the window blank { return; // simply leave the window blank