From 73e3c6da5364a98d03561bcebad8214cc0c2c2b3 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Fri, 23 Feb 2024 01:06:14 +0300 Subject: [PATCH] No drivers detected page --- src/build_ui/mod.rs | 323 ++++++++++++++++++++++++-------------------- 1 file changed, 179 insertions(+), 144 deletions(-) diff --git a/src/build_ui/mod.rs b/src/build_ui/mod.rs index d42f630..b336e81 100644 --- a/src/build_ui/mod.rs +++ b/src/build_ui/mod.rs @@ -112,7 +112,7 @@ pub fn build_ui(app: &adw::Application) { window.connect_hide(clone!(@weak window => move |_| save_window_size(&window, &glib_settings))); window.connect_hide(clone!(@weak window => move |_| window.destroy())); - credits_button.connect_clicked(clone!(@weak credits_button => move |_| credits_window.show())); + credits_button.connect_clicked(clone!(@weak credits_button => move |_| credits_window.present())); let (drive_hws_sender, drive_hws_receiver) = async_channel::unbounded(); let drive_hws_sender = drive_hws_sender.clone(); @@ -124,10 +124,10 @@ pub fn build_ui(app: &adw::Application) { .output() .expect("failed to execute process"); - let ubuntu_drivers_list_utf8 = String::from_utf8(ubuntu_drivers_list_cli.stdout).unwrap(); + let ubuntu_drivers_list_utf8 = String::from_utf8(ubuntu_drivers_list_cli.stdout).unwrap_or_default(); drive_hws_sender .send_blocking(ubuntu_drivers_list_utf8) - .expect("The channel needs to be open."); + .expect("channel needs to be open.") }); window.present(); @@ -245,149 +245,150 @@ fn get_drivers( driver_array.sort_by(|a, b| b.cmp(a)) } - driver_array.into_iter().for_each(|driver_package| { - let group = device_groups - .entry(driver_package.clone().device.to_owned()) - .or_insert(vec![]); - group.push(driver_package); - }); - for (device, group) in device_groups { - let device_label = gtk::Label::builder() - .label("Device: ".to_owned() + &device) - .halign(gtk::Align::Center) - .valign(gtk::Align::Center) - .build(); - device_label.add_css_class("deviceLabel"); - - main_box.append(&device_label); - - let drivers_list_row = gtk::ListBox::builder() - .margin_top(20) - .margin_bottom(20) - .margin_start(20) - .margin_end(20) - .vexpand(true) - .hexpand(true) - .build(); - drivers_list_row.add_css_class("boxed-list"); - - main_box.append(&drivers_list_row); - - for driver in group.iter() { - - let (log_loop_sender, log_loop_receiver) = async_channel::unbounded(); - let log_loop_sender: async_channel::Sender = log_loop_sender.clone(); - - let (log_status_loop_sender, log_status_loop_receiver) = async_channel::unbounded(); - let log_status_loop_sender: async_channel::Sender = log_status_loop_sender.clone(); - - let driver_package_ind = driver.driver.to_owned(); - let driver_expander_row = adw::ExpanderRow::new(); - let driver_icon = gtk::Image::builder() - .icon_name(driver.clone().icon) - .pixel_size(32) - .build(); - let driver_description_label = gtk::Label::builder() - .label(driver.clone().description) - .build(); - let driver_content_row = adw::ActionRow::builder().build(); - let driver_install_button = gtk::Button::builder() - .margin_start(5) - .margin_top(5) - .margin_bottom(5) + if !driver_array.is_empty() { + driver_array.into_iter().for_each(|driver_package| { + let group = device_groups + .entry(driver_package.clone().device.to_owned()) + .or_insert(vec![]); + group.push(driver_package); + }); + for (device, group) in device_groups { + let device_label = gtk::Label::builder() + .label("Device: ".to_owned() + &device) + .halign(gtk::Align::Center) .valign(gtk::Align::Center) - .label("Install") - .tooltip_text("Install the driver package.") - .sensitive(false) .build(); - driver_install_button.add_css_class("suggested-action"); - let driver_remove_button = gtk::Button::builder() - .margin_end(5) - .margin_top(5) - .margin_bottom(5) - .valign(gtk::Align::Center) - .label("Uninstall") - .tooltip_text("Uninstall the driver package.") - .sensitive(false) + device_label.add_css_class("deviceLabel"); + + main_box.append(&device_label); + + let drivers_list_row = gtk::ListBox::builder() + .margin_top(20) + .margin_bottom(20) + .margin_start(20) + .margin_end(20) + .vexpand(true) + .hexpand(true) .build(); - let driver_action_box = gtk::Box::builder().homogeneous(true).build(); - driver_remove_button.add_css_class("destructive-action"); - driver_expander_row.add_prefix(&driver_icon); - if driver.clone().experimental == true { - driver_expander_row.set_title( - &(driver.clone().driver - + " (WARNING: THIS DRIVER IS EXPERMINTAL USE AT YOUR OWN RISK!)"), - ); - driver_expander_row.add_css_class("midLabelWARN"); - } else { - driver_expander_row.set_title(&driver.clone().driver); - } - driver_expander_row.set_subtitle(&driver.clone().version); - // - driver_content_row.add_prefix(&driver_description_label); - driver_action_box.append(&driver_remove_button); - driver_action_box.append(&driver_install_button); - driver_content_row.add_suffix(&driver_action_box); - driver_expander_row.add_row(&driver_content_row); - // - let command_installed_status = Command::new("dpkg") - .args(["-s", &driver.clone().driver]) - .output() - .unwrap(); - if command_installed_status.status.success() { - driver_install_button.set_sensitive(false); - if !driver.clone().driver.contains("mesa") { - driver_remove_button.set_sensitive(true); + drivers_list_row.add_css_class("boxed-list"); + + main_box.append(&drivers_list_row); + + for driver in group.iter() { + + let (log_loop_sender, log_loop_receiver) = async_channel::unbounded(); + let log_loop_sender: async_channel::Sender = log_loop_sender.clone(); + + let (log_status_loop_sender, log_status_loop_receiver) = async_channel::unbounded(); + let log_status_loop_sender: async_channel::Sender = log_status_loop_sender.clone(); + + let driver_package_ind = driver.driver.to_owned(); + let driver_expander_row = adw::ExpanderRow::new(); + let driver_icon = gtk::Image::builder() + .icon_name(driver.clone().icon) + .pixel_size(32) + .build(); + let driver_description_label = gtk::Label::builder() + .label(driver.clone().description) + .build(); + let driver_content_row = adw::ActionRow::builder().build(); + let driver_install_button = gtk::Button::builder() + .margin_start(5) + .margin_top(5) + .margin_bottom(5) + .valign(gtk::Align::Center) + .label("Install") + .tooltip_text("Install the driver package.") + .sensitive(false) + .build(); + driver_install_button.add_css_class("suggested-action"); + let driver_remove_button = gtk::Button::builder() + .margin_end(5) + .margin_top(5) + .margin_bottom(5) + .valign(gtk::Align::Center) + .label("Uninstall") + .tooltip_text("Uninstall the driver package.") + .sensitive(false) + .build(); + let driver_action_box = gtk::Box::builder().homogeneous(true).build(); + driver_remove_button.add_css_class("destructive-action"); + driver_expander_row.add_prefix(&driver_icon); + if driver.clone().experimental == true { + driver_expander_row.set_title( + &(driver.clone().driver + + " (WARNING: THIS DRIVER IS EXPERMINTAL USE AT YOUR OWN RISK!)"), + ); + driver_expander_row.add_css_class("midLabelWARN"); + } else { + driver_expander_row.set_title(&driver.clone().driver); } - } else { - driver_remove_button.set_sensitive(false); - driver_install_button.set_sensitive(true); - } - // - let driver_install_log_terminal_buffer = gtk::TextBuffer::builder().build(); + driver_expander_row.set_subtitle(&driver.clone().version); + // + driver_content_row.add_prefix(&driver_description_label); + driver_action_box.append(&driver_remove_button); + driver_action_box.append(&driver_install_button); + driver_content_row.add_suffix(&driver_action_box); + driver_expander_row.add_row(&driver_content_row); + // + let command_installed_status = Command::new("dpkg") + .args(["-s", &driver.clone().driver]) + .output() + .unwrap(); + if command_installed_status.status.success() { + driver_install_button.set_sensitive(false); + if !driver.clone().driver.contains("mesa") { + driver_remove_button.set_sensitive(true); + } + } else { + driver_remove_button.set_sensitive(false); + driver_install_button.set_sensitive(true); + } + // + let driver_install_log_terminal_buffer = gtk::TextBuffer::builder().build(); - let driver_install_log_terminal = gtk::TextView::builder() - .vexpand(true) - .hexpand(true) - .editable(false) - .buffer(&driver_install_log_terminal_buffer) - .build(); + let driver_install_log_terminal = gtk::TextView::builder() + .vexpand(true) + .hexpand(true) + .editable(false) + .buffer(&driver_install_log_terminal_buffer) + .build(); - let driver_install_log_terminal_scroll = gtk::ScrolledWindow::builder() - .width_request(400) - .height_request(200) - .vexpand(true) - .hexpand(true) - .child(&driver_install_log_terminal) - .build(); + let driver_install_log_terminal_scroll = gtk::ScrolledWindow::builder() + .width_request(400) + .height_request(200) + .vexpand(true) + .hexpand(true) + .child(&driver_install_log_terminal) + .build(); - let driver_install_dialog = adw::MessageDialog::builder() - .transient_for(window) - .hide_on_close(true) - .extra_child(&driver_install_log_terminal_scroll) - .width_request(400) - .height_request(200) - .heading("driver_install_dialog_heading") - .build(); - driver_install_dialog - .add_response("driver_install_dialog_ok", "driver_install_dialog_ok_label"); - driver_install_dialog - .add_response("driver_install_dialog_reboot", "driver_install_dialog_reboot_label"); - driver_install_dialog.set_response_appearance("driver_install_dialog_reboot", adw::ResponseAppearance::Suggested); - // + let driver_install_dialog = adw::MessageDialog::builder() + .transient_for(window) + .hide_on_close(true) + .extra_child(&driver_install_log_terminal_scroll) + .width_request(400) + .height_request(200) + .heading("driver_install_dialog_heading") + .build(); + driver_install_dialog + .add_response("driver_install_dialog_ok", "driver_install_dialog_ok_label"); + driver_install_dialog + .add_response("driver_install_dialog_reboot", "driver_install_dialog_reboot_label"); + driver_install_dialog.set_response_appearance("driver_install_dialog_reboot", adw::ResponseAppearance::Suggested); + // - // - let log_loop_context = MainContext::default(); - // The main loop executes the asynchronous block - log_loop_context.spawn_local(clone!(@weak driver_install_log_terminal_buffer, @weak driver_install_dialog, @strong log_loop_receiver => async move { + // + let log_loop_context = MainContext::default(); + // The main loop executes the asynchronous block + log_loop_context.spawn_local(clone!(@weak driver_install_log_terminal_buffer, @weak driver_install_dialog, @strong log_loop_receiver => async move { while let Ok(state) = log_loop_receiver.recv().await { driver_install_log_terminal_buffer.insert(&mut driver_install_log_terminal_buffer.end_iter(), &("\n".to_string() + &state)) } })); - let log_status_loop_context = MainContext::default(); - // The main loop executes the asynchronous block - log_status_loop_context.spawn_local(clone!(@weak driver_install_dialog, @strong log_status_loop_receiver => async move { + let log_status_loop_context = MainContext::default(); + // The main loop executes the asynchronous block + log_status_loop_context.spawn_local(clone!(@weak driver_install_dialog, @strong log_status_loop_receiver => async move { while let Ok(state) = log_status_loop_receiver.recv().await { if state == true { driver_install_dialog.set_response_enabled("driver_install_dialog_ok", true); @@ -400,22 +401,18 @@ fn get_drivers( } else { driver_install_dialog.set_response_enabled("driver_install_dialog_ok", true); driver_install_dialog.set_body(&t!("driver_install_dialog_success_false")); - if get_current_username().unwrap() == "pikaos" { - driver_install_dialog.set_response_enabled("driver_install_dialog_reboot", false); - } else { - driver_install_dialog.set_response_enabled("driver_install_dialog_reboot", true); - } + driver_install_dialog.set_response_enabled("driver_install_dialog_reboot", false); } } })); - // - driver_install_log_terminal_buffer.connect_changed(clone!(@weak driver_install_log_terminal, @weak driver_install_log_terminal_buffer,@weak driver_install_log_terminal_scroll => move |_|{ + // + driver_install_log_terminal_buffer.connect_changed(clone!(@weak driver_install_log_terminal, @weak driver_install_log_terminal_buffer,@weak driver_install_log_terminal_scroll => move |_|{ if driver_install_log_terminal_scroll.vadjustment().upper() - driver_install_log_terminal_scroll.vadjustment().value() > 100.0 { driver_install_log_terminal_scroll.vadjustment().set_value(driver_install_log_terminal_scroll.vadjustment().upper()) } })); - // - driver_install_button.connect_clicked(clone!(@weak driver_install_log_terminal,@weak driver_install_log_terminal_buffer, @weak driver_install_dialog, @strong log_loop_sender, @strong log_status_loop_sender => move |_| { + // + driver_install_button.connect_clicked(clone!(@weak driver_install_log_terminal,@weak driver_install_log_terminal_buffer, @weak driver_install_dialog, @strong log_loop_sender, @strong log_status_loop_sender, @strong driver_package_ind => move |_| { driver_install_log_terminal_buffer.delete(&mut driver_install_log_terminal_buffer.bounds().0, &mut driver_install_log_terminal_buffer.bounds().1); driver_install_dialog.set_response_enabled("driver_install_dialog_ok", false); driver_install_dialog.set_response_enabled("driver_install_dialog_reboot", false); @@ -442,10 +439,48 @@ fn get_drivers( } })); })); - // - drivers_list_row.append(&driver_expander_row); + driver_remove_button.connect_clicked(clone!(@weak driver_install_log_terminal,@weak driver_install_log_terminal_buffer, @weak driver_install_dialog, @strong log_loop_sender, @strong log_status_loop_sender, @strong driver_package_ind => move |_| { + driver_install_log_terminal_buffer.delete(&mut driver_install_log_terminal_buffer.bounds().0, &mut driver_install_log_terminal_buffer.bounds().1); + driver_install_dialog.set_response_enabled("driver_install_dialog_ok", false); + driver_install_dialog.set_response_enabled("driver_install_dialog_reboot", false); + driver_install_dialog.set_body(""); + driver_install_dialog.choose(None::<&gio::Cancellable>, move |choice| { + if choice == "driver_install_dialog_reboot" { + Command::new("systemctl") + .arg("reboot") + .spawn() + .expect("systemctl reboot failed to start"); + } + }); + gio::spawn_blocking(clone!(@strong log_loop_sender, @strong log_status_loop_sender, @strong driver_package_ind => move || { + let command = driver_modify(log_loop_sender, &driver_package_ind); + match command { + Ok(_) => { + println!("Status: Driver modify Successful"); + log_status_loop_sender.send_blocking(true).expect("The channel needs to be open."); + } + Err(_) => { + println!("Status: Driver modify Failed"); + log_status_loop_sender.send_blocking(false).expect("The channel needs to be open."); + } + } + })); + })); + // + drivers_list_row.append(&driver_expander_row); + } } + } else { + let window_no_drivers_box_text = adw::StatusPage::builder() + .icon_name("face-cool") + .title(t!("first_setup_gameutils_box_text_title")) + .description(t!("first_setup_gameutils_box_text_description")) + .build(); + window_no_drivers_box_text.add_css_class("compact"); + + window_box.append(&window_no_drivers_box_text); } + main_window.remove(loading_box); main_window.append(&window_box); }