moved addAction to MenuBase

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)
 
 
 

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()
 

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)
-