From a9711dc06aade3e94b364ca23e5441db9f25e447 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Sun, 19 May 2024 07:56:04 -0700 Subject: [PATCH 1/2] Use older SetTable interface for compatibility Jammy and contemporaries are still stuck on wxPython 4.0.x and lack the AssignTable interface that was added in 4.1. This makes us use SetTable() instead to maintain compatibility with those older versions for a bit longer. Fixes #11352 --- chirp/wxui/memedit.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chirp/wxui/memedit.py b/chirp/wxui/memedit.py index ae8288d6b..3af747a7f 100644 --- a/chirp/wxui/memedit.py +++ b/chirp/wxui/memedit.py @@ -729,8 +729,10 @@ def __init__(self, radio, *a, **k): self._grid = ChirpMemoryGrid(self) self._table = ChirpGridTable(self._features, len(self._col_defs)) - self._grid.AssignTable(self._table) - self._grid.SetSelectionMode(wx.grid.Grid.SelectRows) + # AssignTable added in wxPython 4.1, so use the older interface for + # earlier version support (i.e. Ubuntu Jammy) + self._grid.SetTable(self._table, takeOwnership=True, + selmode=wx.grid.Grid.SelectRows) self._grid.DisableDragRowSize() self._grid.EnableDragCell() self._grid.SetFocus() From ae4f09c3c081e4a9a117b2f0f5e1b23aa3ea61f4 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 21 May 2024 15:35:56 -0700 Subject: [PATCH 2/2] Add Baofeng UV-5RH Pro Max model alias to map Fixes: #11355 Fixes: #11086 --- chirp/share/model_alias_map.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chirp/share/model_alias_map.yaml b/chirp/share/model_alias_map.yaml index 2f1acf34c..09cbdd311 100644 --- a/chirp/share/model_alias_map.yaml +++ b/chirp/share/model_alias_map.yaml @@ -123,6 +123,8 @@ Baofeng/Pofung: model: UV-5RE, UV-5RE+ - alt: UV-5R model: UV-5RG, RK, RQ, RS, RT, RU +- alt: Baofeng 5RM + model: UV-5RH Pro Max - alt: BF-F8HP model: UV-5RHP - alt: Radioddity UV-5RX3