From 8abcada86e3ef9fa5106d53bbb4311b7165acdf2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Nov 2023 17:24:43 +0100 Subject: [PATCH] Make sure all QMenu instances have a parent widget set (#1536) --- novelwriter/gui/doceditor.py | 2 +- novelwriter/gui/docviewer.py | 2 +- novelwriter/gui/noveltree.py | 2 +- novelwriter/gui/projtree.py | 8 ++++---- novelwriter/gui/sidebar.py | 2 +- novelwriter/tools/manussettings.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index c93db0a8..ec4bd7d8 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -1121,7 +1121,7 @@ class GuiDocEditor(QTextEdit): userSelection = userCursor.hasSelection() posCursor = self.cursorForPosition(thePos) - mnuContext = QMenu() + mnuContext = QMenu(self) # Follow, Cut, Copy and Paste # =========================== diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py index ca835ea6..18dfdbc5 100644 --- a/novelwriter/gui/docviewer.py +++ b/novelwriter/gui/docviewer.py @@ -381,7 +381,7 @@ class GuiDocViewer(QTextBrowser): userCursor = self.textCursor() userSelection = userCursor.hasSelection() - mnuContext = QMenu() + mnuContext = QMenu(self) # Cut, Copy and Paste # =================== diff --git a/novelwriter/gui/noveltree.py b/novelwriter/gui/noveltree.py index 4d804c40..0742ab54 100644 --- a/novelwriter/gui/noveltree.py +++ b/novelwriter/gui/noveltree.py @@ -228,7 +228,7 @@ class GuiNovelToolBar(QWidget): self.tbRefresh.clicked.connect(self._refreshNovelTree) # More Options Menu - self.mMore = QMenu() + self.mMore = QMenu(self) self.mLastCol = self.mMore.addMenu(self.tr("Last Column")) self.gLastCol = QActionGroup(self.mMore) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index 31d2ca12..929f37c6 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -248,7 +248,7 @@ class GuiProjectToolBar(QWidget): self.viewLabel.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) # Quick Links - self.mQuick = QMenu() + self.mQuick = QMenu(self) self.tbQuick = QToolButton(self) self.tbQuick.setToolTip("%s [Ctrl+L]" % self.tr("Quick Links")) @@ -269,7 +269,7 @@ class GuiProjectToolBar(QWidget): self.tbMoveD.clicked.connect(lambda: self.projTree.moveTreeItem(1)) # Add Item Menu - self.mAdd = QMenu() + self.mAdd = QMenu(self) self.aAddEmpty = self.mAdd.addAction(trConst(nwLabels.ITEM_DESCRIPTION["document"])) self.aAddEmpty.triggered.connect( @@ -307,7 +307,7 @@ class GuiProjectToolBar(QWidget): self.tbAdd.setPopupMode(QToolButton.InstantPopup) # More Options Menu - self.mMore = QMenu() + self.mMore = QMenu(self) self.aExpand = self.mMore.addAction(self.tr("Expand All")) self.aExpand.triggered.connect(lambda: self.projTree.setExpandedFromHandle(None, True)) @@ -1210,7 +1210,7 @@ class GuiProjectTree(QTreeWidget): logger.debug("No item found") return False - ctxMenu = QMenu() + ctxMenu = QMenu(self) # Trash Folder # ============ diff --git a/novelwriter/gui/sidebar.py b/novelwriter/gui/sidebar.py index 266d735a..8854f583 100644 --- a/novelwriter/gui/sidebar.py +++ b/novelwriter/gui/sidebar.py @@ -95,7 +95,7 @@ class GuiSideBar(QToolBar): self.aStats.triggered.connect(lambda: self.mainGui.showWritingStatsDialog()) # Settings Menu - self.mSettings = QMenu() + self.mSettings = QMenu(self) self.mSettings.addAction(self.mainGui.mainMenu.aEditWordList) self.mSettings.addAction(self.mainGui.mainMenu.aProjectSettings) diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py index c4b211fb..cfa1b038 100644 --- a/novelwriter/tools/manussettings.py +++ b/novelwriter/tools/manussettings.py @@ -720,7 +720,7 @@ class _HeadingsTab(QWidget): self.formSyntax = _HeadingSyntaxHighlighter(self.editTextBox.document()) - self.menuInsert = QMenu() + self.menuInsert = QMenu(self) self.aInsTitle = self.menuInsert.addAction(self.tr("Title")) self.aInsChNum = self.menuInsert.addAction(self.tr("Chapter Number")) self.aInsChWord = self.menuInsert.addAction(self.tr("Chapter Number (Word)"))