rename shotgun to shotgrid

openpype/modules/shotgrid/__init__.py

@@ -0,0 +1,3 @@
+from openpype.modules.shotgrid.shotgrid_module import ShotgridModule
+
+__all__ = ("ShotgridModule",)

openpype/modules/shotgun/hooks/post_shotgun_changes.py → openpype/modules/shotgrid/hooks/post_shotgrid_changes.py

@@ -1,7 +1,7 @@
 from openpype.lib import PostLaunchHook
 
 
-class PostShotgunHook(PostLaunchHook):
+class PostShotgridHook(PostLaunchHook):
  order = None
 
  def execute(self, *args, **kwargs):

openpype/modules/shotgun/shotgun_module.py → openpype/modules/shotgrid/shotgrid_module.py

@@ -2,21 +2,21 @@
 from typing import Optional, Dict, AnyStr, Any
 
 from openpype.modules import PypeModule, ITrayModule, IPluginPaths, ILaunchHookPaths
-from openpype.modules.shotgun.tray.shotgun_tray import ShotgunTrayWrapper
+from openpype.modules.shotgrid.tray.shotgrid_tray import ShotgridTrayWrapper
 
-SHOTGUN_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
+SHOTGRID_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
-class ShotgunModule(PypeModule, ITrayModule, IPluginPaths, ILaunchHookPaths):
- name: str = "shotgun"
+class ShotgridModule(PypeModule, ITrayModule, IPluginPaths, ILaunchHookPaths):
+ name: str = "shotgrid"
  enabled: bool = False
  project_id: Optional[str] = None
- tray_wrapper: ShotgunTrayWrapper
+ tray_wrapper: ShotgridTrayWrapper
 
  def initialize(self, modules_settings: Dict[AnyStr, Any]):
- shotgun_settings = modules_settings.get(self.name, dict())
- self.enabled = shotgun_settings.get("enabled", False)
- self.project_id = shotgun_settings.get("project_id")
+ shotgrid_settings = modules_settings.get(self.name, dict())
+ self.enabled = shotgrid_settings.get("enabled", False)
+ self.project_id = shotgrid_settings.get("project_id")
 
  # if self.enabled and not self.project_id:
  # raise Exception("Project id is not set in settings.")
@@ -28,13 +28,13 @@ def get_global_environments(self) -> Dict[AnyStr, Any]:
  return {"PROJECT_ID": self.project_id}
 
  def get_plugin_paths(self) -> Dict[AnyStr, Any]:
- return {"publish": [os.path.join(SHOTGUN_MODULE_DIR, "plugins", "publish")]}
+ return {"publish": [os.path.join(SHOTGRID_MODULE_DIR, "plugins", "publish")]}
 
  def get_launch_hook_paths(self) -> AnyStr:
- return os.path.join(SHOTGUN_MODULE_DIR, "hooks")
+ return os.path.join(SHOTGRID_MODULE_DIR, "hooks")
 
  def tray_init(self):
- self.tray_wrapper = ShotgunTrayWrapper(self)
+ self.tray_wrapper = ShotgridTrayWrapper(self)
 
  def tray_start(self):
  return self.tray_wrapper.validate()

openpype/modules/shotgun/tray/credential_dialog.py → openpype/modules/shotgrid/tray/credential_dialog.py

@@ -28,7 +28,7 @@ def __init__(self, module, parent=None):
 
  self._module = module
  self._is_logged = False
- self.setWindowTitle("OpenPype - Shotgun Login")
+ self.setWindowTitle("OpenPype - Shotgrid Login")
 
  self.setWindowFlags(
  QtCore.Qt.WindowCloseButtonHint | QtCore.Qt.WindowMinimizeButtonHint
@@ -40,7 +40,7 @@ def __init__(self, module, parent=None):
  self.ui_init()
 
  def ui_init(self):
- self.url_label = QtWidgets.QLabel("Shotgun URL:")
+ self.url_label = QtWidgets.QLabel("Shotgrid URL:")
  self.login_label = QtWidgets.QLabel("Login:")
  self.password_label = QtWidgets.QLabel("Password:")
  # self.url_input = QtWidgets.QLabel()
@@ -50,7 +50,7 @@ def ui_init(self):
  # self.url_input.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor))
 
  self.url_input = QtWidgets.QLineEdit()
- self.url_input.setPlaceholderText("shotgun url")
+ self.url_input.setPlaceholderText("shotgrid url")
 
  self.login_input = QtWidgets.QLineEdit()
  self.login_input.setPlaceholderText("login")
@@ -66,7 +66,7 @@ def ui_init(self):
  self.input_layout.addRow(self.password_label, self.password_input)
 
  self.login_button = QtWidgets.QPushButton("Login")
- self.login_button.setToolTip("Login into shotgun instance")
+ self.login_button.setToolTip("Login into shotgrid instance")
  self.buttons_layout = QtWidgets.QHBoxLayout()
  self.buttons_layout.addWidget(self.login_button)
 

openpype/modules/shotgun/tray/shotgun_tray.py → openpype/modules/shotgrid/tray/shotgrid_tray.py

@@ -1,10 +1,10 @@
 from typing import Any
 
-from openpype.modules.shotgun.tray.credential_dialog import CredentialsDialog
+from openpype.modules.shotgrid.tray.credential_dialog import CredentialsDialog
 from Qt import QtWidgets
 
 
-class ShotgunTrayWrapper:
+class ShotgridTrayWrapper:
  module: Any
  credentials_dialog: CredentialsDialog
 
@@ -22,8 +22,8 @@ def show_credential_dialog(self):
 
  def tray_menu(self, tray_menu):
  print(type(tray_menu))
- menu = QtWidgets.QMenu("Shotgun", tray_menu)
- show_connect_action = QtWidgets.QAction("Connect to Shotgun", menu)
+ menu = QtWidgets.QMenu("Shotgrid", tray_menu)
+ show_connect_action = QtWidgets.QAction("Connect to Shotgrid", menu)
  show_connect_action.triggered.connect(self.show_connect_dialog)
  menu.addAction(show_connect_action)