From 7accb372cd65df831233d379b861a3da84e7f0d9 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 15 Aug 2022 14:00:11 +0200
Subject: [PATCH 1/4] remove tray publisher from experimental tools

---
 openpype/modules/traypublish_action.py         | 15 ++-------------
 openpype/tools/experimental_tools/tools_def.py |  5 -----
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/openpype/modules/traypublish_action.py b/openpype/modules/traypublish_action.py
index 39163b8eb8..1038bac47b 100644
--- a/openpype/modules/traypublish_action.py
+++ b/openpype/modules/traypublish_action.py
@@ -2,7 +2,7 @@ import os
 from openpype.lib import get_openpype_execute_args
 from openpype.lib.execute import run_detached_process
 from openpype.modules import OpenPypeModule
-from openpype_interfaces import ITrayAction
+from openpype.modules.interfaces import ITrayAction
 
 
 class TrayPublishAction(OpenPypeModule, ITrayAction):
@@ -21,20 +21,9 @@ class TrayPublishAction(OpenPypeModule, ITrayAction):
                 "publish"
             )
         ]
-        self._experimental_tools = None
 
     def tray_init(self):
-        from openpype.tools.experimental_tools import ExperimentalTools
-
-        self._experimental_tools = ExperimentalTools()
-
-    def tray_menu(self, *args, **kwargs):
-        super(TrayPublishAction, self).tray_menu(*args, **kwargs)
-        traypublisher = self._experimental_tools.get("traypublisher")
-        visible = False
-        if traypublisher and traypublisher.enabled:
-            visible = True
-        self._action_item.setVisible(visible)
+        return
 
     def on_action_trigger(self):
         self.run_traypublisher()
diff --git a/openpype/tools/experimental_tools/tools_def.py b/openpype/tools/experimental_tools/tools_def.py
index fa2971dc1d..38a49e8ab5 100644
--- a/openpype/tools/experimental_tools/tools_def.py
+++ b/openpype/tools/experimental_tools/tools_def.py
@@ -89,11 +89,6 @@ class ExperimentalTools:
                 "New publisher",
                 "Combined creation and publishing into one tool.",
                 self._show_publisher
-            ),
-            ExperimentalTool(
-                "traypublisher",
-                "New Standalone Publisher",
-                "Standalone publisher using new publisher. Requires restart"
             )
         ]
 

From 8e6dcbc048be40e038e3406fd3b3ae22e1631c9a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 15 Aug 2022 14:00:20 +0200
Subject: [PATCH 2/4] change label of tray publisher action

---
 openpype/modules/traypublish_action.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/traypublish_action.py b/openpype/modules/traypublish_action.py
index 1038bac47b..29aea07210 100644
--- a/openpype/modules/traypublish_action.py
+++ b/openpype/modules/traypublish_action.py
@@ -6,7 +6,7 @@ from openpype.modules.interfaces import ITrayAction
 
 
 class TrayPublishAction(OpenPypeModule, ITrayAction):
-    label = "New Publish (beta)"
+    label = "Tray Publish"
     name = "traypublish_tool"
 
     def initialize(self, modules_settings):

From 4d3961e04446bb3515c2f56b0cdd11731825524a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 10 Nov 2022 11:43:17 +0100
Subject: [PATCH 3/4] changed label of standalone publisher

---
 openpype/hosts/standalonepublisher/addon.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/standalonepublisher/addon.py b/openpype/hosts/standalonepublisher/addon.py
index 65a4226664..67204b581b 100644
--- a/openpype/hosts/standalonepublisher/addon.py
+++ b/openpype/hosts/standalonepublisher/addon.py
@@ -10,7 +10,7 @@ STANDALONEPUBLISH_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class StandAlonePublishAddon(OpenPypeModule, ITrayAction, IHostAddon):
-    label = "Publish"
+    label = "Publisher (legacy)"
     name = "standalonepublisher"
     host_name = "standalonepublisher"
 

From e07d26c9392104f3b236435443b6564bfe5adffb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 10 Nov 2022 11:43:27 +0100
Subject: [PATCH 4/4] disable standalone publisher by default

---
 openpype/settings/defaults/system_settings/modules.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/system_settings/modules.json b/openpype/settings/defaults/system_settings/modules.json
index c84d23d3fc..703e72cb5d 100644
--- a/openpype/settings/defaults/system_settings/modules.json
+++ b/openpype/settings/defaults/system_settings/modules.json
@@ -195,7 +195,7 @@
         "enabled": true
     },
     "standalonepublish_tool": {
-        "enabled": true
+        "enabled": false
     },
     "project_manager": {
         "enabled": true