From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A8935A2AA1 for ; Tue, 20 Jun 2023 11:16:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 774783266A for ; Tue, 20 Jun 2023 11:16:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 20 Jun 2023 11:16:12 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C5F2941BB2 for ; Tue, 20 Jun 2023 11:16:11 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Tue, 20 Jun 2023 11:16:07 +0200 Message-Id: <20230620091610.68835-5-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620091610.68835-1-m.sandoval@proxmox.com> References: <20230620091610.68835-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH installer 4/7] use basic grid in password panel X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jun 2023 09:16:43 -0000 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 --- proxinstall | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/proxinstall b/proxinstall index 7e1bcd4..faebdec 100755 --- a/proxinstall +++ b/proxinstall @@ -1821,47 +1821,43 @@ 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 $mailto = Proxmox::Install::Config::get_mailto(); + 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); - + $eme->set_text($mailto); + $eme->set_margin_top(10); - $vbox->pack_start($hbox1, 0, 0, 5); - $vbox->pack_start($hbox2, 0, 0, 5); - $vbox->pack_start($hbox3, 0, 0, 15); + $grid->attach($eme, 1, 2, 1, 1); $gtk_state->{inbox}->show_all; -- 2.39.2