Fix delete NB Browse, Tables page if layer was deleted

tmszi · Sep 30, 2023 · fec2406 · fec2406
1 parent 327d334
commit fec2406
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/gui/wxpython/dbmgr/base.py b/gui/wxpython/dbmgr/base.py
@@ -1023,13 +1023,16 @@ def DeletePage(self, layer):
         if layer not in self.layers:
             return False
 
-        GNotebook.DeletePage(self, self.layers.index(layer))
+        GNotebook.DeleteNBPage(
+            self,
+            page=self._page_prefix_name.format(layer),
+        )
 
         self.layers.remove(layer)
         del self.layerPage[layer]
 
         if self.GetSelection() >= 0:
-            self.selLayer = self.layers[self.GetSelection()]
+            self.selLayer = self.layers[-1]
         else:
             self.selLayer = None
 
@@ -1108,6 +1111,8 @@ def __init__(self, parent, parentDbMgrBase, onlyLayer=-1):
 
         DbMgrNotebookBase.__init__(self, parent=parent, parentDbMgrBase=parentDbMgrBase)
 
+        self._page_prefix_name = "browse-{}"
+
         #   for Sql Query notebook adaptation on current width
         self.sqlBestSize = None
 
@@ -1178,6 +1183,7 @@ def AddLayer(self, layer, pos=-1):
         self.InsertNBPage(
             index=pos,
             page=panel,
+            name=self._page_prefix_name.format(layer),
             text=" %d / %s %s"
             % (layer, label, self.dbMgrData["mapDBInfo"].layers[layer]["table"]),
         )
@@ -1361,6 +1367,9 @@ def OnSqlQuerySizeWrap(self, layer):
     def OnSqlQuerySize(self, event, layer):
         """Adapts SQL Query Simple tab on current width"""
 
+        if not self.layerPage.get(layer):
+            return
+
         sqlNtb = event.GetEventObject()
         if not self.sqlBestSize:
             self.sqlBestSize = sqlNtb.GetBestSize()
@@ -2300,6 +2309,8 @@ def __init__(self, parent, parentDbMgrBase, onlyLayer=-1):
 
         DbMgrNotebookBase.__init__(self, parent=parent, parentDbMgrBase=parentDbMgrBase)
 
+        self._page_prefix_name = "table-{}"
+
         for layer in self.dbMgrData["mapDBInfo"].layers.keys():
             if onlyLayer > 0 and layer != onlyLayer:
                 continue
@@ -2335,6 +2346,7 @@ def AddLayer(self, layer, pos=-1):
         self.InsertNBPage(
             index=pos,
             page=panel,
+            name=self._page_prefix_name.format(layer),
             text=" %d / %s %s"
             % (layer, label, self.dbMgrData["mapDBInfo"].layers[layer]["table"]),
         )