From 60f1c3cecd0f26758d69ccfa84e6601c0000b0a3 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Fri, 15 Oct 2021 16:51:45 +0200
Subject: [PATCH] resolve is using host_tools

---
 openpype/hosts/resolve/api/menu.py     | 24 ++++++++----------------
 openpype/hosts/resolve/api/pipeline.py |  8 +++-----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/openpype/hosts/resolve/api/menu.py b/openpype/hosts/resolve/api/menu.py
index c639fd2db8..262ce739dd 100644
--- a/openpype/hosts/resolve/api/menu.py
+++ b/openpype/hosts/resolve/api/menu.py
@@ -8,15 +8,7 @@ from .pipeline import (
     launch_workfiles_app
 )
 
-from avalon.tools import (
-    creator,
-    sceneinventory,
-    subsetmanager
-)
-from openpype.tools import (
-    loader,
-    libraryloader,
-)
+from openpype.tools.utils import host_tools
 
 
 def load_stylesheet():
@@ -32,7 +24,7 @@ def load_stylesheet():
 
 class Spacer(QtWidgets.QWidget):
     def __init__(self, height, *args, **kwargs):
-        super(self.__class__, self).__init__(*args, **kwargs)
+        super(Spacer, self).__init__(*args, **kwargs)
 
         self.setFixedHeight(height)
 
@@ -49,7 +41,7 @@ class Spacer(QtWidgets.QWidget):
 
 class OpenPypeMenu(QtWidgets.QWidget):
     def __init__(self, *args, **kwargs):
-        super(self.__class__, self).__init__(*args, **kwargs)
+        super(OpenPypeMenu, self).__init__(*args, **kwargs)
 
         self.setObjectName("OpenPypeMenu")
 
@@ -119,7 +111,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
 
     def on_create_clicked(self):
         print("Clicked Create")
-        creator.show()
+        host_tools.show_creator()
 
     def on_publish_clicked(self):
         print("Clicked Publish")
@@ -127,19 +119,19 @@ class OpenPypeMenu(QtWidgets.QWidget):
 
     def on_load_clicked(self):
         print("Clicked Load")
-        loader.show(use_context=True)
+        host_tools.show_loader(use_context=True)
 
     def on_inventory_clicked(self):
         print("Clicked Inventory")
-        sceneinventory.show()
+        host_tools.show_scene_inventory()
 
     def on_subsetm_clicked(self):
         print("Clicked Subset Manager")
-        subsetmanager.show()
+        host_tools.show_subset_manager()
 
     def on_libload_clicked(self):
         print("Clicked Library")
-        libraryloader.show()
+        host_tools.show_library_loader()
 
     def on_rename_clicked(self):
         print("Clicked Rename")
diff --git a/openpype/hosts/resolve/api/pipeline.py b/openpype/hosts/resolve/api/pipeline.py
index 80249310e8..ce95cfe02a 100644
--- a/openpype/hosts/resolve/api/pipeline.py
+++ b/openpype/hosts/resolve/api/pipeline.py
@@ -4,7 +4,6 @@ Basic avalon integration
 import os
 import contextlib
 from collections import OrderedDict
-from openpype.tools import workfiles
 from avalon import api as avalon
 from avalon import schema
 from avalon.pipeline import AVALON_CONTAINER_ID
@@ -12,6 +11,7 @@ from pyblish import api as pyblish
 from openpype.api import Logger
 from . import lib
 from . import PLUGINS_DIR
+from openpype.tools.utils import host_tools
 log = Logger().get_logger(__name__)
 
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
@@ -212,14 +212,12 @@ def update_container(timeline_item, data=None):
 
 
 def launch_workfiles_app(*args):
-    workdir = os.environ["AVALON_WORKDIR"]
-    workfiles.show(workdir)
+    host_tools.show_workfiles()
 
 
 def publish(parent):
     """Shorthand to publish from within host"""
-    from avalon.tools import publish
-    return publish.show(parent)
+    return host_tools.show_publish()
 
 
 @contextlib.contextmanager