From 55c2294948f9b6587c960b78db06cb3c1eee1da5 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Tue, 21 Nov 2023 16:10:21 +0100 Subject: [PATCH] gui: use basic grid in password panel The extra 10px margin on the email row was added to account for the removed line: $vbox->pack_start($hbox3, 0, 0, 15); Signed-off-by: Maximiliano Sandoval Reviewed-by: Christoph Heiss Tested-by: Christoph Heiss Tested-by: Tested-by: Lukas Wagner --- proxinstall | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/proxinstall b/proxinstall index 4b1d943..9294856 100755 --- a/proxinstall +++ b/proxinstall @@ -688,47 +688,40 @@ sub create_password_view { my $password = Proxmox::Install::Config::get_password(); - my $vbox2 = Gtk3::Box->new('vertical', 0); - $gtk_state->{inbox}->pack_start($vbox2, 1, 0, 0); - my $vbox = Gtk3::Box->new('vertical', 0); - $vbox2->pack_start($vbox, 0, 0, 10); + my $grid = &$create_basic_grid(); + $gtk_state->{inbox}->pack_start($grid, 0, 0, 0); - my $hbox1 = Gtk3::Box->new('horizontal', 0); my $label = Gtk3::Label->new("Password"); $label->set_size_request(150, -1); $label->set_xalign(1.0); - $hbox1->pack_start($label, 0, 0, 10); + $grid->attach($label, 0, 0, 1, 1); my $pwe1 = Gtk3::Entry->new(); $pwe1->set_visibility(0); $pwe1->set_text($password) if $password; $pwe1->set_size_request(200, -1); - $hbox1->pack_start($pwe1, 0, 0, 0); + $grid->attach($pwe1, 1, 0, 1, 1); - my $hbox2 = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Confirm"); $label->set_size_request(150, -1); $label->set_xalign(1.0); - $hbox2->pack_start($label, 0, 0, 10); + $grid->attach($label, 0, 1, 1, 1); my $pwe2 = Gtk3::Entry->new(); $pwe2->set_visibility(0); $pwe2->set_text($password) if $password; $pwe2->set_size_request(200, -1); - $hbox2->pack_start($pwe2, 0, 0, 0); + $grid->attach($pwe2, 1, 1, 1, 1); - my $hbox3 = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Email"); $label->set_size_request(150, -1); $label->set_xalign(1.0); - $hbox3->pack_start($label, 0, 0, 10); + $label->set_margin_top(10); + $grid->attach($label, 0, 2, 1, 1); + my $eme = Gtk3::Entry->new(); $eme->set_size_request(200, -1); $eme->set_text(Proxmox::Install::Config::get_mailto()); - $hbox3->pack_start($eme, 0, 0, 0); - - - $vbox->pack_start($hbox1, 0, 0, 5); - $vbox->pack_start($hbox2, 0, 0, 5); - $vbox->pack_start($hbox3, 0, 0, 15); + $eme->set_margin_top(10); + $grid->attach($eme, 1, 2, 1, 1); $gtk_state->{inbox}->show_all; -- 2.39.2