From 332af67b557adf09551f946d7dbada19d76cfa51 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 30 Dec 2022 01:23:52 +0100 Subject: [PATCH] moved addAction to MenuBase --- grum/menus/barmenu.py | 8 +------- grum/menus/menubase.py | 4 ++++ grum/menus/rclickmenu.py | 6 +----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/grum/menus/barmenu.py b/grum/menus/barmenu.py index 5007021..f7349d3 100644 --- a/grum/menus/barmenu.py +++ b/grum/menus/barmenu.py @@ -1,5 +1,3 @@ -from PyQt5.QtWidgets import QAction - from .menubase import MenuBase @@ -7,11 +5,7 @@ class BarMenu(MenuBase): def __init__(self, bar, name): super().__init__() - self.qmenu = qmenu = bar.addMenu(name) - - def addAction(self, name, func): - action = QAction(name, triggered=func, parent=self.qmenu) # here, parent needs to be set - self.qmenu.addAction(action) + self.qmenu = bar.addMenu(name) diff --git a/grum/menus/menubase.py b/grum/menus/menubase.py index 4b31d02..e6b6f7c 100644 --- a/grum/menus/menubase.py +++ b/grum/menus/menubase.py @@ -6,6 +6,10 @@ class MenuBase: def __init__(self): self.checkboxes = {} + def addAction(self, name, func): + action = QAction(name, triggered=func, parent=self.qmenu) # here, parent needs to be set + self.qmenu.addAction(action) + def addSeparator(self): self.qmenu.addSeparator() diff --git a/grum/menus/rclickmenu.py b/grum/menus/rclickmenu.py index 177cba2..a3e678e 100644 --- a/grum/menus/rclickmenu.py +++ b/grum/menus/rclickmenu.py @@ -1,5 +1,5 @@ from PyQt5.QtCore import Qt, QPoint -from PyQt5.QtWidgets import QMenu, QAction +from PyQt5.QtWidgets import QMenu from PyQt5.QtGui import QCursor from .menubase import MenuBase @@ -17,9 +17,5 @@ class RClickMenu(MenuBase): pos = QCursor.pos() self.qmenu.exec(pos) - def addAction(self, name, func): - action = QAction(name, triggered=func, parent=self.qmenu) # here, parent needs to be set - self.qmenu.addAction(action) -