DispatcherUI : Restore "Ctrl + R" shortcut

GafferHQ · Feb 7, 2024 · b6274ad · b6274ad
1 parent 957ab7f
commit b6274ad
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/python/GafferDispatchUI/DispatcherUI.py b/python/GafferDispatchUI/DispatcherUI.py
@@ -151,6 +151,47 @@
 
 )
 
+##################################################################################
+# Dispatch
+##################################################################################
+
+def appendMenuDefinitions( menuDefinition, prefix = "" ) :
+
+	menuDefinition.append(
+		prefix + "/Repeat Previous",
+		{
+			"command" : __repeatLastDispatch,
+			"shortCut" : "Ctrl+R",
+			"active" : lambda menu : __getLastDispatcher( menu.ancestor( GafferUI.ScriptWindow ).scriptNode() ) is not None
+		}
+	)
+
+def _dispatch( dispatcher, parentWindow  ) :
+
+	with dispatcher.scriptNode().context() :
+		with GafferUI.ErrorDialogue.ErrorHandler(
+			title = "Errors Occurred During Dispatch",
+			parentWindow = parentWindow
+		) :
+			dispatcher["task"].execute()
+			__setLastDispatcher( dispatcher.scriptNode(), dispatcher )
+
+def __setLastDispatcher( script, dispatcher ) :
+
+	GafferUI.ScriptWindow.acquire( script ).__lastDispatcher = weakref.ref( dispatcher )
+
+def __getLastDispatcher( script ) :
+
+	try :
+		return GafferUI.ScriptWindow.acquire( script ).__lastDispatcher()
+	except AttributeError :
+		return None
+
+def __repeatLastDispatch( menu ) :
+
+	scriptWindow = menu.ancestor( GafferUI.ScriptWindow )
+	_dispatch( __getLastDispatcher( scriptWindow.scriptNode() ), scriptWindow )
+
 ##################################################################################
 # DispatchButton
 ##################################################################################
@@ -166,12 +207,7 @@ def __init__( self, node, **kw ) :
 
 	def __clicked( self, button ) :
 
-		with self.__node.scriptNode().context() :
-			with GafferUI.ErrorDialogue.ErrorHandler(
-				title = "Errors Occurred During Dispatch",
-				parentWindow = self.ancestor( GafferUI.Window )
-			) :
-				self.__node["task"].execute()
+		_dispatch( self.__node, self.ancestor( GafferUI.Window ) )
 
 ##########################################################################
 # Additional Metadata for TaskNode

diff --git a/startup/gui/menus.py b/startup/gui/menus.py
@@ -577,6 +577,8 @@ def __usdLightCreator( lightType ) :
 	GafferTractor.tractorAPI()
 	nodeMenu.append( "/Dispatch/Tractor Dispatcher", GafferTractor.TractorDispatcher, searchText = "TractorDispatcher" )
 
+GafferDispatchUI.DispatcherUI.appendMenuDefinitions( scriptWindowMenu, "/Tools/Dispatch" )
+
 ## Metadata cleanup
 ###########################################################################