From 9c82a08834cf01a1176dab8a2f0065209a7e538a Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Tue, 6 Aug 2024 19:52:58 +0300 Subject: [PATCH] fix warn --- src/eula_page/mod.rs | 56 ++++++++++++++++++++-------------------- src/language_page/mod.rs | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/eula_page/mod.rs b/src/eula_page/mod.rs index 8f1c9b2..a2f7148 100644 --- a/src/eula_page/mod.rs +++ b/src/eula_page/mod.rs @@ -69,34 +69,6 @@ pub fn eula_page( content_box.append(&eula_selection_text_scroll); content_box.append(&eula_accept_checkbutton); - eula_page.set_child_widget(&content_box); - - eula_page.connect_closure( - "back-button-pressed", - false, - closure_local!( - #[weak] - main_carousel, - move |language_page: installer_stack_page::InstallerStackPage| - { - main_carousel.scroll_to(&main_carousel.nth_page(1), true) - } - ) - ); - - eula_page.connect_closure( - "next-button-pressed", - false, - closure_local!( - #[weak] - main_carousel, - move |language_page: installer_stack_page::InstallerStackPage| - { - main_carousel.scroll_to(&main_carousel.nth_page(3), true) - } - ) - ); - // language_changed_action.connect_activate( clone!( @@ -121,5 +93,33 @@ pub fn eula_page( ); // + eula_page.set_child_widget(&content_box); + + eula_page.connect_closure( + "back-button-pressed", + false, + closure_local!( + #[weak] + main_carousel, + move |language_page: installer_stack_page::InstallerStackPage| + { + main_carousel.scroll_to(&main_carousel.nth_page(1), true) + } + ) + ); + + eula_page.connect_closure( + "next-button-pressed", + false, + closure_local!( + #[weak] + main_carousel, + move |_language_page: installer_stack_page::InstallerStackPage| + { + main_carousel.scroll_to(&main_carousel.nth_page(3), true) + } + ) + ); + main_carousel.append(&eula_page); } \ No newline at end of file diff --git a/src/language_page/mod.rs b/src/language_page/mod.rs index 42ff808..e25f2f6 100644 --- a/src/language_page/mod.rs +++ b/src/language_page/mod.rs @@ -331,7 +331,7 @@ pub fn language_page( main_carousel, #[strong] language_changed_action, - move |language_page: installer_stack_page::InstallerStackPage| + move |_language_page: installer_stack_page::InstallerStackPage| { if Path::new("/tmp/pika-installer-gtk4-lang.txt").exists() { fs::remove_file("/tmp/pika-installer-gtk4-lang.txt").expect("Bad permissions on /tmp/pika-installer-gtk4-lang.txt");