Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def __getattr__(self, name):
"Looks like you are trying to run an App that uses a QT based UI, however the "
"python installation that the Desktop engine is currently using does not seem "
"to contain a valid PySide or PyQt4 install. Either install PySide into your "
"python environment or alternatively switch back to using the native Shotgun "
"python environment or alternatively switch back to using the native SG "
"Desktop python installation, which includes full QT support."
)

Expand Down
2 changes: 1 addition & 1 deletion hooks/post_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,5 @@ def execute(self, *args, **kwargs):
self._reboot_app(shotgun_desktop)
else:
raise Exception(
"Wrong version of Shotgun API3. AuthenticationFault not accessible."
"Wrong version of SG API3. AuthenticationFault not accessible."
)
2 changes: 1 addition & 1 deletion python/tk_desktop/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Console(QtGui.QDialog):
def __init__(self, parent=None):
super(Console, self).__init__(parent)

self.setWindowTitle("Shotgun Desktop Console")
self.setWindowTitle("SG Desktop Console")
self.setWindowIcon(QtGui.QIcon(":/tk-desktop/default_systray_icon.png"))

self.__logs = QtGui.QPlainTextEdit()
Expand Down
4 changes: 2 additions & 2 deletions python/tk_desktop/desktop_engine_site_implementation.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ def run(self, splash, version, **kwargs):
# We need for the dialog to exist for messages to get to the UI console.
if kwargs.get("server") is not None:
logger.warning(
"You are running an older version of the Shotgun Desktop which is not fully compatible "
"with the Shotgun Integrations. Please install the latest version."
"You are running an older version of the SG Desktop which is not fully compatible "
"with the SG Integrations. Please install the latest version."
)

# run the commands that are configured to be executed at startup
Expand Down
26 changes: 13 additions & 13 deletions python/tk_desktop/desktop_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ def load(self, key):


class DesktopWindow(SystrayWindow):
""" Dockable window for the Shotgun system tray """
""" Dockable window for the SG system tray """

ORGANIZATION = "Shotgun Software"
ORGANIZATION = "SG Software"
APPLICATION = "tk-desktop"
_BOOTSTRAP_END_RATIO = 0.9
_LAUNCHING_PYTHON_RATIO = 0.95
Expand Down Expand Up @@ -358,7 +358,7 @@ def __init__(self, console, parent=None):

self.ui.shotgun_button.clicked.connect(self.open_site_in_browser)
self.ui.shotgun_button.setToolTip(
"Open Shotgun in browser.\n%s" % connection.base_url
"Open SG in browser.\n%s" % connection.base_url
)

self._project_model.thumbnail_updated.connect(
Expand Down Expand Up @@ -677,7 +677,7 @@ def _handle_close_event(self):
# It still works on Windows and Linux however for Desktop 1.5.x and
# lower.
self.systray.showMessage(
"Shotgun Desktop",
"SG Desktop",
"The application is now running in the system tray.",
icon,
5000,
Expand Down Expand Up @@ -724,8 +724,8 @@ def handle_regen_certs(self):
with self.deactivate_auto_hide():
choice = self._show_rich_message_box(
QtGui.QMessageBox.Information,
"Shotgun browser integration",
"Regenerating the Shotgun Desktop's browser integration certificates should "
"SG browser integration",
"Regenerating the SG Desktop's browser integration certificates should "
"only be done if you have issues with the browser integration.<br/>"
"<br/>"
"If you are unsure how to proceed, we recommend you visit our support page "
Expand All @@ -746,7 +746,7 @@ def handle_regen_certs(self):
log.exception("Unexpected error while regenerating certificates:")
self._show_rich_message_box(
QtGui.QMessageBox.Critical,
"Shotgun browser integration",
"SG browser integration",
"It appears there are an issue while regenerating the certificates."
"\n"
"Please <a href='{0}'>contact our support team</a> "
Expand All @@ -758,8 +758,8 @@ def handle_regen_certs(self):
else:
choice = QtGui.QMessageBox.question(
self,
"Shotgun browser integration",
"The Shotgun Desktop needs to restart for the certificate changes "
"SG browser integration",
"The SG Desktop needs to restart for the certificate changes "
"to take effect.\n"
"\n"
"Would you like to restart?",
Expand Down Expand Up @@ -1005,7 +1005,7 @@ def _on_different_user(self, site, user_id):
"A request originated from <b>{0}</b>, but you "
"are currently logged into <b>{1}</b>.<br/><br/>"
"If you would like to launch applications or browse for files from the browser, click the "
"<b>Restart</b> button below to restart Shotgun Desktop and log into <b>{0}</b>.".format(
"<b>Restart</b> button below to restart SG Desktop and log into <b>{0}</b>.".format(
site, current_site
)
)
Expand All @@ -1027,9 +1027,9 @@ def _on_different_user(self, site, user_id):

msg = (
"A request from <b>{0}</b> was made, but you are currently "
"signed in as <b>{1}</b> in the Shotgun Desktop.<br/><br/>"
"signed in as <b>{1}</b> in the SG Desktop.<br/><br/>"
"If you would like to launch applications or browse for files from the browser, click the "
"<b>Restart</b> button below to restart Shotgun Desktop and log as <b>{0}</b>.".format(
"<b>Restart</b> button below to restart SG Desktop and log as <b>{0}</b>.".format(
user_login if user_login else "<unknown>",
bundle.get_current_user().login,
)
Expand Down Expand Up @@ -1479,7 +1479,7 @@ def __launch_app_proxy_for_project(
log.exception(str(error))
message = (
"%s"
"\n\nTo resolve this, open Shotgun in your browser\n"
"\n\nTo resolve this, open SG in your browser\n"
"and check the paths for this Pipeline Configuration."
"\n\nFor more details, see the console." % str(error)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def message(self):
"""
Message to display.
"""
return "Welcome to the <b>Shotgun Desktop</b>. <a href='{0}'>Click here</a> to learn more.".format(
return "Welcome to the <b>SG Desktop</b>. <a href='{0}'>Click here</a> to learn more.".format(
self.SHOTGUN_DESKTOP_SUPPORT_PAGE_URL
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def message(self):
Message to display.
"""
return (
"<b>Shotgun Desktop</b> has been updated. "
"<b>SG Desktop</b> has been updated. "
"<a href='{0}'>Click here</a> to learn more."
).format(self._engine.startup_descriptor.changelog[1])

Expand Down
4 changes: 2 additions & 2 deletions python/tk_desktop/setup_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ def do_setup(self, show_help=False):
"Toolkit Setup Error",
"You are trying to set up a project which has already been set up\n\n"
"To re-setup a project, in a terminal window type: tank setup_project --force\n\n"
"Alternatively, you can go into shotgun and clear the Project.tank_name field\n"
"Alternatively, you can go into SG and clear the Project.tank_name field\n"
"and delete all pipeline configurations for your project.",
)
error_dialog.exec_()

except TankUserPermissionsError as e:
error_dialog = ErrorDialog(
"Toolkit Setup Error",
"You do not have sufficient permissions in Shotgun to setup Toolkit for "
"You do not have sufficient permissions in SG to setup Toolkit for "
"project '%s'.\n\nContact a site administrator for assistance."
% self.project["name"],
)
Expand Down
6 changes: 3 additions & 3 deletions python/tk_desktop/ui/about_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ def setupUi(self, AboutScreen):
QtCore.QMetaObject.connectSlotsByName(AboutScreen)

def retranslateUi(self, AboutScreen):
AboutScreen.setWindowTitle(QtGui.QApplication.translate("AboutScreen", "About Shotgun Desktop", None, QtGui.QApplication.UnicodeUTF8))
self.header.setText(QtGui.QApplication.translate("AboutScreen", "<b><big>Shotgun Desktop</big></b>", None, QtGui.QApplication.UnicodeUTF8))
AboutScreen.setWindowTitle(QtGui.QApplication.translate("AboutScreen", "About SG Desktop", None, QtGui.QApplication.UnicodeUTF8))
self.header.setText(QtGui.QApplication.translate("AboutScreen", "<b><big>SG Desktop</big></b>", None, QtGui.QApplication.UnicodeUTF8))
self.body.setText(QtGui.QApplication.translate("AboutScreen", "Body", None, QtGui.QApplication.UnicodeUTF8))
self.copyright.setText(QtGui.QApplication.translate("AboutScreen", "Copyright ©2020 Shotgun Software Inc.\n"
self.copyright.setText(QtGui.QApplication.translate("AboutScreen", "Copyright ©2020 SG Software Inc.\n"
"All rights reserved.", None, QtGui.QApplication.UnicodeUTF8))
self.licensesButton.setText(QtGui.QApplication.translate("AboutScreen", "Licenses...", None, QtGui.QApplication.UnicodeUTF8))

Expand Down
2 changes: 1 addition & 1 deletion python/tk_desktop/ui/banner_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def setupUi(self, BannerWidget):

def retranslateUi(self, BannerWidget):
BannerWidget.setWindowTitle(QtGui.QApplication.translate("BannerWidget", "Form", None, QtGui.QApplication.UnicodeUTF8))
self.message.setText(QtGui.QApplication.translate("BannerWidget", "Welcome to the Shotgun Desktop. Please <u>click here</u> to learn more about this app!", None, QtGui.QApplication.UnicodeUTF8))
self.message.setText(QtGui.QApplication.translate("BannerWidget", "Welcome to the SG Desktop. Please <u>click here</u> to learn more about this app!", None, QtGui.QApplication.UnicodeUTF8))
self.close_button.setToolTip(QtGui.QApplication.translate("BannerWidget", "Close", None, QtGui.QApplication.UnicodeUTF8))

from . import resources_rc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def setupUi(self, BrowserIntegrationUserSwitchDialog):
QtCore.QMetaObject.connectSlotsByName(BrowserIntegrationUserSwitchDialog)

def retranslateUi(self, BrowserIntegrationUserSwitchDialog):
BrowserIntegrationUserSwitchDialog.setWindowTitle(QtGui.QApplication.translate("BrowserIntegrationUserSwitchDialog", "Shotgun browser integration", None, QtGui.QApplication.UnicodeUTF8))
BrowserIntegrationUserSwitchDialog.setWindowTitle(QtGui.QApplication.translate("BrowserIntegrationUserSwitchDialog", "SG browser integration", None, QtGui.QApplication.UnicodeUTF8))
self.reason_label.setText(QtGui.QApplication.translate("BrowserIntegrationUserSwitchDialog", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
self.ignore_checkbox.setText(QtGui.QApplication.translate("BrowserIntegrationUserSwitchDialog", "Ignore requests from this site until the next restart", None, QtGui.QApplication.UnicodeUTF8))
self.restart_button.setText(QtGui.QApplication.translate("BrowserIntegrationUserSwitchDialog", "Restart", None, QtGui.QApplication.UnicodeUTF8))
Expand Down
8 changes: 4 additions & 4 deletions python/tk_desktop/ui/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ def setupUi(self, Preferences):

def retranslateUi(self, Preferences):
Preferences.setWindowTitle(QtGui.QApplication.translate("Preferences", "Preferences", None, QtGui.QApplication.UnicodeUTF8))
self.auto_start_label.setToolTip(QtGui.QApplication.translate("Preferences", "When checked Shotgun Desktop will startup automatically when you log in.", None, QtGui.QApplication.UnicodeUTF8))
self.auto_start_label.setToolTip(QtGui.QApplication.translate("Preferences", "When checked SG Desktop will startup automatically when you log in.", None, QtGui.QApplication.UnicodeUTF8))
self.auto_start_label.setText(QtGui.QApplication.translate("Preferences", "Start at login", None, QtGui.QApplication.UnicodeUTF8))
self.auto_start_checkbox.setToolTip(QtGui.QApplication.translate("Preferences", "When checked Shotgun Desktop will startup automatically when you log in.", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey.setToolTip(QtGui.QApplication.translate("Preferences", "Enter a hotkey that will auto-raise Shotgun Desktop when pressed.", None, QtGui.QApplication.UnicodeUTF8))
self.auto_start_checkbox.setToolTip(QtGui.QApplication.translate("Preferences", "When checked SG Desktop will startup automatically when you log in.", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey.setToolTip(QtGui.QApplication.translate("Preferences", "Enter a hotkey that will auto-raise SG Desktop when pressed.", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey.setPlaceholderText(QtGui.QApplication.translate("Preferences", "Enter hotkey shortcut", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey_clear.setToolTip(QtGui.QApplication.translate("Preferences", "Click to clear the hotkey.", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey_label.setToolTip(QtGui.QApplication.translate("Preferences", "Enter a hotkey that will auto-raise Shotgun Desktop when pressed.", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey_label.setToolTip(QtGui.QApplication.translate("Preferences", "Enter a hotkey that will auto-raise SG Desktop when pressed.", None, QtGui.QApplication.UnicodeUTF8))
self.hotkey_label.setText(QtGui.QApplication.translate("Preferences", "Hotkey to activate", None, QtGui.QApplication.UnicodeUTF8))

from ..hotkey import HotKeyEditor
Expand Down
2 changes: 1 addition & 1 deletion python/tk_desktop/ui/update_project_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def setupUi(self, UpdateProjectConfig):

def retranslateUi(self, UpdateProjectConfig):
UpdateProjectConfig.setWindowTitle(QtGui.QApplication.translate("UpdateProjectConfig", "Form", None, QtGui.QApplication.UnicodeUTF8))
self.text.setText(QtGui.QApplication.translate("UpdateProjectConfig", "Add Shotgun Desktop", None, QtGui.QApplication.UnicodeUTF8))
self.text.setText(QtGui.QApplication.translate("UpdateProjectConfig", "Add SG Desktop", None, QtGui.QApplication.UnicodeUTF8))
self.button.setText(QtGui.QApplication.translate("UpdateProjectConfig", "Add", None, QtGui.QApplication.UnicodeUTF8))
self.label.setText(QtGui.QApplication.translate("UpdateProjectConfig", "Click here to upgrade your\n"
"Pipeline Configuration", None, QtGui.QApplication.UnicodeUTF8))
Expand Down