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 991D69B985 for ; Tue, 21 Nov 2023 11:46:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7F1736B2A for ; Tue, 21 Nov 2023 11:46:00 +0100 (CET) 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, 21 Nov 2023 11:45:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 809FE40E79 for ; Tue, 21 Nov 2023 11:45:59 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 21 Nov 2023 11:45:49 +0100 Message-ID: <20231121104552.505851-3-c.heiss@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121104552.505851-1-c.heiss@proxmox.com> References: <20231121104552.505851-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 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] tui: preserve autoreboot checkbox state when switching views 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, 21 Nov 2023 10:46:30 -0000 Instead of reading the checkbox when continuing to the next screen, save its toggle status to the installer state instead on change. Reported-by: Fiona Ebner Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/main.rs | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index 15340e1..2462a58 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -8,7 +8,7 @@ use cursive::{ view::{Nameable, Offset, Resizable, ViewWrapper}, views::{ Button, Checkbox, Dialog, DummyView, EditView, Layer, LinearLayout, PaddedView, Panel, - ResizedView, ScrollView, SelectView, StackView, TextView, ViewRef, + ResizedView, ScrollView, SelectView, StackView, TextView, }, Cursive, CursiveRunnable, ScreenId, View, XY, }; @@ -171,7 +171,7 @@ fn main() { timezone: TimezoneOptions::defaults_from(&runtime_info, &locales), password: Default::default(), network: NetworkOptions::defaults_from(&setup_info, &runtime_info.network), - autoreboot: false, + autoreboot: true, }, setup_info, runtime_info, @@ -612,6 +612,7 @@ impl TableViewItem for SummaryOption { fn summary_dialog(siv: &mut Cursive) -> InstallerView { let state = siv.user_data::().unwrap(); + let autoreboot = state.options.autoreboot; let mut bbar = LinearLayout::horizontal() .child(abort_install_button()) @@ -619,20 +620,20 @@ fn summary_dialog(siv: &mut Cursive) -> InstallerView { .child(Button::new("Previous", switch_to_prev_screen)) .child(DummyView) .child(Button::new("Install", |siv| { - let autoreboot = siv - .find_name("reboot-after-install") - .map(|v: ViewRef| v.is_checked()) - .unwrap_or_default(); - - siv.with_user_data(|state: &mut InstallerState| { - state.options.autoreboot = autoreboot; - }); - switch_to_next_screen(siv, InstallerStep::Install, &install_progress_dialog); })); let _ = bbar.set_focus_index(2); // ignore errors + let autoreboot_checkbox = + Checkbox::new() + .with_checked(autoreboot) + .on_change(|siv, autoreboot| { + siv.with_user_data(|state: &mut InstallerState| { + state.options.autoreboot = autoreboot; + }); + }); + let mut inner = LinearLayout::vertical() .child(PaddedView::lrtb( 0, @@ -649,7 +650,7 @@ fn summary_dialog(siv: &mut Cursive) -> InstallerView { .child( LinearLayout::horizontal() .child(DummyView.full_width()) - .child(Checkbox::new().checked().with_name("reboot-after-install")) + .child(autoreboot_checkbox) .child( TextView::new(" Automatically reboot after successful installation").no_wrap(), ) -- 2.42.0