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 2D7C9A18CD for ; Thu, 15 Jun 2023 14:15:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 119EB26B85 for ; Thu, 15 Jun 2023 14:15:06 +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 ; Thu, 15 Jun 2023 14:15:05 +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 E6EBE45867 for ; Thu, 15 Jun 2023 14:15:04 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Thu, 15 Jun 2023 14:15:01 +0200 Message-Id: <20230615121503.84263-3-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615121503.84263-1-m.sandoval@proxmox.com> References: <20230615121503.84263-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 2/4] stop using Gtk3::HBox and Gtk3::VBox 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: Thu, 15 Jun 2023 12:15:36 -0000 These widgets were deprecated in GTK 3.2 and replaced by Gtk3::Box which was introduced in 3.0. The packing changes require to horizontally expand the WebKit2::WebView widget. Signed-off-by: Maximiliano Sandoval --- proxinstall | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/proxinstall b/proxinstall index 00b2d14..105904f 100755 --- a/proxinstall +++ b/proxinstall @@ -1493,7 +1493,7 @@ sub create_main_window { $window->fullscreen() if !is_test_mode(); $window->set_decorated(0) if !is_test_mode(); - my $vbox = Gtk3::VBox->new(0, 0); + my $vbox = Gtk3::Box->new('vertical', 0); my $logofn = "$env->{product}-banner.png"; my $image = Gtk3::Image->new_from_file("${proxmox_libdir}/$logofn"); @@ -1506,7 +1506,7 @@ sub create_main_window { $vbox->pack_start($image, 0, 0, 0); - my $hbox = Gtk3::HBox->new(0, 0); + my $hbox = Gtk3::Box->new('horizontal', 0); $vbox->pack_start($hbox, 1, 1, 0); # my $f1 = Gtk3::Frame->new ('test'); @@ -1516,7 +1516,7 @@ sub create_main_window { my $sep1 = Gtk3::HSeparator->new(); $vbox->pack_start($sep1, 0, 0, 0); - $cmdbox = Gtk3::HBox->new(); + $cmdbox = Gtk3::Box->new('horizontal', 0); $vbox->pack_start($cmdbox, 0, 0, 10); $next = Gtk3::Button->new('_Next'); @@ -1534,25 +1534,26 @@ sub create_main_window { $cmdbox->pack_start($abort, 0, 0, 10); $abort->signal_connect(clicked => sub { exit (-1); }); - my $vbox2 = Gtk3::VBox->new(0, 0); + my $vbox2 = Gtk3::Box->new('vertical', 0); $hbox->add($vbox2); $htmlview = Gtk3::WebKit2::WebView->new(); + $htmlview->set_hexpand(1); my $scrolls = Gtk3::ScrolledWindow->new(); $scrolls->add($htmlview); - my $hbox2 = Gtk3::HBox->new(0, 0); + my $hbox2 = Gtk3::Box->new('horizontal', 0); $hbox2->pack_start($scrolls, 1, 1, 0); $vbox2->pack_start($hbox2, 1, 1, 0); - my $vbox3 = Gtk3::VBox->new(0, 0); + my $vbox3 = Gtk3::Box->new('vertical', 0); $vbox2->pack_start($vbox3, 0, 0, 0); my $sep2 = Gtk3::HSeparator->new; $vbox3->pack_start($sep2, 0, 0, 0); - $inbox = Gtk3::HBox->new(0, 0); + $inbox = Gtk3::Box->new('horizontal', 0); $vbox3->pack_start($inbox, 0, 0, 0); $window->add($vbox); @@ -1741,7 +1742,7 @@ sub create_ipconf_view { $device_cb->set_active(0); } - my $devicebox = Gtk3::HBox->new(0, 0); + my $devicebox = Gtk3::Box->new('horizontal', 0); my $label = Gtk3::Label->new("Management Interface:"); $label->set_size_request(150, -1); $label->set_xalign(1.0); @@ -1861,7 +1862,7 @@ sub create_ack_view { cleanup_view(); - my $vbox = Gtk3::VBox->new(0, 0); + my $vbox = Gtk3::Box->new('vertical', 0); $inbox->pack_start($vbox, 1, 0, 0); my $reboot_checkbox = Gtk3::CheckButton->new('Automatically reboot after successful installation'); @@ -2000,12 +2001,12 @@ sub create_password_view { cleanup_view(); - my $vbox2 = Gtk3::VBox->new(0, 0); + my $vbox2 = Gtk3::Box->new('vertical', 0); $inbox->pack_start($vbox2, 1, 0, 0); - my $vbox = Gtk3::VBox->new(0, 0); + my $vbox = Gtk3::Box->new('vertical', 0); $vbox2->pack_start($vbox, 0, 0, 10); - my $hbox1 = Gtk3::HBox->new(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); @@ -2016,7 +2017,7 @@ sub create_password_view { $pwe1->set_size_request(200, -1); $hbox1->pack_start($pwe1, 0, 0, 0); - my $hbox2 = Gtk3::HBox->new(0, 0); + my $hbox2 = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Confirm"); $label->set_size_request(150, -1); $label->set_xalign(1.0); @@ -2027,7 +2028,7 @@ sub create_password_view { $pwe2->set_size_request(200, -1); $hbox2->pack_start($pwe2, 0, 0, 0); - my $hbox3 = Gtk3::HBox->new(0, 0); + my $hbox3 = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Email"); $label->set_size_request(150, -1); $label->set_xalign(1.0); @@ -2095,9 +2096,9 @@ sub create_country_view { my $locales = $env->{locales}; - my $vbox2 = Gtk3::VBox->new(0, 0); + my $vbox2 = Gtk3::Box->new('vertical', 0); $inbox->pack_start($vbox2, 1, 0, 0); - my $vbox = Gtk3::VBox->new(0, 0); + my $vbox = Gtk3::Box->new('vertical', 0); $vbox2->pack_start($vbox, 0, 0, 10); my $w = Gtk3::Entry->new(); @@ -2109,14 +2110,14 @@ sub create_country_view { $c->set_popup_set_width(1); $c->set_inline_completion(1); - my $hbox2 = Gtk3::HBox->new(0, 0); + 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); - my $hbox3 = Gtk3::HBox->new(0, 0); + my $hbox3 = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Keyboard Layout"); $label->set_size_request(150, -1); $label->set_xalign(1.0); @@ -2227,7 +2228,7 @@ sub create_country_view { $w->set_completion ($c); - my $hbox = Gtk3::HBox->new(0, 0); + my $hbox = Gtk3::Box->new('horizontal', 0); $label = Gtk3::Label->new("Country"); $label->set_xalign(1.0); @@ -2855,9 +2856,9 @@ sub create_hdsel_view { cleanup_view(); - my $vbox = Gtk3::VBox->new(0, 0); + my $vbox = Gtk3::Box->new('vertical', 0); $inbox->pack_start($vbox, 1, 0, 0); - my $hbox = Gtk3::HBox->new(0, 0); + my $hbox = Gtk3::Box->new('horizontal', 0); $vbox->pack_start($hbox, 0, 0, 10); my $cached_disks = get_cached_disks(); @@ -2942,12 +2943,12 @@ sub create_extract_view { $prev_btn->set_sensitive(0); $prev_btn->hide(); - my $vbox = Gtk3::VBox->new(0, 0); + my $vbox = Gtk3::Box->new('vertical', 0); $inbox->pack_start ($vbox, 1, 0, 0); - my $hbox = Gtk3::HBox->new(0, 0); + my $hbox = Gtk3::Box->new('horizontal', 0); $vbox->pack_start ($hbox, 0, 0, 10); - my $vbox2 = Gtk3::VBox->new(0, 0); + my $vbox2 = Gtk3::Box->new('vertical', 0); $hbox->pack_start ($vbox2, 0, 0, 0); $progress_status = Gtk3::Label->new(''); -- 2.39.2