Add VTE terminal

Author: ranfdev

Cargo.lock

@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
+gtk = { version = "0.10", package = "gtk4", features = ["gnome_48"] }
 thiserror = "1.0.64"
 async-channel = "2.3.1"
 async-process = "2.3.0"
@@ -16,11 +16,12 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.140"
+vte4 = "0.9"
 
 [dependencies.adw]
 package = "libadwaita"
-version = "0.7.1"
-features = ["v1_7"]
+version = "0.8.0"
+features = ["v1_8"]
 
 [dev-dependencies]
 smol = "2.0.2"

Cargo.toml

@@ -43,6 +43,20 @@
         "*.a"
     ],
     "modules" : [
+        {
+            "name": "vte",
+            "buildsystem": "meson",
+            "config-opts": [
+            "-Ddocs=false"
+            ],
+            "sources": [
+            {
+                "type": "archive",
+                "url": "https://download.gnome.org/sources/vte/0.82/vte-0.82.1.tar.xz",
+                "sha256": "79376d70402d271e2d38424418e1aea72357934d272e321e3906b71706a78e3a"
+            }
+            ]
+        },
         {
             "name" : "distroshelf",
             "builddir" : true,

com.ranfdev.DistroShelf.json

@@ -158,6 +158,10 @@ impl Container {
         self.set_status_detail(status_detail);
     }
 
+    pub fn is_running(&self) -> bool {
+        self.status_tag() == "up"
+    }
+
     pub fn apps(&self) -> Query<TypedListStore<BoxedAnyObject>> {
         self.imp().apps.clone()
     }

src/container.rs

@@ -50,6 +50,7 @@ mod imp {
         pub clone_sidebar: RefCell<Option<SidebarRow>>,
         pub cloning_content: gtk::Box,
         pub view_switcher: adw::InlineViewSwitcher,
+        pub clone_warning_banner: adw::Banner,
     }
 
     impl CreateDistroboxDialog {
@@ -69,11 +70,19 @@ mod imp {
                 // insert at the top of the cloning_content box
                 self.cloning_content.append(&sidebar_row);
                 self.clone_sidebar.replace(Some(sidebar_row));
+                
+                // Show warning if container is running
+                if container.is_running() {
+                    self.clone_warning_banner.set_revealed(true);
+                } else {
+                    self.clone_warning_banner.set_revealed(false);
+                }
             } else {
                 // no clone source, ensure image row is visible
                 self.image_row.set_visible(true);
                 self.cloning_content.set_visible(false);
                 self.view_switcher.set_visible(true);
+                self.clone_warning_banner.set_revealed(false);
             }
         }
     }
@@ -115,6 +124,12 @@ mod imp {
             cloning_header.append(&cloning_label);
 
             self.cloning_content.append(&cloning_header);
+            
+            // Add warning banner for running containers
+            self.clone_warning_banner.set_title("Cloning the container requires stopping it first");
+            self.clone_warning_banner.set_revealed(false);
+            self.cloning_content.append(&self.clone_warning_banner);
+            
             self.content.append(&self.cloning_content);
 
             let preferences_group = adw::PreferencesGroup::new();
@@ -204,6 +219,7 @@ mod imp {
                         if let Ok(create_args) = res {
                             // If cloning from a source, delegate to clone_container, otherwise create normally
                             if let Some(src) = obj.clone_src() {
+                                src.stop();
                                 obj.root_store()
                                     .clone_container(&src.name(), create_args);
                             } else {
@@ -366,7 +382,8 @@ mod imp {
 
 glib::wrapper! {
     pub struct CreateDistroboxDialog(ObjectSubclass<imp::CreateDistroboxDialog>)
-        @extends adw::Dialog, gtk::Widget;
+        @extends adw::Dialog, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Actionable;
 }
 impl CreateDistroboxDialog {
     pub fn new(root_store: RootStore) -> Self {

src/dialogs/create_distrobox_dialog.rs

@@ -155,7 +155,8 @@ mod imp {
 
 glib::wrapper! {
     pub struct ExportableAppsDialog(ObjectSubclass<imp::ExportableAppsDialog>)
-        @extends adw::Dialog, gtk::Widget;
+        @extends adw::Dialog, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Actionable;
 }
 impl ExportableAppsDialog {
     /// Check if a binary exists on the host system

src/dialogs/exportable_apps_dialog.rs

@@ -134,7 +134,7 @@ mod imp {
 glib::wrapper! {
     pub struct PreferencesDialog(ObjectSubclass<imp::PreferencesDialog>)
         @extends adw::PreferencesDialog, adw::Dialog, gtk::Widget,
-        @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
+        @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Actionable;
 }
 
 impl PreferencesDialog {

src/dialogs/preferences_dialog.rs

@@ -161,7 +161,8 @@ mod imp {
 
 glib::wrapper! {
     pub struct TaskManagerDialog(ObjectSubclass<imp::TaskManagerDialog>)
-        @extends adw::Dialog, gtk::Widget;
+        @extends adw::Dialog, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Actionable;
 }
 
 impl TaskManagerDialog {

src/dialogs/task_manager_dialog.rs

@@ -29,6 +29,7 @@ mod imp {
             self.label.set_xalign(0.0);
 
             let obj = self.obj();
+            obj.set_spacing(6);
             obj.append(&self.icon);
             obj.append(&self.label);
         }
@@ -47,7 +48,8 @@ mod imp {
 
 glib::wrapper! {
     pub struct DistroComboRowItem(ObjectSubclass<imp::DistroComboRowItem>)
-    @extends gtk::Box, gtk::Widget;
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Actionable;
 }
 impl DistroComboRowItem {
     pub fn new() -> Self {

src/distro_combo_row_item.rs

@@ -28,26 +28,25 @@ impl FlatpakCommandRunner {
     pub fn new(command_runner: Rc<dyn InnerCommandRunner>) -> Self {
         FlatpakCommandRunner { command_runner }
     }
-
-    pub fn wrap_flatpak_cmd(mut prev: Command) -> Command {
-        let mut args = vec!["--host".into(), prev.program];
-        args.extend(prev.args);
-
-        prev.args = args;
-        prev.program = "flatpak-spawn".into();
-        prev
-    }
 }
 
 impl InnerCommandRunner for FlatpakCommandRunner {
+    fn wrap_command(&self, mut command: Command) -> Command {
+        let mut args = vec!["--host".into(), command.program];
+        args.extend(command.args);
+        
+        command.args = args;
+        command.program = "flatpak-spawn".into();
+        command
+    }
     fn spawn(&self, command: Command) -> io::Result<Box<dyn Child + Send>> {
-        self.command_runner.spawn(Self::wrap_flatpak_cmd(command))
+        self.command_runner.spawn(self.wrap_command(command))
     }
     fn output(
         &self,
         command: Command,
     ) -> Pin<Box<dyn Future<Output = io::Result<std::process::Output>>>> {
-        self.command_runner.output(Self::wrap_flatpak_cmd(command))
+        self.command_runner.output(self.wrap_command(command))
     }
 }