Merge pull request #7 from ranfdev/next

v1.0.3

Author: ranfdev

.github/workflows/flatpak.yml

@@ -1,6 +1,5 @@
 on:
   push:
-    branches: [ main ]
     tags: [ v*.*.* ]
   pull_request:
   workflow_dispatch:

data/com.ranfdev.DistroShelf.metainfo.xml.in

@@ -71,6 +71,15 @@
   </screenshots>
 
   <releases>
+    <release version="1.0.3" date="2025-04-25">
+      <description translate="no">
+        <ul>
+          <li>Wait for export commands to finish before reloading app list</li>
+          <li>Close selected task when closing the entire task dialog</li>
+          <li>Remove main view of container actions after container is deleted</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.0.2" date="2025-04-25">
       <description translate="no">
         <ul>

meson.build

@@ -1,5 +1,5 @@
 project('distroshelf', 'rust',
-          version: '1.0.2',
+          version: '1.0.3',
     meson_version: '>= 1.0.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

src/config.rs

@@ -1,4 +1,4 @@
-pub static VERSION: &str = "1.0.2";
+pub static VERSION: &str = "1.0.3";
 pub static GETTEXT_PACKAGE: &str = "distroshelf";
 pub static LOCALEDIR: &str = "/app/share/locale";
 pub static PKGDATADIR: &str = "/app/share/distroshelf";

src/container.rs

@@ -167,9 +167,9 @@ impl Container {
                     .distrobox()
                     .export_app(&this.name(), &desktop_file_path)
                     .await?;
+                this.apps().reload();
                 Ok(())
             });
-        self.apps().reload();
     }
     pub fn unexport(&self, desktop_file_path: &str) {
         let this = self.clone();
@@ -180,9 +180,9 @@ impl Container {
                     .distrobox()
                     .unexport_app(&this.name(), &desktop_file_path)
                     .await?;
+                this.apps().reload();
                 Ok(())
             });
-        self.apps().reload();
     }
     pub fn clone_to(&self, target_name: &str) {
         let this = self.clone();

src/task_manager_dialog.rs

@@ -135,6 +135,11 @@ mod imp {
                 this.root_store().set_selected_task(None::<&DistroboxTask>);
             });
 
+            let this = self.obj().clone();
+            self.obj().connect_closed(move |_| {
+                this.root_store().set_selected_task(None::<&DistroboxTask>);
+            });
+
             self.scrolled_window.set_child(Some(&self.stack));
             self.content.append(&self.scrolled_window);
 

src/window.rs

@@ -143,6 +143,8 @@ impl DistroShelfWindow {
                 if let Some(container) = root_store.selected_container() {
                     this_clone.build_main_content(&container);
                     this_clone.imp().split_view.set_show_content(true);
+                } else {
+                    this_clone.imp().main_slot.set_child(None::<&gtk::Widget>);
                 }
             });
         let this_clone = this.clone();
@@ -533,6 +535,7 @@ impl DistroShelfWindow {
                         this,
                         move |dialog, _| {
                             this.root_store().selected_container().unwrap().delete();
+                            this.root_store().set_selected_container(None::<Container>);
                             dialog.close();
                         }
                     ),