Merge pull request #1225 from 2xB/fix-mergeerror-1175
ParameterTree: Fix custom context menu
This commit is contained in:
commit
1c67d3ea2f
@ -104,16 +104,18 @@ class ParameterItem(QtGui.QTreeWidgetItem):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def contextMenuEvent(self, ev):
|
def contextMenuEvent(self, ev):
|
||||||
if not self.param.opts.get('removable', False) and not self.param.opts.get('renamable', False)\
|
opts = self.param.opts
|
||||||
and "context" not in self.param.opts:
|
|
||||||
|
if not opts.get('removable', False) and not opts.get('renamable', False)\
|
||||||
|
and "context" not in opts:
|
||||||
return
|
return
|
||||||
|
|
||||||
## Generate context menu for renaming/removing parameter
|
## Generate context menu for renaming/removing parameter
|
||||||
self.contextMenu = QtGui.QMenu() # Put in global name space to prevent garbage collection
|
self.contextMenu = QtGui.QMenu() # Put in global name space to prevent garbage collection
|
||||||
self.contextMenu.addSeparator()
|
self.contextMenu.addSeparator()
|
||||||
if self.param.opts.get('renamable', False):
|
if opts.get('renamable', False):
|
||||||
self.contextMenu.addAction('Rename').triggered.connect(self.editName)
|
self.contextMenu.addAction('Rename').triggered.connect(self.editName)
|
||||||
if self.param.opts.get('removable', False):
|
if opts.get('removable', False):
|
||||||
self.contextMenu.addAction("Remove").triggered.connect(self.requestRemove)
|
self.contextMenu.addAction("Remove").triggered.connect(self.requestRemove)
|
||||||
|
|
||||||
# context menu
|
# context menu
|
||||||
|
Loading…
Reference in New Issue
Block a user