diff --git a/client/ayon_core/hosts/fusion/api/menu.py b/client/ayon_core/hosts/fusion/api/menu.py index fb1f6dad19..d87443db3a 100644 --- a/client/ayon_core/hosts/fusion/api/menu.py +++ b/client/ayon_core/hosts/fusion/api/menu.py @@ -14,7 +14,7 @@ from ayon_core.hosts.fusion.api.lib import ( set_asset_resolution, ) from ayon_core.pipeline import get_current_asset_name -from ayon_core.resources import get_openpype_icon_filepath +from ayon_core.resources import get_ayon_icon_filepath from .pipeline import FusionEventHandler from .pulse import FusionPulse @@ -33,7 +33,7 @@ class OpenPypeMenu(QtWidgets.QWidget): self.setObjectName(f"{MENU_LABEL}Menu") - icon_path = get_openpype_icon_filepath() + icon_path = get_ayon_icon_filepath() icon = QtGui.QIcon(icon_path) self.setWindowIcon(icon) diff --git a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py b/client/ayon_core/hosts/houdini/api/creator_node_shelves.py index 5381760b38..73bb0e6ec2 100644 --- a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py +++ b/client/ayon_core/hosts/houdini/api/creator_node_shelves.py @@ -15,7 +15,7 @@ import os from ayon_core.client import get_asset_by_name from ayon_core.pipeline import registered_host from ayon_core.pipeline.create import CreateContext -from ayon_core.resources import get_openpype_icon_filepath +from ayon_core.resources import get_ayon_icon_filepath import hou import stateutils @@ -172,7 +172,7 @@ def install(): # and update the tools file if creator identifiers change os.remove(filepath) - icon = get_openpype_icon_filepath() + icon = get_ayon_icon_filepath() tab_menu_label = os.environ.get("AVALON_LABEL") or "AYON" # Create context only to get creator plugins, so we don't reset and only diff --git a/client/ayon_core/hosts/maya/api/shader_definition_editor.py b/client/ayon_core/hosts/maya/api/shader_definition_editor.py index 2fb06c32f0..04e8dded6f 100644 --- a/client/ayon_core/hosts/maya/api/shader_definition_editor.py +++ b/client/ayon_core/hosts/maya/api/shader_definition_editor.py @@ -31,7 +31,7 @@ class ShaderDefinitionsEditor(QtWidgets.QWidget): self.setObjectName("shaderDefinitionEditor") self.setWindowTitle("OpenPype shader name definition editor") - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowFlags(QtCore.Qt.Window) self.setParent(parent) diff --git a/client/ayon_core/hosts/unreal/api/tools_ui.py b/client/ayon_core/hosts/unreal/api/tools_ui.py index 525df44240..084da9a0f0 100644 --- a/client/ayon_core/hosts/unreal/api/tools_ui.py +++ b/client/ayon_core/hosts/unreal/api/tools_ui.py @@ -65,7 +65,7 @@ class ToolsDialog(QtWidgets.QDialog): super(ToolsDialog, self).__init__(*args, **kwargs) self.setWindowTitle("Ayon tools") - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowFlags( diff --git a/client/ayon_core/hosts/unreal/ui/splash_screen.py b/client/ayon_core/hosts/unreal/ui/splash_screen.py index f136fe34fe..cf34943515 100644 --- a/client/ayon_core/hosts/unreal/ui/splash_screen.py +++ b/client/ayon_core/hosts/unreal/ui/splash_screen.py @@ -37,10 +37,10 @@ class SplashScreen(QtWidgets.QDialog): super(SplashScreen, self).__init__() if splash_icon is None: - splash_icon = resources.get_openpype_icon_filepath() + splash_icon = resources.get_ayon_icon_filepath() if window_icon is None: - window_icon = resources.get_openpype_icon_filepath() + window_icon = resources.get_ayon_icon_filepath() self.splash_icon = splash_icon self.setWindowIcon(QtGui.QIcon(window_icon)) diff --git a/client/ayon_core/modules/clockify/widgets.py b/client/ayon_core/modules/clockify/widgets.py index 3c4cc8464a..e64b64601d 100644 --- a/client/ayon_core/modules/clockify/widgets.py +++ b/client/ayon_core/modules/clockify/widgets.py @@ -13,7 +13,7 @@ class MessageWidget(QtWidgets.QWidget): super(MessageWidget, self).__init__() # Icon - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowFlags( @@ -90,7 +90,7 @@ class ClockifySettings(QtWidgets.QWidget): self.validated = False # Icon - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowTitle("Clockify settings") diff --git a/client/ayon_core/modules/python_console_interpreter/window/widgets.py b/client/ayon_core/modules/python_console_interpreter/window/widgets.py index 83d126758a..628a2e72ff 100644 --- a/client/ayon_core/modules/python_console_interpreter/window/widgets.py +++ b/client/ayon_core/modules/python_console_interpreter/window/widgets.py @@ -335,7 +335,7 @@ class PythonInterpreterWidget(QtWidgets.QWidget): super(PythonInterpreterWidget, self).__init__(parent) self.setWindowTitle("AYON Console") - self.setWindowIcon(QtGui.QIcon(resources.get_openpype_icon_filepath())) + self.setWindowIcon(QtGui.QIcon(resources.get_ayon_icon_filepath())) self.ansi_escape = re.compile( r"(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]" diff --git a/client/ayon_core/modules/timers_manager/widget_user_idle.py b/client/ayon_core/modules/timers_manager/widget_user_idle.py index 1f60cfba8c..a185581658 100644 --- a/client/ayon_core/modules/timers_manager/widget_user_idle.py +++ b/client/ayon_core/modules/timers_manager/widget_user_idle.py @@ -11,7 +11,7 @@ class WidgetUserIdle(QtWidgets.QWidget): self.setWindowTitle("OpenPype - Stop timers") - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowFlags( diff --git a/client/ayon_core/plugins/load/delivery.py b/client/ayon_core/plugins/load/delivery.py index 1a1ac9e0fa..46855d74b3 100644 --- a/client/ayon_core/plugins/load/delivery.py +++ b/client/ayon_core/plugins/load/delivery.py @@ -61,7 +61,7 @@ class DeliveryOptionsDialog(QtWidgets.QDialog): super(DeliveryOptionsDialog, self).__init__(parent=parent) self.setWindowTitle("OpenPype - Deliver versions") - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowFlags( diff --git a/client/ayon_core/resources/__init__.py b/client/ayon_core/resources/__init__.py index dbfa124116..2a98cc1968 100644 --- a/client/ayon_core/resources/__init__.py +++ b/client/ayon_core/resources/__init__.py @@ -1,5 +1,5 @@ import os -from ayon_core.lib.openpype_version import is_staging_enabled +from ayon_core.lib import is_staging_enabled RESOURCES_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -39,15 +39,15 @@ def get_liberation_font_path(bold=False, italic=False): return font_path -def get_openpype_production_icon_filepath(): +def get_ayon_production_icon_filepath(): return get_resource("icons", "AYON_icon.png") -def get_openpype_staging_icon_filepath(): +def get_ayon_staging_icon_filepath(): return get_resource("icons", "AYON_icon_staging.png") -def get_openpype_icon_filepath(staging=None): +def get_ayon_icon_filepath(staging=None): if os.getenv("AYON_USE_DEV") == "1": return get_resource("icons", "AYON_icon_dev.png") @@ -55,11 +55,11 @@ def get_openpype_icon_filepath(staging=None): staging = is_staging_enabled() if staging: - return get_openpype_staging_icon_filepath() - return get_openpype_production_icon_filepath() + return get_ayon_staging_icon_filepath() + return get_ayon_production_icon_filepath() -def get_openpype_splash_filepath(staging=None): +def get_ayon_splash_filepath(staging=None): if staging is None: staging = is_staging_enabled() @@ -72,9 +72,17 @@ def get_openpype_splash_filepath(staging=None): return get_resource("icons", splash_file_name) -def pype_icon_filepath(staging=None): - return get_openpype_icon_filepath(staging) +def get_openpype_production_icon_filepath(): + return get_ayon_production_icon_filepath() -def pype_splash_filepath(staging=None): - return get_openpype_splash_filepath(staging) +def get_openpype_staging_icon_filepath(): + return get_ayon_staging_icon_filepath() + + +def get_openpype_icon_filepath(staging=None): + return get_ayon_icon_filepath(staging) + + +def get_openpype_splash_filepath(staging=None): + return get_ayon_splash_filepath(staging) diff --git a/client/ayon_core/resources/icons/openpype_icon.png b/client/ayon_core/resources/icons/openpype_icon.png deleted file mode 100644 index 41469a7399..0000000000 Binary files a/client/ayon_core/resources/icons/openpype_icon.png and /dev/null differ diff --git a/client/ayon_core/resources/icons/openpype_icon_staging.png b/client/ayon_core/resources/icons/openpype_icon_staging.png deleted file mode 100644 index f1da43fad2..0000000000 Binary files a/client/ayon_core/resources/icons/openpype_icon_staging.png and /dev/null differ diff --git a/client/ayon_core/resources/icons/openpype_rim.png b/client/ayon_core/resources/icons/openpype_rim.png deleted file mode 100644 index 26e93e67d5..0000000000 Binary files a/client/ayon_core/resources/icons/openpype_rim.png and /dev/null differ diff --git a/client/ayon_core/resources/icons/openpype_splash.png b/client/ayon_core/resources/icons/openpype_splash.png deleted file mode 100644 index 191c70c88d..0000000000 Binary files a/client/ayon_core/resources/icons/openpype_splash.png and /dev/null differ diff --git a/client/ayon_core/resources/icons/openpype_splash_staging.png b/client/ayon_core/resources/icons/openpype_splash_staging.png deleted file mode 100644 index 5a2db47385..0000000000 Binary files a/client/ayon_core/resources/icons/openpype_splash_staging.png and /dev/null differ diff --git a/client/ayon_core/style/__init__.py b/client/ayon_core/style/__init__.py index e65bede6e8..8b2dfa1bcb 100644 --- a/client/ayon_core/style/__init__.py +++ b/client/ayon_core/style/__init__.py @@ -208,7 +208,7 @@ def load_stylesheet(): def get_app_icon_path(): """Path to OpenPype icon.""" - return resources.get_openpype_icon_filepath() + return resources.get_ayon_icon_filepath() def app_icon_path(): diff --git a/client/ayon_core/tools/launcher/models/actions.py b/client/ayon_core/tools/launcher/models/actions.py index 6d212d6ccb..609a624026 100644 --- a/client/ayon_core/tools/launcher/models/actions.py +++ b/client/ayon_core/tools/launcher/models/actions.py @@ -102,7 +102,7 @@ class ApplicationAction(LauncherAction): from ayon_core import style dialog = QtWidgets.QMessageBox() - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) dialog.setWindowIcon(icon) dialog.setStyleSheet(style.load_stylesheet()) dialog.setWindowTitle(title) diff --git a/client/ayon_core/tools/launcher/ui/window.py b/client/ayon_core/tools/launcher/ui/window.py index a5c255c691..34aeab35bb 100644 --- a/client/ayon_core/tools/launcher/ui/window.py +++ b/client/ayon_core/tools/launcher/ui/window.py @@ -22,7 +22,7 @@ class LauncherWindow(QtWidgets.QWidget): if controller is None: controller = BaseLauncherController() - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowTitle("Launcher") self.setFocusPolicy(QtCore.Qt.StrongFocus) diff --git a/client/ayon_core/tools/loader/ui/window.py b/client/ayon_core/tools/loader/ui/window.py index 8f1c1ceb72..104b64d81c 100644 --- a/client/ayon_core/tools/loader/ui/window.py +++ b/client/ayon_core/tools/loader/ui/window.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore, QtGui -from ayon_core.resources import get_openpype_icon_filepath +from ayon_core.resources import get_ayon_icon_filepath from ayon_core.style import load_stylesheet from ayon_core.tools.utils import ( PlaceholderLineEdit, @@ -119,7 +119,7 @@ class LoaderWindow(QtWidgets.QWidget): def __init__(self, controller=None, parent=None): super(LoaderWindow, self).__init__(parent) - icon = QtGui.QIcon(get_openpype_icon_filepath()) + icon = QtGui.QIcon(get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowTitle("AYON Loader") self.setFocusPolicy(QtCore.Qt.StrongFocus) diff --git a/client/ayon_core/tools/publisher/publish_report_viewer/window.py b/client/ayon_core/tools/publisher/publish_report_viewer/window.py index 89997021d2..2cd2696831 100644 --- a/client/ayon_core/tools/publisher/publish_report_viewer/window.py +++ b/client/ayon_core/tools/publisher/publish_report_viewer/window.py @@ -8,7 +8,7 @@ import arrow from qtpy import QtWidgets, QtCore, QtGui from ayon_core import style -from ayon_core.resources import get_openpype_icon_filepath +from ayon_core.resources import get_ayon_icon_filepath from ayon_core.tools import resources from ayon_core.tools.utils import ( IconButton, @@ -600,7 +600,7 @@ class PublishReportViewerWindow(QtWidgets.QWidget): def __init__(self, parent=None): super(PublishReportViewerWindow, self).__init__(parent) self.setWindowTitle("Publish report viewer") - icon = QtGui.QIcon(get_openpype_icon_filepath()) + icon = QtGui.QIcon(get_ayon_icon_filepath()) self.setWindowIcon(icon) body = QtWidgets.QSplitter(self) diff --git a/client/ayon_core/tools/publisher/window.py b/client/ayon_core/tools/publisher/window.py index a6d235cde7..22df496d48 100644 --- a/client/ayon_core/tools/publisher/window.py +++ b/client/ayon_core/tools/publisher/window.py @@ -55,7 +55,7 @@ class PublisherWindow(QtWidgets.QWidget): self.setWindowTitle("AYON publisher") - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) if reset_on_show is None: @@ -79,7 +79,7 @@ class PublisherWindow(QtWidgets.QWidget): # Header header_widget = QtWidgets.QWidget(self) - icon_pixmap = QtGui.QPixmap(resources.get_openpype_icon_filepath()) + icon_pixmap = QtGui.QPixmap(resources.get_ayon_icon_filepath()) icon_label = PixmapLabel(icon_pixmap, header_widget) icon_label.setObjectName("PublishContextLabel") diff --git a/client/ayon_core/tools/sceneinventory/window.py b/client/ayon_core/tools/sceneinventory/window.py index 14a02c534c..7652bc15c1 100644 --- a/client/ayon_core/tools/sceneinventory/window.py +++ b/client/ayon_core/tools/sceneinventory/window.py @@ -37,7 +37,7 @@ class SceneInventoryWindow(QtWidgets.QDialog): controller = SceneInventoryController() project_name = controller.get_current_project_name() - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowTitle("Scene Inventory - {}".format(project_name)) self.setObjectName("SceneInventory") diff --git a/client/ayon_core/tools/tray/pype_info_widget.py b/client/ayon_core/tools/tray/pype_info_widget.py index 8151baa7fb..c3c9b57b24 100644 --- a/client/ayon_core/tools/tray/pype_info_widget.py +++ b/client/ayon_core/tools/tray/pype_info_widget.py @@ -215,7 +215,7 @@ class PypeInfoWidget(QtWidgets.QWidget): self.setStyleSheet(style.load_stylesheet()) - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) self.setWindowTitle("AYON info") diff --git a/client/ayon_core/tools/tray/pype_tray.py b/client/ayon_core/tools/tray/pype_tray.py index 0f0c60012b..8e6d397ff9 100644 --- a/client/ayon_core/tools/tray/pype_tray.py +++ b/client/ayon_core/tools/tray/pype_tray.py @@ -308,7 +308,7 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon): doubleclick_time_ms = 100 def __init__(self, parent): - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) super(SystemTrayIcon, self).__init__(icon, parent) @@ -445,7 +445,7 @@ class PypeTrayStarter(QtCore.QObject): return self._splash def _create_splash(self): - splash_pix = QtGui.QPixmap(resources.get_openpype_splash_filepath()) + splash_pix = QtGui.QPixmap(resources.get_ayon_splash_filepath()) splash = QtWidgets.QSplashScreen(splash_pix) splash.setMask(splash_pix.mask()) splash.setEnabled(False) diff --git a/client/ayon_core/tools/workfiles/widgets/window.py b/client/ayon_core/tools/workfiles/widgets/window.py index 9fad14cde3..86a84b6195 100644 --- a/client/ayon_core/tools/workfiles/widgets/window.py +++ b/client/ayon_core/tools/workfiles/widgets/window.py @@ -57,7 +57,7 @@ class WorkfilesToolWindow(QtWidgets.QWidget): controller = BaseWorkfileController() self.setWindowTitle(self.title) - icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) + icon = QtGui.QIcon(resources.get_ayon_icon_filepath()) self.setWindowIcon(icon) flags = self.windowFlags() | QtCore.Qt.Window self.setWindowFlags(flags) diff --git a/client/ayon_core/widgets/README.md b/client/ayon_core/widgets/README.md index d9c8db98e7..4ac935abf6 100644 --- a/client/ayon_core/widgets/README.md +++ b/client/ayon_core/widgets/README.md @@ -63,7 +63,7 @@ def exec_plugin_install( engine_path: Path, env: dict = None): example_worker.moveToThread(q_thread) splash_screen = SplashScreen("Executing process ...", - resources.get_openpype_icon_filepath()) + resources.get_ayon_icon_filepath()) # set up the splash screen with necessary events example_worker.installing.connect(splash_screen.update_top_label_text)