Merge pull request #4051 from pypeclub/feature/OP-3908_Make-New-Publi…

…sher-default-in-Photoshop

Photoshop: make new publisher default

openpype/hosts/photoshop/api/__init__.py

@@ -7,28 +7,15 @@
 from .launch_logic import stub
 
 from .pipeline import (
+ PhotoshopHost,
  ls,
- list_instances,
- remove_instance,
- install,
- uninstall,
- containerise,
- get_context_data,
- update_context_data,
- get_context_title
+ containerise
 )
 from .plugin import (
  PhotoshopLoader,
  get_unique_layer_name
 )
-from .workio import (
- file_extensions,
- has_unsaved_changes,
- save_file,
- open_file,
- current_file,
- work_root,
-)
+
 
 from .lib import (
  maintained_selection,
@@ -40,28 +27,14 @@
  "stub",
 
  # pipeline
+ "PhotoshopHost",
  "ls",
- "list_instances",
- "remove_instance",
- "install",
- "uninstall",
  "containerise",
- "get_context_data",
- "update_context_data",
- "get_context_title",
 
  # Plugin
  "PhotoshopLoader",
  "get_unique_layer_name",
 
- # workfiles
- "file_extensions",
- "has_unsaved_changes",
- "save_file",
- "open_file",
- "current_file",
- "work_root",
-
  # lib
  "maintained_selection",
  "maintained_visibility",

openpype/hosts/photoshop/api/extension/CSXS/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<ExtensionManifest ExtensionBundleId="com.openpype.PS.panel" ExtensionBundleVersion="1.0.11" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ExtensionManifest ExtensionBundleId="com.openpype.PS.panel" ExtensionBundleVersion="1.0.12" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <ExtensionList>
  <Extension Id="com.openpype.PS.panel" Version="1.0.1" />
  </ExtensionList>

openpype/hosts/photoshop/api/extension/index.html

@@ -32,17 +32,6 @@
  });
  </script>
 
- <script type=text/javascript>
- $(function() {
- $("a#creator-button").bind("click", function() {
- RPC.call('Photoshop.creator_route').then(function (data) {
- }, function (error) {
- alert(error);
- });
- });
- });
- </script>
-
  <script type=text/javascript>
  $(function() {
  $("a#loader-button").bind("click", function() {
@@ -75,17 +64,6 @@
  });
  });
  </script>
-
- <script type=text/javascript>
- $(function() {
- $("a#subsetmanager-button").bind("click", function() {
- RPC.call('Photoshop.subsetmanager_route').then(function (data) {
- }, function (error) {
- alert(error);
- });
- });
- });
- </script>
 
  <script type=text/javascript>
  $(function() {
@@ -109,11 +87,9 @@
  <script type="text/javascript" src="./client/client.js"></script>
 
  <a href=# id=workfiles-button><button>Workfiles...</button></a>
- <a href=# id=creator-button><button>Create...</button></a>
  <a href=# id=loader-button><button>Load...</button></a>
  <a href=# id=publish-button><button>Publish...</button></a>
  <a href=# id=sceneinventory-button><button>Manage...</button></a>
- <a href=# id=subsetmanager-button><button>Subset Manager...</button></a>
  <a href=# id=experimental-button><button>Experimental Tools...</button></a>
 </body>
 </html>

openpype/hosts/photoshop/api/launch_logic.py

@@ -334,24 +334,18 @@ async def read(self):
  return await self.socket.call('photoshop.read')
 
  # panel routes for tools
- async def creator_route(self):
- self._tool_route("creator")
-
  async def workfiles_route(self):
  self._tool_route("workfiles")
 
  async def loader_route(self):
  self._tool_route("loader")
 
  async def publish_route(self):
- self._tool_route("publish")
+ self._tool_route("publisher")
 
  async def sceneinventory_route(self):
  self._tool_route("sceneinventory")
 
- async def subsetmanager_route(self):
- self._tool_route("subsetmanager")
-
  async def experimental_tools_route(self):
  self._tool_route("experimental_tools")
 

openpype/hosts/photoshop/api/lib.py

@@ -20,9 +20,11 @@ def safe_excepthook(*args):
 
 
 def main(*subprocess_args):
- from openpype.hosts.photoshop import api
+ from openpype.hosts.photoshop.api import PhotoshopHost
+
+ host = PhotoshopHost()
+ install_host(host)
 
- install_host(api)
  sys.excepthook = safe_excepthook
 
  # coloring in StdOutBroker