From d1dc238708718d2ff5f8d990cfc5f3b1c76c18f5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 10 Feb 2022 15:29:44 +0100 Subject: [PATCH 01/11] Hiero: adding missing Library menu item --- openpype/hosts/hiero/api/menu.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py index 5aaab7a2e5..306bef87ca 100644 --- a/openpype/hosts/hiero/api/menu.py +++ b/openpype/hosts/hiero/api/menu.py @@ -72,7 +72,7 @@ def menu_install(): menu.addSeparator() - workfiles_action = menu.addAction("Work Files ...") + workfiles_action = menu.addAction("Work Files...") workfiles_action.setIcon(QtGui.QIcon("icons:Position.png")) workfiles_action.triggered.connect(launch_workfiles_app) @@ -82,30 +82,36 @@ def menu_install(): menu.addSeparator() - publish_action = menu.addAction("Publish ...") + publish_action = menu.addAction("Publish...") publish_action.setIcon(QtGui.QIcon("icons:Output.png")) publish_action.triggered.connect( lambda *args: publish(hiero.ui.mainWindow()) ) - creator_action = menu.addAction("Create ...") + creator_action = menu.addAction("Create...") creator_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png")) creator_action.triggered.connect( lambda: host_tools.show_creator(parent=main_window) ) - loader_action = menu.addAction("Load ...") + loader_action = menu.addAction("Load...") loader_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png")) loader_action.triggered.connect( lambda: host_tools.show_loader(parent=main_window) ) - sceneinventory_action = menu.addAction("Manage ...") + sceneinventory_action = menu.addAction("Manage...") sceneinventory_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png")) sceneinventory_action.triggered.connect( lambda: host_tools.show_scene_inventory(parent=main_window) ) + library_action = menu.addAction("Library...") + library_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png")) + library_action.triggered.connect( + lambda: host_tools.show_library_loader(parent=main_window) + ) + if os.getenv("OPENPYPE_DEVELOP"): menu.addSeparator() reload_action = menu.addAction("Reload pipeline") From b5c9aa7179bd97c9b98c7003852d083a9100556f Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 10 Feb 2022 15:29:59 +0100 Subject: [PATCH 02/11] Nuke: adding missing Library menu item --- openpype/hosts/nuke/api/pipeline.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index c47187666b..fbbc39f98f 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -183,7 +183,12 @@ def _install_menu(): "Manage...", lambda: host_tools.show_scene_inventory(parent=main_window) ) - + menu.addCommand( + "Library...", + lambda: host_tools.show_library_loader( + parent=main_window + ) + ) menu.addSeparator() menu.addCommand( "Set Resolution", From 4eb50950a3df5068a51532652e88229bf4544743 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 10 Feb 2022 15:37:20 +0100 Subject: [PATCH 03/11] Houdini: add Library loader menu item also unify items order with other hosts --- .../hosts/houdini/startup/MainMenuCommon.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index bc4a2e809a..617d53d699 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -14,14 +14,14 @@ host_tools.show_creator(parent) ]]> - - + + + import hou + from openpype.tools.utils import host_tools + parent = hou.qt.mainWindow() + host_tools.show_publish(parent) + ]]> @@ -34,14 +34,14 @@ host_tools.show_scene_inventory(parent) ]]> - - + + +host_tools.show_library_loader(parent=parent) +]]> From 520d7f6bab856ce892fd0b35c32f62e6e323673d Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 10 Feb 2022 15:37:46 +0100 Subject: [PATCH 04/11] Resolve: unification of triple dots style --- openpype/hosts/resolve/api/menu.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/resolve/api/menu.py b/openpype/hosts/resolve/api/menu.py index 0d5930d275..9e0dd12376 100644 --- a/openpype/hosts/resolve/api/menu.py +++ b/openpype/hosts/resolve/api/menu.py @@ -54,15 +54,15 @@ class OpenPypeMenu(QtWidgets.QWidget): ) self.setWindowTitle("OpenPype") - workfiles_btn = QtWidgets.QPushButton("Workfiles ...", self) - create_btn = QtWidgets.QPushButton("Create ...", self) - publish_btn = QtWidgets.QPushButton("Publish ...", self) - load_btn = QtWidgets.QPushButton("Load ...", self) - inventory_btn = QtWidgets.QPushButton("Inventory ...", self) - subsetm_btn = QtWidgets.QPushButton("Subset Manager ...", self) - libload_btn = QtWidgets.QPushButton("Library ...", self) + workfiles_btn = QtWidgets.QPushButton("Workfiles...", self) + create_btn = QtWidgets.QPushButton("Create...", self) + publish_btn = QtWidgets.QPushButton("Publish...", self) + load_btn = QtWidgets.QPushButton("Load...", self) + inventory_btn = QtWidgets.QPushButton("Inventory...", self) + subsetm_btn = QtWidgets.QPushButton("Subset Manager...", self) + libload_btn = QtWidgets.QPushButton("Library...", self) experimental_btn = QtWidgets.QPushButton( - "Experimental tools ...", self + "Experimental tools...", self ) # rename_btn = QtWidgets.QPushButton("Rename", self) # set_colorspace_btn = QtWidgets.QPushButton( From 767a5c2df6dd65283c696f5497a3674ac4ec6734 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 10 Feb 2022 15:38:20 +0100 Subject: [PATCH 05/11] houdini: unification of triple dots style --- openpype/hosts/houdini/startup/MainMenuCommon.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index 617d53d699..26151b77c4 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -5,7 +5,7 @@ - + - + - + - + - + Date: Fri, 11 Feb 2022 10:06:27 +0100 Subject: [PATCH 06/11] Update openpype/hosts/houdini/startup/MainMenuCommon.xml Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/houdini/startup/MainMenuCommon.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index 26151b77c4..0831e67762 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -17,11 +17,11 @@ host_tools.show_creator(parent) +import hou +from openpype.tools.utils import host_tools +parent = hou.qt.mainWindow() +host_tools.show_publish(parent) +]]> From 5f3f1e46432255f70ebf9ab69540c4cbdf07ea2e Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 11 Feb 2022 10:10:59 +0100 Subject: [PATCH 07/11] houdini: add loader back https://github.com/pypeclub/OpenPype/pull/2693#discussion_r803801455 --- .../hosts/houdini/startup/MainMenuCommon.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index 0831e67762..b8c7f93d76 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -14,6 +14,16 @@ host_tools.show_creator(parent) ]]> + + + + + +]]> @@ -53,7 +63,7 @@ import hou from openpype.tools.utils import host_tools parent = hou.qt.mainWindow() host_tools.show_workfiles(parent) - ]]> +]]> @@ -63,7 +73,8 @@ host_tools.show_workfiles(parent) import hou from openpype.tools.utils import host_tools parent = hou.qt.mainWindow() -host_tools.show_experimental_tools_dialog(parent)]]> +host_tools.show_experimental_tools_dialog(parent) +]]> From a8c55b0a32a1b6b399d7e9ecff575cad303c6475 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 11 Feb 2022 10:20:21 +0100 Subject: [PATCH 08/11] Blender: adding Library menu item https://github.com/pypeclub/OpenPype/pull/2693#issuecomment-1035111859 --- openpype/hosts/blender/api/ops.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/openpype/hosts/blender/api/ops.py b/openpype/hosts/blender/api/ops.py index a73ef0133a..d89450f928 100644 --- a/openpype/hosts/blender/api/ops.py +++ b/openpype/hosts/blender/api/ops.py @@ -306,6 +306,16 @@ class LaunchManager(LaunchQtApp): self._window.refresh() +class LaunchLibrary(LaunchQtApp): + """Launch Library Loader.""" + + bl_idname = "wm.library_loader" + bl_label = "Library..." + _tool_name = "libraryloader" + + def before_window_show(self): + self._window.refresh() + class LaunchWorkFiles(LaunchQtApp): """Launch Avalon Work Files.""" @@ -365,6 +375,7 @@ class TOPBAR_MT_avalon(bpy.types.Menu): icon_value=pyblish_menu_icon_id, ) layout.operator(LaunchManager.bl_idname, text="Manage...") + layout.operator(LaunchLibrary.bl_idname, text="Library...") layout.separator() layout.operator(LaunchWorkFiles.bl_idname, text="Work Files...") # TODO (jasper): maybe add 'Reload Pipeline', 'Reset Frame Range' and @@ -382,6 +393,7 @@ classes = [ LaunchLoader, LaunchPublisher, LaunchManager, + LaunchLibrary, LaunchWorkFiles, TOPBAR_MT_avalon, ] From 567983342d7f3174e0b3a6aad39d7068bb17598f Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 12 Feb 2022 11:16:12 +0100 Subject: [PATCH 09/11] Remove dots after words in Fusion Menu to align with other hosts --- openpype/hosts/fusion/api/menu.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py index 5d2efb4911..d1c01163b1 100644 --- a/openpype/hosts/fusion/api/menu.py +++ b/openpype/hosts/fusion/api/menu.py @@ -54,13 +54,13 @@ class OpenPypeMenu(QtWidgets.QWidget): ) self.render_mode_widget = None self.setWindowTitle("OpenPype") - workfiles_btn = QtWidgets.QPushButton("Workfiles ...", self) - create_btn = QtWidgets.QPushButton("Create ...", self) - publish_btn = QtWidgets.QPushButton("Publish ...", self) - load_btn = QtWidgets.QPushButton("Load ...", self) - inventory_btn = QtWidgets.QPushButton("Inventory ...", self) - libload_btn = QtWidgets.QPushButton("Library ...", self) - rendermode_btn = QtWidgets.QPushButton("Set render mode ...", self) + workfiles_btn = QtWidgets.QPushButton("Workfiles...", self) + create_btn = QtWidgets.QPushButton("Create...", self) + publish_btn = QtWidgets.QPushButton("Publish...", self) + load_btn = QtWidgets.QPushButton("Load...", self) + inventory_btn = QtWidgets.QPushButton("Inventory...", self) + libload_btn = QtWidgets.QPushButton("Library...", self) + rendermode_btn = QtWidgets.QPushButton("Set render mode...", self) duplicate_with_inputs_btn = QtWidgets.QPushButton( "Duplicate with input connections", self ) From 8246bd23a8c8082ac51330c499a4353d57e8f563 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 14 Feb 2022 10:53:37 +0100 Subject: [PATCH 10/11] flame: menu style unification --- openpype/hosts/flame/api/menu.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/flame/api/menu.py b/openpype/hosts/flame/api/menu.py index 8b4bfd4550..7f1a6a24e2 100644 --- a/openpype/hosts/flame/api/menu.py +++ b/openpype/hosts/flame/api/menu.py @@ -110,19 +110,19 @@ class FlameMenuProjectConnect(_FlameMenuApp): menu = deepcopy(self.menu) menu['actions'].append({ - "name": "Workfiles ...", + "name": "Workfiles...", "execute": lambda x: self.tools_helper.show_workfiles() }) menu['actions'].append({ - "name": "Load ...", + "name": "Load...", "execute": lambda x: self.tools_helper.show_loader() }) menu['actions'].append({ - "name": "Manage ...", + "name": "Manage...", "execute": lambda x: self.tools_helper.show_scene_inventory() }) menu['actions'].append({ - "name": "Library ...", + "name": "Library...", "execute": lambda x: self.tools_helper.show_library_loader() }) return menu @@ -164,24 +164,27 @@ class FlameMenuTimeline(_FlameMenuApp): menu = deepcopy(self.menu) menu['actions'].append({ - "name": "Create ...", + "name": "Create...", "execute": lambda x: callback_selection( x, self.tools_helper.show_creator) }) menu['actions'].append({ - "name": "Publish ...", + "name": "Publish...", "execute": lambda x: callback_selection( x, self.tools_helper.show_publish) }) menu['actions'].append({ - "name": "Load ...", + "name": "Load...", "execute": lambda x: self.tools_helper.show_loader() }) menu['actions'].append({ - "name": "Manage ...", + "name": "Manage...", "execute": lambda x: self.tools_helper.show_scene_inventory() }) - + menu['actions'].append({ + "name": "Library...", + "execute": lambda x: self.tools_helper.show_library_loader() + }) return menu def refresh(self, *args, **kwargs): From c6a1eb7b352fd2ad85de97eb255ccb9b9091fa6c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 14 Feb 2022 11:12:05 +0100 Subject: [PATCH 11/11] add one empty line --- openpype/hosts/blender/api/ops.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/blender/api/ops.py b/openpype/hosts/blender/api/ops.py index d89450f928..3069c3e1c9 100644 --- a/openpype/hosts/blender/api/ops.py +++ b/openpype/hosts/blender/api/ops.py @@ -316,6 +316,7 @@ class LaunchLibrary(LaunchQtApp): def before_window_show(self): self._window.refresh() + class LaunchWorkFiles(LaunchQtApp): """Launch Avalon Work Files."""