Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into host-openpype-chasing

Browse source
This commit is contained in:
Milan Kolar 2021-04-01 21:54:32 +02:00 • committed by GitHub
commit 785d529b39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/hosts/hiero/plugins/create/create_shot_clip.py
View file

@ -1,5 +1,5 @@
import openpype.hosts.hiero.api as phiero import openpype.hosts.hiero.api as phiero
# from pype.hosts.hiero.api import plugin, lib # from openpype.hosts.hiero.api import plugin, lib
# reload(lib) # reload(lib)
# reload(plugin) # reload(plugin)
# reload(phiero) # reload(phiero)

2
openpype/hosts/hiero/plugins/load/load_clip.py
View file

@ -1,6 +1,6 @@
from avalon import io, api from avalon import io, api
import openpype.hosts.hiero.api as phiero import openpype.hosts.hiero.api as phiero
# from pype.hosts.hiero.api import plugin, lib # from openpype.hosts.hiero.api import plugin, lib
# reload(lib) # reload(lib)
# reload(plugin) # reload(plugin)
# reload(phiero) # reload(phiero)

2
openpype/hosts/hiero/plugins/publish/extract_clip_effects.py
View file

@ -1,4 +1,4 @@
# from pype import plugins # from openpype import plugins
import os import os
import json import json
import pyblish.api import pyblish.api

2
openpype/hosts/hiero/plugins/publish/precollect_instances.py
View file

@ -2,7 +2,7 @@ from compiler.ast import flatten
from pyblish import api from pyblish import api
from openpype.hosts.hiero import api as phiero from openpype.hosts.hiero import api as phiero
import hiero import hiero
# from pype.hosts.hiero.api import lib # from openpype.hosts.hiero.api import lib
# reload(lib) # reload(lib)
# reload(phiero) # reload(phiero)

3
openpype/hosts/maya/plugins/load/load_rendersetup.py
View file

@ -32,7 +32,8 @@ class RenderSetupLoader(api.Loader):
def load(self, context, name, namespace, data): def load(self, context, name, namespace, data):
"""Load RenderSetup settings.""" """Load RenderSetup settings."""
from avalon.maya.pipeline import containerise from avalon.maya.pipeline import containerise
# from openpype.maya.api.lib import namespaced
# from openpype.hosts.maya.api.lib import namespaced
asset = context['asset']['name'] asset = context['asset']['name']
namespace = namespace or lib.unique_namespace( namespace = namespace or lib.unique_namespace(

4
openpype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py
View file

@ -4,12 +4,12 @@ import six
import pyblish.api import pyblish.api
from avalon import io from avalon import io
# Copy of constant `pype.modules.ftrack.lib.avalon_sync.CUST_ATTR_AUTO_SYNC` # Copy of constant `openpype.modules.ftrack.lib.avalon_sync.CUST_ATTR_AUTO_SYNC`
CUST_ATTR_AUTO_SYNC = "avalon_auto_sync" CUST_ATTR_AUTO_SYNC = "avalon_auto_sync"
CUST_ATTR_GROUP = "openpype" CUST_ATTR_GROUP = "openpype"
# Copy of `get_pype_attr` from pype.modules.ftrack.lib # Copy of `get_pype_attr` from openpype.modules.ftrack.lib
# TODO import from openpype's ftrack module when possible to not break Python 2 # TODO import from openpype's ftrack module when possible to not break Python 2
def get_pype_attr(session, split_hierarchical=True): def get_pype_attr(session, split_hierarchical=True):
custom_attributes = [] custom_attributes = []

2
openpype/modules/ftrack/tray/login_dialog.py
View file

@ -17,7 +17,7 @@ class CredentialsDialog(QtWidgets.QDialog):
def __init__(self, parent=None): def __init__(self, parent=None):
super(CredentialsDialog, self).__init__(parent) super(CredentialsDialog, self).__init__(parent)
self.setWindowTitle("Pype - Ftrack Login") self.setWindowTitle("OpenPype - Ftrack Login")
self._login_server_thread = None self._login_server_thread = None
self._is_logged = False self._is_logged = False

3
openpype/tools/settings/local_settings/mongo_widget.py
View file

@ -50,7 +50,8 @@ class OpenPypeMongoWidget(QtWidgets.QWidget):
title = "OpenPype mongo changed" title = "OpenPype mongo changed"
message = ( message = (
"OpenPype mongo url was successfully changed. Restart Pype please." "OpenPype mongo url was successfully changed."
" Restart OpenPype application please."
) )
details = None details = None

2
openpype/tools/settings/local_settings/window.py
View file

@ -56,7 +56,7 @@ class LocalSettingsWidget(QtWidgets.QWidget):
self.main_layout.addWidget(SpacerWidget(self), 1) self.main_layout.addWidget(SpacerWidget(self), 1)
def _create_pype_mongo_ui(self): def _create_pype_mongo_ui(self):
pype_mongo_expand_widget = ExpandingWidget("Pype Mongo URL", self) pype_mongo_expand_widget = ExpandingWidget("OpenPype Mongo URL", self)
pype_mongo_content = QtWidgets.QWidget(self) pype_mongo_content = QtWidgets.QWidget(self)
pype_mongo_layout = QtWidgets.QVBoxLayout(pype_mongo_content) pype_mongo_layout = QtWidgets.QVBoxLayout(pype_mongo_content)
pype_mongo_layout.setContentsMargins(CHILD_OFFSET, 5, 0, 0) pype_mongo_layout.setContentsMargins(CHILD_OFFSET, 5, 0, 0)

16
openpype/tools/tray/pype_info_widget.py
View file

@ -204,11 +204,11 @@ class PypeInfoWidget(QtWidgets.QWidget):
icon = QtGui.QIcon(resources.pype_icon_filepath()) icon = QtGui.QIcon(resources.pype_icon_filepath())
self.setWindowIcon(icon) self.setWindowIcon(icon)
self.setWindowTitle("Pype info") self.setWindowTitle("OpenPype info")
main_layout = QtWidgets.QVBoxLayout(self) main_layout = QtWidgets.QVBoxLayout(self)
main_layout.setAlignment(QtCore.Qt.AlignTop) main_layout.setAlignment(QtCore.Qt.AlignTop)
main_layout.addWidget(self._create_pype_info_widget(), 0) main_layout.addWidget(self._create_openpype_info_widget(), 0)
main_layout.addWidget(self._create_separator(), 0) main_layout.addWidget(self._create_separator(), 0)
main_layout.addWidget(self._create_workstation_widget(), 0) main_layout.addWidget(self._create_workstation_widget(), 0)
main_layout.addWidget(self._create_separator(), 0) main_layout.addWidget(self._create_separator(), 0)
@ -347,8 +347,8 @@ class PypeInfoWidget(QtWidgets.QWidget):
return env_widget return env_widget
def _create_pype_info_widget(self): def _create_openpype_info_widget(self):
"""Create widget with information about pype application.""" """Create widget with information about OpenPype application."""
# Get pype info data # Get pype info data
pype_info = get_pype_info() pype_info = get_pype_info()
@ -360,10 +360,10 @@ class PypeInfoWidget(QtWidgets.QWidget):
pype_info["version_value"] = version_value pype_info["version_value"] = version_value
# Prepare lable mapping # Prepare lable mapping
key_label_mapping = { key_label_mapping = {
"version_value": "Pype version:", "version_value": "OpenPype version:",
"executable": "Pype executable:", "executable": "OpenPype executable:",
"pype_root": "Pype location:", "pype_root": "OpenPype location:",
"mongo_url": "Pype Mongo URL:" "mongo_url": "OpenPype Mongo URL:"
} }
# Prepare keys order # Prepare keys order
keys_order = ["version_value", "executable", "pype_root", "mongo_url"] keys_order = ["version_value", "executable", "pype_root", "mongo_url"]