Loader & Library loader: Use tools from OpenPype

avalon/aftereffects/lib.py

@@ -18,7 +18,11 @@
 from avalon import api
 from avalon.tools.webserver.app import WebServerTool
 
-from openpype.tools import workfiles
+from openpype.tools import (
+ workfiles,
+ loader,
+ libraryloader
+)
 from openpype.tools.tray_app.app import ConsoleTrayApp
 
 from .ws_stub import AfterEffectsServerStub
@@ -40,6 +44,13 @@ def show(module_name):
  if module_name == "workfiles":
  # Use OpenPype's workfiles tool
  tool_module = workfiles
+
+ elif module_name == "loader":
+ tool_module = loader
+
+ elif module_name == "libraryloader":
+ tool_module = libraryloader
+
  else:
  tool_module = importlib.import_module("avalon.tools." + module_name)
 

avalon/blender/ops.py

@@ -15,7 +15,7 @@
 import bpy.utils.previews
 
 from ..tools.creator.app import Window as creator_window
-from ..tools.loader.app import Window as loader_window
+from openpype.tools.loader import LoaderWindow
 from openpype.tools.workfiles.app import Window as workfiles_window
 from ..tools.sceneinventory.app import Window as sceneinventory_window
 from openpype.tools.pyblish_pype import app as pyblish_pype_app
@@ -282,7 +282,7 @@ class LaunchLoader(LaunchQtApp):
 
  bl_idname = "wm.avalon_loader"
  bl_label = "Load..."
- _window_class = loader_window
+ _window_class = LoaderWindow
 
  def before_window_show(self):
  self._window.set_context(

avalon/harmony/TB_sceneOpened.js

@@ -405,7 +405,7 @@ function start() {
  app.avalonClient.send({
  'module': 'avalon.harmony.lib',
  'method': 'show',
- 'args': ['avalon.tools.loader']
+ 'args': ['openpype.tools.loader']
  }, false);
  };
  // add Loader item to menu

avalon/maya/pipeline.py

@@ -108,9 +108,11 @@ def _install_menu():
  from ..tools import (
  projectmanager,
  creator,
- loader,
  publish,
- sceneinventory,
+ sceneinventory
+ )
+ from openpype.tools import (
+ loader,
  libraryloader
  )
 

avalon/nuke/pipeline.py

@@ -269,9 +269,10 @@ def _install_menu():
  creator,
  publish,
  workfiles,
- loader,
  sceneinventory
  )
+ from openpype.tools import loader
+
 
  # Create menu
  menubar = nuke.menu("Nuke")

avalon/photoshop/lib.py

@@ -18,7 +18,11 @@
 from avalon import api
 from avalon.tools.webserver.app import WebServerTool
 
-from openpype.tools import workfiles
+from openpype.tools import (
+ workfiles,
+ loader,
+ libraryloader
+)
 from openpype.tools.tray_app.app import ConsoleTrayApp
 
 from .ws_stub import PhotoshopServerStub
@@ -39,6 +43,13 @@ def show(module_name):
  if module_name == "workfiles":
  # Use Pype's workfiles tool
  tool_module = workfiles
+
+ elif module_name == "loader":
+ tool_module = loader
+
+ elif module_name == "libraryloader":
+ tool_module = libraryloader
+
  else:
  # Import and show tool.
  tool_module = importlib.import_module("avalon.tools." + module_name)

avalon/toonboom/avalon.js

@@ -181,7 +181,7 @@ function start()
  {
  "module": "avalon.toonboom",
  "method": "show",
- "args": ["pype.tools.workfiles"]
+ "args": ["openpype.tools.workfiles"]
  },
  false
  );
@@ -195,7 +195,7 @@ function start()
  {
  "module": "avalon.toonboom",
  "method": "show",
- "args": ["avalon.tools.loader"]
+ "args": ["openpype.tools.loader"]
  },
  false
  );

avalon/tvpaint/communication_server.py

@@ -302,9 +302,9 @@ def loader_tool(self):
  if self._loader_tool is not None:
  return self._loader_tool
 
- from ..tools.loader.app import Window
+ from openpype.tools.loader import LoaderWindow
 
- window = Window()
+ window = LoaderWindow()
  window.setWindowFlags(
  window.windowFlags() | QtCore.Qt.WindowStaysOnTopHint
  )
@@ -396,9 +396,9 @@ def library_loader_tool(self):
  if self._library_loader_tool is not None:
  return self._library_loader_tool
 
- from ..tools.libraryloader.app import Window
+ from openpype.tools.libraryloader import LibraryLoaderWindow
 
- window = Window()
+ window = LibraryLoaderWindow()
  window.setWindowFlags(
  window.windowFlags() | QtCore.Qt.WindowStaysOnTopHint
  )

avalon/unreal/pipeline.py

@@ -7,10 +7,12 @@
 from ..tools import (
  projectmanager,
  creator,
- loader,
  publish as publisher,
  sceneinventory,
 )
+from openpype.tools import (
+ loader
+)
 
 from .. import api
 from .lib import (