Add unsaved changes dialog and update host editor UI

- Introduced a new unsaved changes dialog to handle unsaved changes on window close.
- Updated host editor UI to remove save and revert buttons, replacing them with a banner for unsaved changes.
- Adjusted resource files to include the new dialog and updated UI components accordingly.

Author: BuddySirJava

data/meson.build

@@ -11,6 +11,7 @@ blueprint_files = files(
   'ui/key_picker_dialog.blp',
   'ui/keyboard_shortcuts_dialog.blp',
   'ui/welcome_view.blp',
+  'ui/unsaved_changes_dialog.blp',
 )
 
 bp_gen = generator(blueprint_compiler,

data/ssh-studio.gresource.xml

@@ -11,6 +11,7 @@
     <file alias="ui/key_picker_dialog.ui" preprocess="xml-stripblanks">key_picker_dialog.ui</file>
     <file alias="ui/keyboard_shortcuts_dialog.ui" preprocess="xml-stripblanks">keyboard_shortcuts_dialog.ui</file>
     <file alias="ui/welcome_view.ui" preprocess="xml-stripblanks">welcome_view.ui</file>
+    <file alias="ui/unsaved_changes_dialog.ui" preprocess="xml-stripblanks">unsaved_changes_dialog.ui</file>
     <file>ssh-studio.css</file>
     <file alias="media/icon_256.png">icon_256.png</file>
     <file alias="icons/256x256/apps/io.github.BuddySirJava.SSH-Studio.png">icon_256.png</file>

data/ui/host_editor.blp

@@ -77,33 +77,13 @@ template $HostEditor: Gtk.Box {
       child: Adw.Banner unsaved_banner {
         revealed: false;
         title: _("You have unsaved changes.");
+        button-label: _("Save");
+        use-markup: false;
+        styles [
+          "banner",
+        ]
       };
 
-      [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 {

data/ui/unsaved_changes_dialog.blp

@@ -0,0 +1,10 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.AlertDialog unsaved_changes_dialog {
+  heading: _("Unsaved Changes");
+  body: _("You have unsaved changes that will be lost if you quit.\n\nWhat would you like to do?");
+  close-response: "cancel";
+}
+
+

src/ui/host_editor.py

@@ -64,8 +64,6 @@ class HostEditor(Gtk.Box):
     copy_row = Gtk.Template.Child()
     test_row = Gtk.Template.Child()
     unsaved_banner = Gtk.Template.Child()
-    save_button = Gtk.Template.Child()
-    revert_button = Gtk.Template.Child()
 
     __gsignals__ = {
         "host-changed": (GObject.SignalFlags.RUN_LAST, None, (object,)),
@@ -113,12 +111,6 @@ def __init__(self):
             if getattr(self, "unsaved_banner", None):
                 self.unsaved_banner.set_revealed(False)
                 self.unsaved_banner.set_sensitive(False)
-            if getattr(self, "save_button", None):
-                self.save_button.set_visible(False)
-                self.save_button.set_sensitive(False)
-            if getattr(self, "revert_button", None):
-                self.revert_button.set_visible(False)
-                self.revert_button.set_sensitive(False)
         except Exception:
             pass
 
@@ -415,16 +407,6 @@ def _connect_buttons(self):
                 self.unsaved_banner.connect("button-clicked", lambda *_: self._on_save_clicked(None))
         except Exception:
             pass
-        try:
-            if getattr(self, "save_button", None) is not None:
-                self.save_button.connect("clicked", self._on_save_clicked)
-        except Exception:
-            pass
-        try:
-            if getattr(self, "revert_button", None) is not None:
-                self.revert_button.connect("clicked", self._on_revert_clicked)
-        except Exception:
-            pass
 
     def _connect_header_buttons(self):
         """Connect header bar button signals."""
@@ -622,12 +604,6 @@ def _safe_set_entry_text(row, text):
             if getattr(self, "unsaved_banner", None):
                 self.unsaved_banner.set_revealed(False)
                 self.unsaved_banner.set_sensitive(False)
-            if getattr(self, "save_button", None):
-                self.save_button.set_visible(False)
-                self.save_button.set_sensitive(False)
-            if getattr(self, "revert_button", None):
-                self.revert_button.set_visible(False)
-                self.revert_button.set_sensitive(False)
         except Exception:
             pass
 
@@ -1737,65 +1713,16 @@ def _on_save_clicked(self, button):
             except Exception:
                 pass
 
-    def _on_revert_clicked(self, button):
-        """Reverts the current host's changes to its last loaded state by reloading the configuration."""
-        if not self.current_host:
-            return
-
-        if not hasattr(self, "original_host_state") or not self.original_host_state:
-            return
-        self.is_loading = True
-        self.current_host.patterns = copy.deepcopy(self.original_host_state.patterns)
-        self.current_host.options = copy.deepcopy(self.original_host_state.options)
-        self.current_host.raw_lines = copy.deepcopy(self.original_host_state.raw_lines)
-
-        self._sync_fields_from_host()
-
-        buffer = self.raw_text_view.get_buffer()
-        if hasattr(self, "_raw_changed_handler_id"):
-            buffer.handler_block(self._raw_changed_handler_id)
-        self._programmatic_raw_update = True
-        buffer.set_text("\n".join(self.current_host.raw_lines))
-        if hasattr(self, "_raw_changed_handler_id"):
-            buffer.handler_unblock(self._raw_changed_handler_id)
-        self._programmatic_raw_update = False
-        self.original_raw_content = "\n".join(self.current_host.raw_lines)
-        self.is_loading = False
-
-        self._ensure_buffer_initialized()
-        if self.buffer is not None:
-            self.buffer.remove_all_tags(
-                self.buffer.get_start_iter(), self.buffer.get_end_iter()
-            )
-        self.emit("host-changed", self.current_host)
-        try:
-            if getattr(self, "save_banner", None):
-                self.save_banner.set_revealed(False)
-                self.save_banner.set_sensitive(False)
-            if getattr(self, "revert_banner", None):
-                self.revert_banner.set_revealed(False)
-                self.revert_banner.set_sensitive(False)
-        except Exception:
-            pass
-        self._show_message(_(f"Reverted changes for {self.current_host.patterns[0]}"))
-        self._touched_options.clear()
-        self._update_button_sensitivity()
 
     def _update_button_sensitivity(self):
-        """Updates the sensitivity of save and revert buttons based on dirty state and validity."""
+        """Updates the sensitivity of banner based on dirty state and validity."""
         is_dirty = self.is_host_dirty()
         field_errors = self._collect_field_errors()
         is_valid = not bool(field_errors)
         try:
             if getattr(self, "unsaved_banner", None):
                 self.unsaved_banner.set_revealed(is_dirty)
                 self.unsaved_banner.set_sensitive(is_dirty and is_valid)
-            if getattr(self, "save_button", None):
-                self.save_button.set_visible(is_dirty)
-                self.save_button.set_sensitive(is_dirty and is_valid)
-            if getattr(self, "revert_button", None):
-                self.revert_button.set_visible(is_dirty)
-                self.revert_button.set_sensitive(is_dirty)
         except Exception:
             pass
 

src/ui/main_window.py

@@ -2,13 +2,14 @@
 
 gi.require_version("Gtk", "4.0")
 gi.require_version("Adw", "1")
-from gi.repository import Gtk, Gio, Gdk, Adw
+from gi.repository import Gtk, Gio, Gdk, Adw, GLib
 from pathlib import Path
 from gettext import gettext as _
 import sys
 from .host_list import HostList
 from .host_editor import HostEditor
 from .welcome_view import WelcomeView
+from gi.repository import Gio as _Gio
 
 
 @Gtk.Template(resource_path="/io/github/BuddySirJava/SSH-Studio/ui/main_window.ui")
@@ -52,6 +53,7 @@ def __init__(self, app):
             pass
 
         self.connect("notify::has-focus", self._on_window_focus_changed)
+        self.connect("close-request", self._on_close_request)
         self._show_welcome_view()
 
         try:
@@ -155,10 +157,6 @@ def _setup_split_view(self):
 
     def _connect_signals(self):
         """Connect all the signal handlers."""
-        try:
-            self.save_button.connect("clicked", self._on_save_clicked)
-        except Exception:
-            self.save_button = None
 
         self.host_list.connect("host-selected", self._on_host_selected)
         self.host_list.connect("host-added", self._on_host_added)
@@ -171,14 +169,6 @@ def _connect_signals(self):
         )
         self.host_editor.connect("show-toast", self._on_show_toast)
 
-        try:
-            if (
-                hasattr(self.host_editor, "save_button")
-                and self.host_editor.save_button is not None
-            ):
-                self.host_editor.save_button.set_sensitive(False)
-        except Exception:
-            pass
 
         self.host_list.search_entry.connect("search-changed", self._on_search_changed)
 
@@ -394,6 +384,50 @@ def _on_window_focus_changed(self, window, param):
             self.host_list.search_bar.set_visible(False)
             self.host_list.filter_hosts("")
 
+    def _on_close_request(self, window):
+        """Handle window close request - check for unsaved changes."""
+        if hasattr(self.host_editor, 'is_host_dirty') and self.host_editor.is_host_dirty():
+            return self._show_unsaved_changes_dialog()
+        return False
+
+    def _show_unsaved_changes_dialog(self):
+        """Show alert dialog asking user what to do with unsaved changes."""
+        # Load from blueprint resource
+        builder = Gtk.Builder.new_from_resource("/io/github/BuddySirJava/SSH-Studio/ui/unsaved_changes_dialog.ui")
+        dialog = builder.get_object("unsaved_changes_dialog")
+        dialog.set_close_response("cancel")
+        dialog.add_response("discard", _("Discard Changes"))
+        dialog.add_response("cancel", _("Cancel"))
+        dialog.add_response("save", _("Save & Quit"))
+        dialog.set_response_appearance("discard", Adw.ResponseAppearance.DESTRUCTIVE)
+        dialog.set_response_appearance("save", Adw.ResponseAppearance.SUGGESTED)
+        dialog.set_default_response("save")
+
+        def on_response(dialog, response):
+            if response == "save":
+                try:
+                    if hasattr(self.host_editor, 'unsaved_banner') and self.host_editor.unsaved_banner:
+                        self.host_editor._on_save_clicked(None)
+                    dialog.close()
+                    GLib.timeout_add(200, self._delayed_close)
+                except Exception as e:
+                    self.show_toast(_(f"Failed to save: {e}"))
+            elif response == "discard":
+                dialog.close()
+                self.destroy()
+            else:
+                dialog.close()
+                return True
+
+        dialog.connect("response", on_response)
+        dialog.present(self)
+        return True
+
+    def _delayed_close(self):
+        """Close the window after a short delay to allow save to complete."""
+        self.destroy()
+        return False
+
     def on_status_bar_close_clicked(self, button):
         pass
 
@@ -417,25 +451,19 @@ def _on_save_clicked(self, button):
 
             self.host_list.load_hosts(self.parser.config.hosts)
             self.is_dirty = False
-            if self.save_button is not None:
-                self.save_button.set_sensitive(False)
             self._update_status(_("Configuration saved successfully"))
         except Exception as e:
             self._show_error(f"Failed to save configuration: {e}")
 
     def _write_and_reload(self, show_status: bool = False):
-        """Write the config to disk and reload UI without showing validation dialogs.
-        Disables the save button afterward.
-        """
+        """Write the config to disk and reload UI without showing validation dialogs."""
         if not self.parser:
             return
         try:
             self.parser.write(backup=True)
             self.parser.parse()
             self.host_list.load_hosts(self.parser.config.hosts)
             self.is_dirty = False
-            if self.save_button is not None:
-                self.save_button.set_sensitive(False)
             if show_status:
                 self._update_status(_("Configuration saved"))
         except Exception as e:
@@ -485,16 +513,12 @@ def _on_host_added(self, host_list, host):
 
             self.parser.config.add_host(host)
             self.is_dirty = True
-            if self.save_button is not None:
-                self.save_button.set_sensitive(True)
 
             def undo_add():
                 try:
                     if host in self.parser.config.hosts:
                         self.parser.config.remove_host(host)
                     self.is_dirty = self.parser.config.is_dirty()
-                    if self.save_button is not None:
-                        self.save_button.set_sensitive(self.is_dirty)
                     self.host_list.load_hosts(self.parser.config.hosts)
                     try:
                         if not self.parser.config.hosts:
@@ -540,27 +564,17 @@ def undo_delete():
                 self.host_editor.current_host = None
                 self.host_editor._clear_all_fields()
                 self._set_host_editor_visible(False)
-                if self.save_button is not None:
-                    self.save_button.set_sensitive(False)
                 self.is_dirty = False
 
             else:
                 self.host_list.select_host(self.parser.config.hosts[0])
 
     def _on_host_changed(self, editor, host):
         self.is_dirty = self.parser.config.is_dirty()
-        if self.save_button is not None:
-            if self.save_button is not None:
-                self.save_button.set_sensitive(self.is_dirty)
 
     def _on_editor_validity_changed(self, editor, is_valid: bool):
-        if self.save_button is not None:
-            if not is_valid:
-                if self.save_button is not None:
-                    self.save_button.set_sensitive(False)
-            else:
-                if self.save_button is not None:
-                    self.save_button.set_sensitive(self.is_dirty)
+        # The banner handles its own sensitivity based on validity
+        pass
 
     def _on_show_toast(self, editor, message: str):
         """Handle show-toast signal from host editor."""