diff --git a/cuegui/cuegui/FrameMonitorTree.py b/cuegui/cuegui/FrameMonitorTree.py index cfda922ec..8cee48214 100644 --- a/cuegui/cuegui/FrameMonitorTree.py +++ b/cuegui/cuegui/FrameMonitorTree.py @@ -212,6 +212,9 @@ def __init__(self, parent): cuegui.AbstractTreeWidget.AbstractTreeWidget.__init__(self, parent) + # Used to build right click context menus + self.__menuActions = cuegui.MenuActions.MenuActions( + self, self.updateSoon, self.selectedObjects, self.getJob) self.__sortByColumnCache = {} self.ticksWithoutUpdate = 999 self.__lastUpdateTime = None @@ -877,6 +880,8 @@ def __init__(self, widget, filterSelectedLayersCallback): self.__menuActions.frames().addAction(self, "xdiff2") self.__menuActions.frames().addAction(self, "useLocalCores") + if bool(int(QtGui.qApp.settings.value("AllowDeeding", 0))): + self.__menuActions.frames().addAction(self, "useLocalCores") # pylint: disable=no-member if QtGui.qApp.applicationName() == "CueCommander": diff --git a/cuegui/cuegui/JobMonitorTree.py b/cuegui/cuegui/JobMonitorTree.py index 7552b2859..641989b98 100644 --- a/cuegui/cuegui/JobMonitorTree.py +++ b/cuegui/cuegui/JobMonitorTree.py @@ -305,7 +305,9 @@ def contextMenuEvent(self, e): self.__menuActions.jobs().addAction(menu, "view") self.__menuActions.jobs().addAction(menu, "emailArtist") self.__menuActions.jobs().addAction(menu, "viewComments") - self.__menuActions.jobs().addAction(menu, "useLocalCores") + + if bool(int(QtGui.qApp.settings.value("AllowDeeding", 0))): + self.__menuActions.jobs().addAction(menu, "useLocalCores") depend_menu = QtWidgets.QMenu("&Dependencies",self) self.__menuActions.jobs().addAction(depend_menu, "viewDepends") diff --git a/cuegui/cuegui/LayerMonitorTree.py b/cuegui/cuegui/LayerMonitorTree.py index 5b15450b6..20a98cb5f 100644 --- a/cuegui/cuegui/LayerMonitorTree.py +++ b/cuegui/cuegui/LayerMonitorTree.py @@ -21,6 +21,7 @@ from __future__ import division from PySide2 import QtCore +from PySide2 import QtGui from PySide2 import QtWidgets from opencue.exception import EntityNotFoundException @@ -231,8 +232,9 @@ def contextMenuEvent(self, e): if len(__selectedObjects) == 1: menu.addSeparator() - self.__menuActions.layers().addAction(menu, "useLocalCores") - if len({layer.data.range for layer in __selectedObjects}) == 1: + if bool(int(QtGui.qApp.settings.value("AllowDeeding", 0))): + self.__menuActions.layers().addAction(menu, "useLocalCores") + if len(set([layer.data.range for layer in __selectedObjects])) == 1: self.__menuActions.layers().addAction(menu, "reorder") self.__menuActions.layers().addAction(menu, "stagger")