Merge remote-tracking branch 'upstream/master' into main

README.md

@@ -8,4 +8,4 @@ Dit is een fork van de originele [tk-multi-publish2](https://github.com/shotguns
 
 >English
 
-This is a fork of the original [tk-multi-publish2](https://github.com/shotgunsoftware/tk-multi-publish2) app. This app implements the possibility to publish through apps like [tk-houdini-cachenode](https://github.com/nfa-vfxim/tk-houdini-cachenode).
+This is a fork of the original [tk-multi-publish2](https://github.com/shotgunsoftware/tk-multi-publish2) app. This app implements the possibility to publish through apps like [tk-houdini-cachenode](https://github.com/nfa-vfxim/tk-houdini-cachenode).

app.py

@@ -56,7 +56,7 @@ def init_app(self):
         menu_caption = "%s..." % display_name
         menu_options = {
             "short_name": command_name,
-            "description": "Publishing of data to Shotgun",
+            "description": "Publishing of data to ShotGrid",
             # dark themed icon for engines that recognize this format
             "icons": {
                 "dark": {"png": os.path.join(self.disk_location, "icon_256_dark.png")}

hooks/publish_file.py

@@ -130,7 +130,7 @@ def name(self):
         """
         One line display name describing the plugin
         """
-        return "Publish to Shotgun"
+        return "Publish to ShotGrid"
 
     @property
     def description(self):
@@ -142,15 +142,15 @@ def description(self):
         loader_url = "https://support.shotgunsoftware.com/hc/en-us/articles/219033078"
 
         return """
-        Publishes the file to Shotgun. A <b>Publish</b> entry will be
-        created in Shotgun which will include a reference to the file's current
+        Publishes the file to ShotGrid. A <b>Publish</b> entry will be
+        created in ShotGrid which will include a reference to the file's current
         path on disk. Other users will be able to access the published file via
         the <b><a href='%s'>Loader</a></b> so long as they have access to
         the file's location on disk.
 
         <h3>File versioning</h3>
         The <code>version</code> field of the resulting <b>Publish</b> in
-        Shotgun will also reflect the version number identified in the filename.
+        ShotGrid will also reflect the version number identified in the filename.
         The basic worklfow recognizes the following version formats by default:
 
         <ul>
@@ -211,7 +211,7 @@ def settings(self):
                 ],
                 "description": (
                     "List of file types to include. Each entry in the list "
-                    "is a list in which the first entry is the Shotgun "
+                    "is a list in which the first entry is the ShotGrid "
                     "published file type and subsequent entries are file "
                     "extensions that should be associated."
                 ),
@@ -322,7 +322,7 @@ def validate(self, settings, item):
                 # happening.
                 error_msg = (
                     "Can not validate file path. There is already a publish in "
-                    "Shotgun that matches this path. Please uncheck this "
+                    "ShotGrid that matches this path. Please uncheck this "
                     "plugin or save the file to a different path."
                 )
                 self.logger.error(error_msg)
@@ -335,17 +335,17 @@ def validate(self, settings, item):
                     "<pre>%s</pre>" % (pprint.pformat(publishes),)
                 )
                 self.logger.warn(
-                    "Found %s conflicting publishes in Shotgun" % (len(publishes),),
+                    "Found %s conflicting publishes in ShotGrid" % (len(publishes),),
                     extra={
                         "action_show_more_info": {
                             "label": "Show Conflicts",
-                            "tooltip": "Show conflicting publishes in Shotgun",
+                            "tooltip": "Show conflicting publishes in ShotGrid",
                             "text": conflict_info,
                         }
                     },
                 )
 
-        self.logger.info("A Publish will be created in Shotgun and linked to:")
+        self.logger.info("A Publish will be created in ShotGrid and linked to:")
         self.logger.info("  %s" % (path,))
 
         return True
@@ -426,11 +426,11 @@ def publish(self, settings, item):
         item.properties.sg_publish_data = sgtk.util.register_publish(**publish_data)
         self.logger.info("Publish registered!")
         self.logger.debug(
-            "Shotgun Publish data...",
+            "ShotGrid Publish data...",
             extra={
                 "action_show_more_info": {
-                    "label": "Shotgun Publish Data",
-                    "tooltip": "Show the complete Shotgun Publish Entity dictionary",
+                    "label": "ShotGrid Publish Data",
+                    "tooltip": "Show the complete ShotGrid Publish Entity dictionary",
                     "text": "<pre>%s</pre>"
                     % (pprint.pformat(item.properties.sg_publish_data),),
                 }
@@ -467,7 +467,7 @@ def finalize(self, settings, item):
             extra={
                 "action_show_in_shotgun": {
                     "label": "Show Publish",
-                    "tooltip": "Open the Publish in Shotgun.",
+                    "tooltip": "Open the Publish in ShotGrid.",
                     "entity": publish_data,
                 }
             },

hooks/upload_version.py

@@ -52,12 +52,12 @@ def description(self):
         review_url = "https://www.shotgunsoftware.com/features/#review"
 
         return """
-        Upload the file to Shotgun for review.<br><br>
+        Upload the file to ShotGrid for review.<br><br>
 
-        A <b>Version</b> entry will be created in Shotgun and a transcoded
+        A <b>Version</b> entry will be created in ShotGrid and a transcoded
         copy of the file will be attached to it. The file can then be reviewed
         via the project's <a href='%s'>Media</a> page, <a href='%s'>RV</a>, or
-        the <a href='%s'>Shotgun Review</a> mobile app.
+        the <a href='%s'>ShotGrid Review</a> mobile app.
         """ % (
             media_page_url,
             review_url,
@@ -94,12 +94,12 @@ def settings(self):
             "Upload": {
                 "type": "bool",
                 "default": True,
-                "description": "Upload content to Shotgun?",
+                "description": "Upload content to ShotGrid?",
             },
             "Link Local File": {
                 "type": "bool",
                 "default": True,
-                "description": "Should the local file be referenced by Shotgun",
+                "description": "Should the local file be referenced by ShotGrid",
             },
         }
 
@@ -292,7 +292,7 @@ def finalize(self, settings, item):
             extra={
                 "action_show_in_shotgun": {
                     "label": "Show Version",
-                    "tooltip": "Reveal the version in Shotgun.",
+                    "tooltip": "Reveal the version in ShotGrid.",
                     "entity": version,
                 }
             },

info.yml

@@ -79,7 +79,7 @@ configuration:
         allows_empty: True
         default_value:
             # Default hook 1: publish any file to SG
-            - name: Publish to Shotgun
+            - name: Publish to ShotGrid
               hook: "{self}/publish_file.py"
               settings: {}
             # Default hook 2: upload known, reviewable types to SG
@@ -131,7 +131,7 @@ requires_shotgun_fields:
 
 # More verbose description of this item
 display_name: "Publish"
-description: "Provides UI and functionality to publish files to Shotgun."
+description: "Provides UI and functionality to publish files to ShotGrid."
 
 # Required minimum versions for this item to run
 requires_shotgun_version:

python/tk_multi_publish2/api/plugins/publish_plugin_instance.py

@@ -183,7 +183,7 @@ def run_validate(self, settings, item):
         if item.context.project is None:
             status = False
             self.logger.error(
-                "Please link '%s' to a Shotgun object and task!" % item.name
+                "Please link '%s' to a ShotGrid object and task!" % item.name
             )
 
         if status:

python/tk_multi_publish2/dialog.py

@@ -85,7 +85,7 @@ def __init__(self, parent=None):
         # tooltips for the task and link inputs
         self.ui.context_widget.set_task_tooltip(
             "<p>The task that the selected item will be associated with "
-            "in Shotgun after publishing. It is recommended to always "
+            "in ShotGrid after publishing. It is recommended to always "
             "fill out the Task field when publishing. The menu button "
             "to the right will provide suggestions for Tasks to publish "
             "including the Tasks assigned to you, recently used Tasks, "
@@ -94,7 +94,7 @@ def __init__(self, parent=None):
         )
         self.ui.context_widget.set_link_tooltip(
             "<p>The entity that the selected item will be associated with "
-            "in Shotgun after publishing. By selecting a Task in the field "
+            "in ShotGrid after publishing. By selecting a Task in the field "
             "above, the Link will automatically be populated. It is "
             "recommended that you always populate the Task field when "
             "publishing. The Task menu above will display any tasks associated "
@@ -306,7 +306,7 @@ def closeEvent(self, event):
             # shut down main threadpool
             self._task_manager.shut_down()
         except Exception:
-            logger.exception("Error running Shotgun Panel App closeEvent()")
+            logger.exception("Error running ShotGrid Panel App closeEvent()")
 
         # ensure the context widget's recent contexts are saved
         self.ui.context_widget.save_recent_contexts()

python/tk_multi_publish2/progress/progress_handler.py

@@ -384,7 +384,7 @@ def _process_action(self, item, action):
 
             # add a tooltip if not supplied
             if "tooltip" not in action:
-                action["tooltip"] = "Reveal the entity in Shotgun"
+                action["tooltip"] = "Reveal the entity in ShotGrid"
 
         elif action["type"] == "show_more_info":
             # A common action for showing more information than what

python/tk_multi_publish2/progress/ui/progress_details_widget.py

@@ -62,9 +62,9 @@ def setupUi(self, ProgressDetailsWidget):
     def retranslateUi(self, ProgressDetailsWidget):
         ProgressDetailsWidget.setWindowTitle(QtGui.QApplication.translate("ProgressDetailsWidget", "Form", None, QtGui.QApplication.UnicodeUTF8))
         self.progress_label.setText(QtGui.QApplication.translate("ProgressDetailsWidget", "Progress Details", None, QtGui.QApplication.UnicodeUTF8))
-        self.copy_log_button.setToolTip(QtGui.QApplication.translate("ProgressDetailsWidget", "<html><head/><body><p>Open the publisher\'s log file. The log file is useful for deeper debugging of publish issues. For issues involving Shotgun Support, please include a copy of this file when submitting a support request. </p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.copy_log_button.setToolTip(QtGui.QApplication.translate("ProgressDetailsWidget", "<html><head/><body><p>Open the publisher\'s log file. The log file is useful for deeper debugging of publish issues. For issues involving ShotGrid Support, please include a copy of this file when submitting a support request. </p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
         self.copy_log_button.setText(QtGui.QApplication.translate("ProgressDetailsWidget", "Copy to Clipboard", None, QtGui.QApplication.UnicodeUTF8))
         self.close.setToolTip(QtGui.QApplication.translate("ProgressDetailsWidget", "Close", None, QtGui.QApplication.UnicodeUTF8))
-        self.log_tree.setAccessibleName(QtGui.QApplication.translate("ProgressDetailsWidget", "<html><head/><body><p>Opens the log file for the current engine which will include log messages from the publisher. This file is extremely useful for deeper debugging and understanding of publish issues. A copy of this file should be included when submitting support requests to the Shotgun Support team.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.log_tree.setAccessibleName(QtGui.QApplication.translate("ProgressDetailsWidget", "<html><head/><body><p>Opens the log file for the current engine which will include log messages from the publisher. This file is extremely useful for deeper debugging and understanding of publish issues. A copy of this file should be included when submitting support requests to the ShotGrid Support team.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
 
 from . import resources_rc

python/tk_multi_publish2/ui/dialog.py

@@ -528,7 +528,7 @@ def setupUi(self, Dialog):
         Dialog.setTabOrder(self.stop_processing, self.scrollArea)
 
     def retranslateUi(self, Dialog):
-        Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Shotgun Publish", None, QtGui.QApplication.UnicodeUTF8))
+        Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "ShotGrid Publish", None, QtGui.QApplication.UnicodeUTF8))
         Dialog.setAccessibleName(QtGui.QApplication.translate("Dialog", "publish dialog", None, QtGui.QApplication.UnicodeUTF8))
         self.main_stack.setAccessibleName(QtGui.QApplication.translate("Dialog", "stackedwidget", None, QtGui.QApplication.UnicodeUTF8))
         self.large_drop_area_label.setText(QtGui.QApplication.translate("Dialog", "Drag and drop files or folders here", None, QtGui.QApplication.UnicodeUTF8))

resources/dialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Shotgun Publish</string>
+   <string>ShotGrid Publish</string>
   </property>
   <property name="accessibleName">
    <string>publish dialog</string>

resources/progress_details_widget.ui

@@ -47,7 +47,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Open the publisher's log file. The log file is useful for deeper debugging of publish issues. For issues involving Shotgun Support, please include a copy of this file when submitting a support request. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Open the publisher's log file. The log file is useful for deeper debugging of publish issues. For issues involving ShotGrid Support, please include a copy of this file when submitting a support request. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>Copy to Clipboard</string>
@@ -94,7 +94,7 @@
       <item>
        <widget class="QTreeWidget" name="log_tree">
         <property name="accessibleName">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Opens the log file for the current engine which will include log messages from the publisher. This file is extremely useful for deeper debugging and understanding of publish issues. A copy of this file should be included when submitting support requests to the Shotgun Support team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Opens the log file for the current engine which will include log messages from the publisher. This file is extremely useful for deeper debugging and understanding of publish issues. A copy of this file should be included when submitting support requests to the ShotGrid Support team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="horizontalScrollMode">
          <enum>QAbstractItemView::ScrollPerItem</enum>

tests/fixtures/configInheritance/env/test.yml

@@ -22,10 +22,10 @@ engines:
       tk-multi-run-this-app:
         collector: "{config}/collector.py"
         publish_plugins:
-          - name: Publish to Shotgun with items
+          - name: Publish to ShotGrid with items
             hook: "{self}/publish_file.py:{config}/publish_file_ui_w_items.py"
             settings: {}
-          - name: Publish to Shotgun without items
+          - name: Publish to ShotGrid without items
             hook: "{self}/publish_file.py:{config}/publish_file_ui_wo_items.py"
             settings: {}
         location:

tests/test_gui.py

@@ -103,7 +103,7 @@ def __init__(self, parent):
         """
         :param root:
         """
-        self.root = parent["Shotgun: Publish"].get()
+        self.root = parent["ShotGrid: Publish"].get()
 
     def exists(self):
         """
@@ -294,7 +294,7 @@ def test_custom_plugin(app_dialog):
     # Validation of the Publish to Shotgun with items plugin
     # Select plugin Publish to Shotgun with items of the first item
     app_dialog.root["collected items tree"].outlineitems[
-        "Publish to Shotgun with items"
+        "Publish to ShotGrid with items"
     ].mouseClick()
     # Make sure the checkbox is check
     if (
@@ -306,7 +306,7 @@ def test_custom_plugin(app_dialog):
         ].mouseClick()
     # Select plugin Publish to Shotgun with items of the second item
     app_dialog.root["collected items tree"].outlineitems[
-        "Publish to Shotgun with items"
+        "Publish to ShotGrid with items"
     ][1].mouseClick()
     # Make sure the checkbox is unchecked
     if (
@@ -319,7 +319,7 @@ def test_custom_plugin(app_dialog):
     # Do a multiple plugins selection of item 1 and 2
     with holdKeys("{CONTROL}"):
         app_dialog.root["collected items tree"].outlineitems[
-            "Publish to Shotgun with items"
+            "Publish to ShotGrid with items"
         ].mouseSlide()
         Mouse.click()
 
@@ -359,7 +359,7 @@ def test_custom_plugin(app_dialog):
     # Validation of the Publish to Shotgun without items plugin
     # Select Publish to Shotgun without items of the first item
     app_dialog.root["collected items tree"].outlineitems[
-        "Publish to Shotgun without items"
+        "Publish to ShotGrid without items"
     ].mouseSlide()
     Mouse.click()
     # Make sure the checkbox is check
@@ -372,7 +372,7 @@ def test_custom_plugin(app_dialog):
         ].mouseClick()
     # Select Publish to Shotgun without items of the second item
     app_dialog.root["collected items tree"].outlineitems[
-        "Publish to Shotgun without items"
+        "Publish to ShotGrid without items"
     ][1].mouseClick()
     # Make sure the checkbox is unchecked
     if (
@@ -384,7 +384,7 @@ def test_custom_plugin(app_dialog):
         ].mouseClick()
     # Go back the Publish to Shotgun without items plugin of the first item and make sure checkbox is still checked
     app_dialog.root["collected items tree"].outlineitems[
-        "Publish to Shotgun without items"
+        "Publish to ShotGrid without items"
     ].mouseClick()
     assert (
         app_dialog.root["details frame"].checkboxes["Set task to in review"].checked