From a70fb17b7c39f819f04e1b811d8c3052288915e3 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Thu, 22 Dec 2022 13:08:51 +0100
Subject: [PATCH] naming

---
 grum/menus/barmenu.py    | 8 ++++----
 grum/menus/rclickmenu.py | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/grum/menus/barmenu.py b/grum/menus/barmenu.py
index 3621bc9..2633d9c 100644
--- a/grum/menus/barmenu.py
+++ b/grum/menus/barmenu.py
@@ -4,8 +4,8 @@ from PyQt5.QtWidgets import QAction
 class BarMenu:
 
     def __init__(self, bar, name):
-        self.menu = menu = bar.addMenu(name)
-        menu.triggered[QAction].connect(self.on_select)
+        self.qmenu = qmenu = bar.addMenu(name)
+        qmenu.triggered[QAction].connect(self.on_select)
         self.actions = {}
 
     def on_select(self, p):
@@ -14,11 +14,11 @@ class BarMenu:
         func()
 
     def addAction(self, name, func):
-        self.menu.addAction(name)
+        self.qmenu.addAction(name)
         self.actions[name] = func
 
     def addSeparator(self):
-        self.menu.addSeparator()
+        self.qmenu.addSeparator()
 
 
 
diff --git a/grum/menus/rclickmenu.py b/grum/menus/rclickmenu.py
index c6e72c7..644324c 100644
--- a/grum/menus/rclickmenu.py
+++ b/grum/menus/rclickmenu.py
@@ -7,17 +7,20 @@ class RClickMenu:
 
     def __init__(self, obj):
         self.obj = obj
-        self.menu = QMenu()
+        self.qmenu = QMenu()
         obj.setContextMenuPolicy(Qt.CustomContextMenu)
         obj.customContextMenuRequested[QPoint].connect(self.on_show)
 
     def on_show(self):
         pos = QCursor.pos()
-        self.menu.exec(pos)
+        self.qmenu.exec(pos)
 
     def addAction(self, name, func):
         action = QAction(name, triggered=func, parent=self.obj) # here, parent needs to be set
-        self.menu.addAction(action)
+        self.qmenu.addAction(action)
+
+    def addSeparator(self):
+        self.qmenu.addSeparator()