Auto select added terminal, improve ui

Author: ranfdev

src/terminal_combo_row.rs

@@ -22,6 +22,7 @@ mod imp {
     pub struct TerminalComboRow {
         #[property(get, set)]
         root_store: RefCell<RootStore>,
+        pub selected_item_signal_handler: RefCell<Option<glib::SignalHandlerId>>,
     }
 
     #[glib::derived_properties]
@@ -33,13 +34,15 @@ mod imp {
             obj.set_title("Preferred Terminal");
             obj.set_use_subtitle(true);
 
-            obj.connect_selected_item_notify(clone!(
+            let signal_handler = obj.connect_selected_item_notify(clone!(
                 #[weak]
                 obj,
                 move |combo| {
-                    let Some(selected) = combo.selected_item().and_downcast::<StringObject>() else {
+                    let Some(selected) = combo.selected_item().and_downcast::<StringObject>()
+                    else {
                         return;
                     };
+
                     if let Some(terminal) = obj
                         .root_store()
                         .terminal_repository()
@@ -50,6 +53,9 @@ mod imp {
                 }
             ));
 
+            self.selected_item_signal_handler
+                .replace(Some(signal_handler));
+
             obj.reload_terminals();
         }
 
@@ -120,7 +126,8 @@ impl TerminalComboRow {
     }
 
     pub fn set_selected_by_name(&self, name: &str) {
-        let Some(terminals_strings) = self.model().unwrap().downcast::<gtk::StringList>().ok() else {
+        let Some(terminals_strings) = self.model().unwrap().downcast::<gtk::StringList>().ok()
+        else {
             return;
         };
         for i in 0..terminals_strings.n_items() {
@@ -145,11 +152,16 @@ impl TerminalComboRow {
             .collect::<Vec<_>>();
 
         let terminal_list = gtk::StringList::new(&terminals);
-        self.set_model(Some(&terminal_list));
 
-        if let Some(selected_terminal) = self.root_store().selected_terminal() {
-            self.set_selected_by_name(&selected_terminal.name);
+        let signal_handler = self.imp().selected_item_signal_handler.borrow();
+        self.block_signal(&signal_handler.as_ref().unwrap());
+        {
+            self.set_model(Some(&terminal_list));
+            if let Some(selected_terminal) = self.root_store().selected_terminal() {
+                self.set_selected_by_name(&selected_terminal.name);
+            }
         }
+        self.unblock_signal(&signal_handler.as_ref().unwrap());
     }
 }
 

src/window.rs

@@ -591,10 +591,9 @@ impl DistroShelfWindow {
         terminal_group.set_title("Terminal Settings");
         let terminal_combo_row = TerminalComboRow::new_with_params(self.root_store());
 
-        let delete_btn = gtk::Button::from_icon_name("user-trash-symbolic");
-        delete_btn.add_css_class("flat");
-        delete_btn.add_css_class("circular");
-        delete_btn.set_tooltip_text(Some("Remove this terminal"));
+        let delete_btn = gtk::Button::with_label("Delete");
+        delete_btn.add_css_class("destructive-action");
+        delete_btn.add_css_class("pill");
 
         if let Some(selected) = terminal_combo_row.selected_item() {
             let selected_name = selected
@@ -697,7 +696,7 @@ impl DistroShelfWindow {
         terminal_group.add(&terminal_combo_row);
 
         // Add Custom Terminal Button
-        let add_terminal_btn = gtk::Button::with_label("Add Custom Terminal");
+        let add_terminal_btn = gtk::Button::with_label("Add Custom");
         add_terminal_btn.add_css_class("pill");
         add_terminal_btn.set_halign(gtk::Align::Start);
 
@@ -824,13 +823,15 @@ impl DistroShelfWindow {
                         match this
                             .root_store()
                             .terminal_repository()
-                            .save_terminal(terminal)
+                            .save_terminal(terminal.clone())
                         {
                             Ok(_) => {
                                 // Show success toast
                                 let toast = adw::Toast::new("Custom terminal added successfully");
 
                                 terminal_combo_row.reload_terminals();
+                                terminal_combo_row
+                                    .set_selected_by_name(&terminal.name);
 
                                 this.add_toast(toast);
                                 custom_dialog.close();