This commit is contained in:
Ward from fusion-voyager-3 2024-08-06 19:52:58 +03:00
parent 10bd5ca9e9
commit 9c82a08834
2 changed files with 29 additions and 29 deletions

View File

@ -69,34 +69,6 @@ pub fn eula_page(
content_box.append(&eula_selection_text_scroll); content_box.append(&eula_selection_text_scroll);
content_box.append(&eula_accept_checkbutton); 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( language_changed_action.connect_activate(
clone!( 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); main_carousel.append(&eula_page);
} }

View File

@ -331,7 +331,7 @@ pub fn language_page(
main_carousel, main_carousel,
#[strong] #[strong]
language_changed_action, 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() { 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"); fs::remove_file("/tmp/pika-installer-gtk4-lang.txt").expect("Bad permissions on /tmp/pika-installer-gtk4-lang.txt");