From 5d9dd3ae9af14a117f14545979b62882d398473e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 5 Dec 2023 15:50:19 +0100
Subject: [PATCH] AYON: Use AYON label in ayon mode (#5995)
* use AYON instead of OpenPype in tool titles
* add bundle name to info data
* modified message to report ynput team
* fix experimental tool titles
---
.../python_console_interpreter/window/widgets.py | 5 ++++-
openpype/tools/experimental_tools/dialog.py | 13 ++++++++-----
openpype/tools/publisher/control.py | 2 +-
openpype/tools/publisher/window.py | 5 ++++-
openpype/tools/tray/pype_info_widget.py | 7 ++++++-
5 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/openpype/modules/python_console_interpreter/window/widgets.py b/openpype/modules/python_console_interpreter/window/widgets.py
index b670352f44..49a5f62165 100644
--- a/openpype/modules/python_console_interpreter/window/widgets.py
+++ b/openpype/modules/python_console_interpreter/window/widgets.py
@@ -8,6 +8,7 @@ import appdirs
from qtpy import QtCore, QtWidgets, QtGui
from openpype import resources
+from openpype import AYON_SERVER_ENABLED
from openpype.style import load_stylesheet
from openpype.lib import JSONSettingRegistry
@@ -339,7 +340,9 @@ class PythonInterpreterWidget(QtWidgets.QWidget):
def __init__(self, parent=None):
super(PythonInterpreterWidget, self).__init__(parent)
- self.setWindowTitle("OpenPype Console")
+ self.setWindowTitle("{} Console".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+ ))
self.setWindowIcon(QtGui.QIcon(resources.get_openpype_icon_filepath()))
self.ansi_escape = re.compile(
diff --git a/openpype/tools/experimental_tools/dialog.py b/openpype/tools/experimental_tools/dialog.py
index 00b6ae07a4..3a25d72ff4 100644
--- a/openpype/tools/experimental_tools/dialog.py
+++ b/openpype/tools/experimental_tools/dialog.py
@@ -1,5 +1,6 @@
from qtpy import QtWidgets, QtCore, QtGui
+from openpype import AYON_SERVER_ENABLED
from openpype.style import (
load_stylesheet,
app_icon_path
@@ -26,7 +27,8 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
def __init__(self, parent=None):
super(ExperimentalToolsDialog, self).__init__(parent)
- self.setWindowTitle("OpenPype Experimental tools")
+ app_label = "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+ self.setWindowTitle("{} Experimental tools".format(app_label))
icon = QtGui.QIcon(app_icon_path())
self.setWindowIcon(icon)
self.setStyleSheet(load_stylesheet())
@@ -68,8 +70,8 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
tool_btns_label = QtWidgets.QLabel(
(
"You can enable these features in"
- "
OpenPype tray -> Settings -> Experimental tools"
- ),
+ "
{} tray -> Settings -> Experimental tools"
+ ).format(app_label),
tool_btns_widget
)
tool_btns_label.setAlignment(QtCore.Qt.AlignCenter)
@@ -113,6 +115,7 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
self._window_is_active = False
def refresh(self):
+ app_label = "AYON" if AYON_SERVER_ENABLED else "OpenPype"
self._experimental_tools.refresh_availability()
buttons_to_remove = set(self._buttons_by_tool_identifier.keys())
@@ -139,8 +142,8 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
elif is_new or button.isEnabled():
button.setToolTip((
"You can enable this tool in local settings."
- "\n\nOpenPype Tray > Settings > Experimental Tools"
- ))
+ "\n\n{} Tray > Settings > Experimental Tools"
+ ).format(app_label))
if tool.enabled != button.isEnabled():
button.setEnabled(tool.enabled)
diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index 9e00d21750..b02d83e4f6 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -2517,7 +2517,7 @@ class PublisherController(BasePublisherController):
else:
msg = (
"Something went wrong. Send report"
- " to your supervisor or OpenPype."
+ " to your supervisor or Ynput team."
)
self.publish_error_msg = msg
self.publish_has_crashed = True
diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py
index 2416763c27..b3138c3f45 100644
--- a/openpype/tools/publisher/window.py
+++ b/openpype/tools/publisher/window.py
@@ -9,6 +9,7 @@ from openpype import (
resources,
style
)
+from openpype import AYON_SERVER_ENABLED
from openpype.tools.utils import (
ErrorMessageBox,
PlaceholderLineEdit,
@@ -53,7 +54,9 @@ class PublisherWindow(QtWidgets.QDialog):
self.setObjectName("PublishWindow")
- self.setWindowTitle("OpenPype publisher")
+ self.setWindowTitle("{} publisher".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+ ))
icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
self.setWindowIcon(icon)
diff --git a/openpype/tools/tray/pype_info_widget.py b/openpype/tools/tray/pype_info_widget.py
index dc222b79b5..985a23f64c 100644
--- a/openpype/tools/tray/pype_info_widget.py
+++ b/openpype/tools/tray/pype_info_widget.py
@@ -219,7 +219,9 @@ class PypeInfoWidget(QtWidgets.QWidget):
icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
self.setWindowIcon(icon)
- self.setWindowTitle("OpenPype info")
+ self.setWindowTitle(
+ "{} info".format("AYON" if AYON_SERVER_ENABLED else "OpenPype")
+ )
scroll_area = QtWidgets.QScrollArea(self)
info_widget = PypeInfoSubWidget(scroll_area)
@@ -441,16 +443,19 @@ class PypeInfoSubWidget(QtWidgets.QWidget):
info_values = {
"executable": executable_args[-1],
"server_url": os.environ["AYON_SERVER_URL"],
+ "bundle_name": os.environ["AYON_BUNDLE_NAME"],
"username": username
}
key_label_mapping = {
"executable": "AYON Executable:",
"server_url": "AYON Server:",
+ "bundle_name": "AYON Bundle:",
"username": "AYON Username:"
}
# Prepare keys order
keys_order = [
"server_url",
+ "bundle_name",
"username",
"executable",
]