Add toast when invalid terminal is set

Author: ranfdev

src/container.rs

@@ -217,15 +217,15 @@ impl Container {
                 Ok(())
             });
     }
-    pub fn spawn_terminal(&self) {
+    pub fn spawn_terminal(&self) -> DistroboxTask {
         let this = self.clone();
         self.root_store()
             .create_task(&self.name(), "spawn-terminal", move |_task| async move {
                 let enter_cmd = this.root_store().distrobox().enter_cmd(&this.name());
                 this.root_store()
                     .spawn_terminal_cmd(this.name(), &enter_cmd)
                     .await
-            });
+            })
     }
 }
 

src/distrobox_task.rs

@@ -6,6 +6,7 @@ use glib::subclass::prelude::*;
 use glib::Properties;
 use gtk::glib;
 use gtk::prelude::*;
+use std::cell::Ref;
 use std::cell::RefCell;
 use std::future::Future;
 use tracing::{debug, error, info, warn};
@@ -120,6 +121,9 @@ impl DistroboxTask {
     pub fn ended(&self) -> bool {
         self.is_failed() || self.is_successful()
     }
+    pub fn error(&self) -> Ref<Option<anyhow::Error>> {
+        self.imp().error.borrow()
+    }
     pub fn take_error(&self) -> Option<anyhow::Error> {
         self.imp().error.borrow_mut().take()
     }

src/window.rs

@@ -218,6 +218,10 @@ impl DistroShelfWindow {
             .set_child(Some(&tasks_button));
     }
 
+    fn add_toast(&self, toast: adw::Toast) {
+        self.imp().toast_overlay.add_toast(toast);
+    }
+
     pub fn build_container_header(&self, container: &Container) -> gtk::Box {
         // Create labels for the title and subtitle
         let title_label = gtk::Label::new(Some(&container.name()));
@@ -237,12 +241,12 @@ impl DistroShelfWindow {
         copy_btn.add_css_class("xs");
         // Capture a clone of the image URL for the closure
         let image_url = container.image().to_string();
-        let toast_overlay = self.imp().toast_overlay.clone();
+        let this = self.clone();
         copy_btn.connect_clicked(move |_| {
             if let Some(display) = gdk::Display::default() {
                 let clipboard = display.primary_clipboard();
                 clipboard.set_text(&image_url);
-                toast_overlay.add_toast(adw::Toast::new("Image URL copied"));
+                this.add_toast(adw::Toast::new("Image URL copied"));
             }
         });
 
@@ -318,10 +322,25 @@ impl DistroShelfWindow {
             #[weak(rename_to = this)]
             self,
             move |_| {
-                this.root_store()
+                let task = this.root_store()
                     .selected_container()
                     .unwrap()
                     .spawn_terminal();
+                task.connect_status_notify(move |task| {
+                    if let Some(_) = &*task.error()  {
+                        let toast = adw::Toast::new("Check your terminal settings.");
+                        toast.set_button_label(Some("Preferences"));
+                        toast.connect_button_clicked(clone!(
+                            #[weak]
+                            this,
+                            move |_| {
+                                this.root_store()
+                                    .set_current_dialog(TaggedObject::new("preferences"));
+                            }
+                        ));
+                        this.add_toast(toast);
+                    }
+                }); 
             }
         ));
         status_child.append(&terminal_btn);
@@ -562,15 +581,11 @@ impl DistroShelfWindow {
 
         let page = adw::PreferencesPage::new();
 
-        let preferences_group = adw::PreferencesGroup::new();
-        preferences_group.set_title("General");
-
         let terminal_group = adw::PreferencesGroup::new();
         terminal_group.set_title("Terminal Settings");
         terminal_group.add(&TerminalComboRow::new_with_params(self.root_store()));
         page.add(&terminal_group);
 
-        page.add(&preferences_group);
         dialog.add(&page);
         dialog.upcast()
     }