Refactor SSH-Studio configuration and UI components

- Fixed Build System
- Added adaptive layout
- Fixed Connections not working

Author: BuddySirJava

data/ssh-studio.in

@@ -1,2 +1,13 @@
-#!/usr/bin/env bash
-exec python3 -m ssh_studio.main "$@"
+#!@PYTHON@
+
+import os
+import sys
+
+pkgdatadir = '@pkgdatadir@'
+
+if pkgdatadir not in sys.path:
+    sys.path.insert(0, pkgdatadir)
+
+if __name__ == '__main__':
+    from ssh_studio import main
+    sys.exit(main.main())

data/ui/host_editor.blp

@@ -53,7 +53,6 @@ template $HostEditor: Gtk.Box {
 
     WindowHandle {
     Adw.HeaderBar {
-      show-back-button: false;
       show-title: false;
       [center]
       Adw.ViewSwitcher viewswitcher {

data/ui/host_list.blp

@@ -58,6 +58,12 @@ template $HostList: Box {
         ]
       }
 
+      [end]
+      Gtk.WindowControls window_controls {
+        side: end;
+        visible: false;
+      }
+
     }
     }
 

data/ui/main_window.blp

@@ -4,6 +4,24 @@ using Adw 1;
 template $MainWindow: Adw.ApplicationWindow {
   default-width: 1300;
   default-height: 720;
+
+  Adw.Breakpoint {
+    condition ("max-width: 1100sp")
+
+    setters {
+      host_editor.viewswitcher-policy: narrow;
+    }
+  }
+
+  Adw.Breakpoint {
+    condition ("max-width: 800sp")
+
+    setters {
+      split_view.collapsed: true;
+      host_list.show-window-controls: true;
+    }
+  }
+
   Adw.ToastOverlay toast_overlay {
   Adw.ToolbarView main_box {
     hexpand: true;

data/ui/ssh_key_manager_dialog.blp

@@ -2,61 +2,104 @@ using Gtk 4.0;
 using Adw 1;
 
 template $SSHKeyManagerDialog: Adw.Dialog {
+  Adw.Breakpoint {
+    condition ("max-width: 900sp")
+
+    setters {
+      header_actions.hexpand: true;
+      header_actions.halign: fill;
+      generate_button.hexpand: true;
+      import_button.hexpand: true;
+    }
+  }
+
+  Adw.Breakpoint {
+    condition ("max-width: 640sp")
+
+    setters {
+      header_actions.orientation: vertical;
+
+      header_actions.spacing: 8;
+      footer_actions.orientation: vertical;
+      footer_actions.halign: fill;
+      copy_pub_button.hexpand: true;
+      reveal_button.hexpand: true;
+      delete_button.hexpand: true;
+    }
+  }
+
+
   Adw.ToastOverlay toast_overlay {
     Adw.ToolbarView {
-      width-request: 860;
-      height-request: 620;
+      width-request: 360;
+      height-request: 360;
 
       [top]
       Adw.HeaderBar {
         [title]
-        Adw.ViewSwitcher { policy: wide; stack: stack; }
+        Adw.ViewSwitcherTitle switcher_title {
+          stack: stack;
+          title: _("SSH Key Manager");
+        }
 
         [end]
-        Box {
+        Box header_actions {
           spacing: 6;
-          Button generate_button { label: _("Generate…"); css-classes: ["suggested-action"]; }
-          Button import_button { label: _("Import…"); }
+          Button generate_button { label: _("Generate…"); css-classes: ["suggested-action"]; hexpand: false; }
+          Button import_button { label: _("Import…"); hexpand: false; }
         }
       }
 
-      content: Box {
-        orientation: vertical;
-        margin-start: 12; margin-end: 12; margin-top: 12; margin-bottom: 12; spacing: 12;
-
-        Adw.ViewStack stack {
-          vexpand: true;
-
-          Adw.ViewStackPage {
-            name: "private";
-            title: _("Private Keys");
-            icon-name: "dialog-password-symbolic";
-            child: Adw.Clamp {
-              maximum-size: 900; tightening-threshold: 600;
-              child: ScrolledWindow { vexpand: true; hexpand: true; has-frame: false; 
-                ListBox private_list { selection-mode: single; vexpand: true; hexpand: true; css-classes: ["boxed-list"]; }
+      content: Adw.Clamp {
+        maximum-size: 960;
+        tightening-threshold: 720;
+        child: Box {
+          orientation: vertical;
+          margin-start: 12;
+          margin-end: 12;
+          margin-top: 12;
+          margin-bottom: 12;
+          spacing: 12;
+
+          Adw.ViewStack stack {
+            vexpand: true;
+
+            Adw.ViewStackPage {
+              name: "private";
+              title: _("Private Keys");
+              icon-name: "dialog-password-symbolic";
+              child: Adw.Clamp {
+                maximum-size: 900; tightening-threshold: 640;
+                child: ScrolledWindow { vexpand: true; hexpand: true; has-frame: false;
+                  ListBox private_list { selection-mode: single; vexpand: true; hexpand: true; css-classes: ["boxed-list"]; }
+                };
               };
-            };
-          }
+            }
 
-          Adw.ViewStackPage {
-            name: "public";
-            title: _("Public Keys");
-            icon-name: "user-info-symbolic";
-            child: Adw.Clamp {
-              maximum-size: 900; tightening-threshold: 600;
-              child: ScrolledWindow { vexpand: true; hexpand: true; has-frame: false; 
-                ListBox public_list { selection-mode: single; vexpand: true; hexpand: true; css-classes: ["boxed-list"]; }
+            Adw.ViewStackPage {
+              name: "public";
+              title: _("Public Keys");
+              icon-name: "user-info-symbolic";
+              child: Adw.Clamp {
+                maximum-size: 900; tightening-threshold: 640;
+                child: ScrolledWindow { vexpand: true; hexpand: true; has-frame: false;
+                  ListBox public_list { selection-mode: single; vexpand: true; hexpand: true; css-classes: ["boxed-list"]; }
+                };
               };
-            };
+            }
           }
-        }
 
-        Box { orientation: horizontal; halign: end; spacing: 6;
-          Button copy_pub_button { label: _("Copy Public Key"); }
-          Button reveal_button { label: _("Reveal in Files"); }
-          Button delete_button { label: _("Delete"); css-classes: ["destructive-action"]; }
-        }
+          Adw.ViewSwitcherBar switcher_bar {
+            stack: stack;
+            reveal: bind switcher_title.title-visible;
+          }
+
+          Box footer_actions { orientation: horizontal; halign: end; spacing: 6;
+            Button copy_pub_button { label: _("Copy Public Key"); }
+            Button reveal_button { label: _("Reveal in Files"); }
+            Button delete_button { label: _("Delete"); css-classes: ["destructive-action"]; }
+          }
+        };
       };
     }
   }

io.github.BuddySirJava.SSH-Studio.json

@@ -10,7 +10,8 @@
         "--socket=wayland",
         "--share=network",
         "--filesystem=~/.ssh:rw",
-        "--socket=ssh-auth"
+        "--socket=ssh-auth",
+        "--talk-name=org.freedesktop.Flatpak"
         ],
     "cleanup" : [
         "/include",

meson.build

@@ -5,8 +5,6 @@ project('ssh-studio', 'c',
   default_options: [
     'warning_level=2',
     'buildtype=debugoptimized',
-    'python.install_env=auto',
-    'python.platlibdir='
   ])
 
 python = import('python')
@@ -18,6 +16,9 @@ gtksource_dep = dependency('gtksourceview-5', version: '>= 5.0.0')
 
 application_id = 'io.github.BuddySirJava.SSH-Studio'
 
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+moduledir = join_paths(pkgdatadir, 'ssh_studio')
+
 i18n = import('i18n')
 subdir('po')
 
@@ -32,11 +33,17 @@ if get_option('install_desktop_file')
   )
 endif
 
-install_data(
-  join_paths(meson.current_source_dir(), 'data', 'ssh-studio.in'),
-  rename: 'ssh-studio',
-  install_mode: 'rwxr-xr-x',
-  install_dir: join_paths(get_option('bindir'))
+conf = configuration_data()
+conf.set('PYTHON', python_installation.path())
+conf.set('pkgdatadir', pkgdatadir)
+
+configure_file(
+  input: 'data/ssh-studio.in',
+  output: 'ssh-studio',
+  configuration: conf,
+  install: true,
+  install_dir: get_option('bindir'),
+  install_mode: 'rwxr-xr-x'
 )
 
 if get_option('install_icons')