Refactor macOS DMG workflow: export BREW_PREFIX, update Info.plist and bundle paths, and replace deprecated resource tags with data tags.

Author: BuddySirJava

.github/workflows/macos-dmg.yml

@@ -70,10 +70,11 @@ jobs:
         run: |
           mkdir -p macos
           BREW_PREFIX="$(brew --prefix)"
+          export BREW_PREFIX
           echo "Detected Homebrew prefix: $BREW_PREFIX"
 
           # Write Info.plist required by gtk-mac-bundler
-          cat > macos/Info.plist << PLIST
+          cat > macos/Info.plist << 'PLIST'
           <?xml version="1.0" encoding="UTF-8"?>
           <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
           <plist version="1.0">
@@ -95,11 +96,11 @@ jobs:
           PLIST
 
           # Bundle description for gtk-mac-bundler
-          cat > macos/ssh-studio.bundle << XML
+          cat > macos/ssh-studio.bundle << 'XML'
           <?xml version="1.0"?>
           <app-bundle>
             <meta>
-              <prefix>${BREW_PREFIX}</prefix>
+              <prefix>${env:BREW_PREFIX}</prefix>
               <destination overwrite="yes">${project}/../build/ssh-studio.bundle</destination>
             </meta>
 
@@ -108,16 +109,14 @@ jobs:
             <version>1.0.0</version>
             <icon>${project}/../data/media/icon_512.png</icon>
 
-            <plist>${project}/Info.plist</plist>
+            <plist>${env:GITHUB_WORKSPACE}/macos/Info.plist</plist>
 
             <main-binary dest="${bundle}/Contents/MacOS/${name}">
               <binary>${project}/../stage/bin/ssh-studio</binary>
             </main-binary>
 
-            <resources>
-              <file dest="${bundle}/Contents/Resources/share/io.github.BuddySirJava.SSH-Studio/ssh-studio-resources.gresource">${project}/../stage/share/io.github.BuddySirJava.SSH-Studio/ssh-studio-resources.gresource</file>
-              <dir dest="${bundle}/Contents/Resources/src">${project}/../src</dir>
-            </resources>
+            <data dest="${bundle}/Contents/Resources/share/io.github.BuddySirJava.SSH-Studio/ssh-studio-resources.gresource">${project}/../stage/share/io.github.BuddySirJava.SSH-Studio/ssh-studio-resources.gresource</data>
+            <data dest="${bundle}/Contents/Resources/src">${project}/../src</data>
           </app-bundle>
           XML
 

data/ui/host_editor.blp

@@ -51,8 +51,9 @@ template $HostEditor: Gtk.Box {
     vexpand: true;
     hexpand: true;
 
-    Adw.HeaderBar {
 
+    Adw.HeaderBar {
+      show-back-button: false;
       show-title: false;
       [center]
       Adw.ViewSwitcher viewswitcher {
@@ -68,12 +69,43 @@ template $HostEditor: Gtk.Box {
         ]
       }
 
-      [end]
       Gtk.WindowControls window_controls {
         margin-start: 20;
       }
     }
-  
+    Overlay banner_overlay {
+      child: Adw.Banner unsaved_banner {
+        revealed: false;
+        title: _("You have unsaved changes.");
+      };
+
+      [overlay]
+      Box {
+        halign: end;
+        valign: start;
+        spacing: 8;
+        margin-top: 6;
+        margin-end: 12;
+
+        Button save_button {
+          label: _("Save");
+          visible: false;
+          styles [
+            "suggested-action",
+          ]
+        }
+
+        Button revert_button {
+          label: _("Revert");
+          visible: false;
+          styles [
+            "flat",
+            "destructive-action",
+          ]
+        }
+      }
+    }
+
   Adw.ViewStack viewstack {
     vexpand: true;
     margin-start: 4;
@@ -418,13 +450,7 @@ template $HostEditor: Gtk.Box {
     }
   }
 
-  Revealer banner_revealer { visible: false; }
-
-    Box {
-      visible: false;
-      Button save_button {}
-      Button revert_button {}
-    }
+  
   }
 }
 

data/ui/host_list.blp

@@ -17,7 +17,6 @@ template $HostList: Box {
     Box {
       orientation: horizontal;
       spacing: 12;
-      margin-top: 8;
       margin-bottom: 8;
 
       Button search_button {

data/ui/main_window.blp

@@ -18,8 +18,8 @@ template $MainWindow: Adw.ApplicationWindow {
 
               child: Box {
                 orientation: vertical;
-                margin-start: 15;
-                margin-end: 15;
+                margin-start: 8;
+                margin-end: 8;
 
                 $HostList host_list {}
               }
@@ -47,28 +47,7 @@ template $MainWindow: Adw.ApplicationWindow {
         };
       }
 
-      [bottom]
-      ActionBar global_actionbar {
-        visible: false;
-        [start]
-        Label unsaved_label { label: _("You have unsaved changes."); visible: false; }
-        [end]
-        Button save_button {
-          label: _("Save");
-          styles [
-            "suggested-action",
-          ]
-          visible: false;
-        }
-        [end]
-        Button revert_button {
-          label: _("Revert");
-          styles [
-            "destructive-action",
-          ]
-          visible: false;
-        }
-      }
+      
     }
   }
 }

src/main.py

@@ -17,6 +17,7 @@
 
 def _ensure_utf8_locale():
     import locale
+
     try:
         current = locale.setlocale(locale.LC_ALL, "")
         if current is None or ("UTF-8" not in current and "utf8" not in current):
@@ -48,7 +49,10 @@ def _configure_renderer_for_x11():
 
     if not has_dri and not os.getenv("LIBGL_ALWAYS_SOFTWARE"):
         os.environ["GSK_RENDERER"] = "cairo"
-        logging.info("GSK_RENDERER=cairo set for X11 without DRM; forcing software rendering")
+        logging.info(
+            "GSK_RENDERER=cairo set for X11 without DRM; forcing software rendering"
+        )
+
 
 try:
     from ssh_studio.ssh_config_parser import SSHConfigParser
@@ -176,21 +180,34 @@ def worker():
             try:
                 if self.parser is not None:
                     self.parser.parse()
+
                 def update_ui():
                     try:
-                        if self.main_window and getattr(self.main_window, "host_list", None):
-                            self.main_window.host_list.load_hosts(self.parser.config.hosts)
+                        if self.main_window and getattr(
+                            self.main_window, "host_list", None
+                        ):
+                            self.main_window.host_list.load_hosts(
+                                self.parser.config.hosts
+                            )
                             try:
-                                self.main_window._update_status(_("Configuration loaded successfully"))
+                                self.main_window._update_status(
+                                    _("Configuration loaded successfully")
+                                )
                             except Exception:
                                 pass
                     except Exception:
                         pass
                     return False
+
                 GLib.idle_add(update_ui)
             except Exception as e:
                 logging.error(f"Failed to initialize SSH config parser: {e}")
-                GLib.idle_add(lambda: (self._show_error_dialog(_("Failed to load SSH config"), str(e)), False)[1])
+                GLib.idle_add(
+                    lambda: (
+                        self._show_error_dialog(_("Failed to load SSH config"), str(e)),
+                        False,
+                    )[1]
+                )
 
         t = threading.Thread(target=worker, daemon=True)
         t.start()