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 90316A2A43 for ; Tue, 20 Jun 2023 11:16:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7302332699 for ; Tue, 20 Jun 2023 11:16:14 +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:13 +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 2308E4084E for ; Tue, 20 Jun 2023 11:16:12 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Tue, 20 Jun 2023 11:16:08 +0200 Message-Id: <20230620091610.68835-6-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 AWL 0.000 Adjusted score from AWL reputation of From: address 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 5/7] use basic grid in country/timezone 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:14 -0000 Signed-off-by: Maximiliano Sandoval --- proxinstall | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/proxinstall b/proxinstall index faebdec..29ed8dc 100755 --- a/proxinstall +++ b/proxinstall @@ -1781,12 +1781,12 @@ sub update_layout { my $lastzonecb; sub update_zonelist { - my ($box, $cc) = @_; + my ($grid, $cc) = @_; my $sel = Proxmox::Install::Config::get_timezone(); # initial default if ($lastzonecb) { $sel = $lastzonecb->get_active_text(); - $box->remove($lastzonecb); + $grid->remove($lastzonecb); } my $cb = $lastzonecb = Gtk3::ComboBoxText->new(); @@ -1812,7 +1812,7 @@ sub update_zonelist { $cb->set_active($selected_index || 0); $cb->show; - $box->pack_start($cb, 0, 0, 0); + $grid->attach($cb, 1, 1, 1, 1); } sub create_password_view { @@ -1911,10 +1911,8 @@ sub create_country_view { my $locales = $iso_env->{locales}; - 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 $w = Gtk3::Entry->new(); $w->set_size_request(200, -1); @@ -1925,18 +1923,16 @@ sub create_country_view { $c->set_popup_set_width(1); $c->set_inline_completion(1); - my $hbox2 = Gtk3::Box->new('horizontal', 0); my $label = Gtk3::Label->new("Time zone"); $label->set_size_request(150, -1); $label->set_xalign(1.0); - $hbox2->pack_start($label, 0, 0, 10); - update_zonelist ($hbox2); + $grid->attach($label, 0, 1, 1, 1); + update_zonelist ($grid); - my $hbox3 = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Keyboard Layout"); $label->set_size_request(150, -1); $label->set_xalign(1.0); - $hbox3->pack_start($label, 0, 0, 10); + $grid->attach($label, 0, 2, 1, 1); my $kmapcb = Gtk3::ComboBoxText->new(); $kmapcb->set_size_request (200, -1); @@ -1945,7 +1941,7 @@ sub create_country_view { } update_layout($kmapcb); - $hbox3->pack_start ($kmapcb, 0, 0, 0); + $grid->attach($kmapcb, 1, 2, 1, 1); $kmapcb->signal_connect ('changed' => sub { my $sel = $kmapcb->get_active_text(); @@ -1982,7 +1978,7 @@ sub create_country_view { my $text = $entry->get_text; if (my $cc = $locales->{countryhash}->{lc($text)}) { - update_zonelist($hbox2, $cc); + update_zonelist($grid, $cc); my $kmap = $locales->{country}->{$cc}->{kmap} || 'en-us'; update_layout($kmapcb, $kmap); } @@ -2042,17 +2038,11 @@ sub create_country_view { $w->set_completion ($c); - my $hbox = Gtk3::Box->new('horizontal', 0); - $label = Gtk3::Label->new("Country"); $label->set_xalign(1.0); $label->set_size_request(150, -1); - $hbox->pack_start($label, 0, 0, 10); - $hbox->pack_start($w, 0, 0, 0); - - $vbox->pack_start($hbox, 0, 0, 5); - $vbox->pack_start($hbox2, 0, 0, 5); - $vbox->pack_start($hbox3, 0, 0, 5); + $grid->attach($label, 0, 0, 1, 1); + $grid->attach($w, 1, 0, 1, 1); my $country = Proxmox::Install::Config::get_country(); if ($country && (my $entry = $locales->{country}->{$country})) { -- 2.39.2