From 50a9b5b5e29e2c2c87df3a1fe31b848e9df5380b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 27 Nov 2023 21:43:13 +0100 Subject: [PATCH] Fix some annotations and add deleteLater to non-modal dialogs --- novelwriter/core/index.py | 2 +- novelwriter/dialogs/about.py | 1 + novelwriter/dialogs/projdetails.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/novelwriter/core/index.py b/novelwriter/core/index.py index 119b44161..6a90c5f02 100644 --- a/novelwriter/core/index.py +++ b/novelwriter/core/index.py @@ -551,7 +551,7 @@ def getHandleHeaderCount(self, tHandle: str) -> int: return 0 def getTableOfContents( - self, rHandle: str, maxDepth: int, skipExcl: bool = True + self, rHandle: str | None, maxDepth: int, skipExcl: bool = True ) -> list[tuple[str, int, str, int]]: """Generate a table of contents up to a maximum depth.""" tOrder = [] diff --git a/novelwriter/dialogs/about.py b/novelwriter/dialogs/about.py index 09eab5b06..f22a82383 100644 --- a/novelwriter/dialogs/about.py +++ b/novelwriter/dialogs/about.py @@ -139,6 +139,7 @@ def showReleaseNotes(self) -> None: def _doClose(self) -> None: """Close the dialog""" self.close() + self.deleteLater() return ## diff --git a/novelwriter/dialogs/projdetails.py b/novelwriter/dialogs/projdetails.py index 40a70b718..272a20a42 100644 --- a/novelwriter/dialogs/projdetails.py +++ b/novelwriter/dialogs/projdetails.py @@ -98,6 +98,7 @@ def _doClose(self) -> None: """Save settings and close the dialog.""" self._saveGuiSettings() self.close() + self.deleteLater() return ## @@ -428,7 +429,7 @@ def updateValues(self) -> None: # Internal Functions ## - def _prepareData(self, rootHandle: str) -> None: + def _prepareData(self, rootHandle: str | None) -> None: """Extract the information from the project index.""" logger.debug("Populating ToC from handle '%s'", rootHandle) self._theToC = SHARED.project.index.getTableOfContents(rootHandle, 2)