fix(a11y): add cancel close button to site manager dialog (#80)

Author: Orinks

src/portkeydrop/dialogs/site_manager.py

@@ -91,8 +91,12 @@ def _build_ui(self) -> None:
 
         right_sizer.Add(grid, 1, wx.EXPAND | wx.ALL, 4)
 
+        action_sizer = wx.BoxSizer(wx.HORIZONTAL)
         save_btn = wx.Button(self, label="&Save")
-        right_sizer.Add(save_btn, 0, wx.ALL | wx.ALIGN_RIGHT, 4)
+        self.close_btn = wx.Button(self, id=wx.ID_CANCEL, label="&Close")
+        action_sizer.Add(save_btn, 0, wx.RIGHT, 4)
+        action_sizer.Add(self.close_btn, 0)
+        right_sizer.Add(action_sizer, 0, wx.ALL | wx.ALIGN_RIGHT, 4)
 
         main_sizer.Add(right_sizer, 2, wx.EXPAND | wx.ALL, 4)
 

tests/test_site_manager_dialog.py

@@ -127,7 +127,8 @@ def Destroy(self):
 
 
 class _Button(_Window):
-    def __init__(self, parent=None, label="", **_kw):
+    def __init__(self, parent=None, id=None, label="", **_kw):
+        self._id = id
         self._label = label
         self._name = ""
 
@@ -137,6 +138,9 @@ def SetLabel(self, v):
     def SetName(self, v):
         self._name = v
 
+    def GetId(self):
+        return self._id
+
 
 class _Choice(_Window):
     def __init__(self, *a, choices=None, **kw):
@@ -352,6 +356,19 @@ def test_init_creates_show_password_btn(self, dialog_module):
         assert dlg.show_password_btn._name == "Show password"
         assert hasattr(dlg, "password_text")
 
+    def test_init_creates_close_button_with_cancel_id(self, dialog_module):
+        from portkeydrop.sites import SiteManager
+
+        mod, fake_wx = dialog_module
+        site_manager = MagicMock(spec=SiteManager)
+        site_manager.sites = []
+
+        dlg = mod.SiteManagerDialog(None, site_manager)
+
+        assert hasattr(dlg, "close_btn")
+        assert dlg.close_btn._label == "&Close"
+        assert dlg.close_btn.GetId() == fake_wx.ID_CANCEL
+
 
 class TestEscapeKeyHandler:
     """Issue #34: SiteManagerDialog should close on Escape."""