diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 0eb518c2e3..5fa676fd5b 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -52,7 +52,7 @@ class InstallDialog(QtWidgets.QDialog): self.setWindowTitle(f"Pype Igniter {__version__} - Pype installation") self._icon_path = os.path.join( - os.path.dirname(__file__), 'pype_icon.png') + os.path.dirname(__file__), 'openpype_icon.png') icon = QtGui.QIcon(self._icon_path) self.setWindowIcon(icon) self.setWindowFlags( diff --git a/igniter/pype.ico b/igniter/openpype.ico similarity index 100% rename from igniter/pype.ico rename to igniter/openpype.ico diff --git a/pype/resources/icons/pype_icon.png b/igniter/openpype_icon.png similarity index 100% rename from pype/resources/icons/pype_icon.png rename to igniter/openpype_icon.png diff --git a/pype/hosts/hiero/api/lib.py b/pype/hosts/hiero/api/lib.py index 14760a3137..0d37f2d075 100644 --- a/pype/hosts/hiero/api/lib.py +++ b/pype/hosts/hiero/api/lib.py @@ -241,7 +241,7 @@ def set_track_item_pype_tag(track_item, data=None): tag_data = { "editable": "0", "note": "Pype data holder", - "icon": "pype_icon.png", + "icon": "openpype_icon.png", "metadata": {k: v for k, v in data.items()} } # get available pype tag if any diff --git a/pype/resources/__init__.py b/pype/resources/__init__.py index 9adce2afe4..fdee38ab34 100644 --- a/pype/resources/__init__.py +++ b/pype/resources/__init__.py @@ -35,9 +35,9 @@ def pype_icon_filepath(debug=None): debug = bool(os.getenv("PYPE_DEV")) if debug: - icon_file_name = "pype_icon_dev.png" + icon_file_name = "openpype_icon_staging.png" else: - icon_file_name = "pype_icon.png" + icon_file_name = "openpype_icon.png" return get_resource("icons", icon_file_name) @@ -46,7 +46,7 @@ def pype_splash_filepath(debug=None): debug = bool(os.getenv("PYPE_DEV")) if debug: - splash_file_name = "pype_splash_dev.png" + splash_file_name = "openpype_splash_staging.png" else: - splash_file_name = "pype_splash.png" + splash_file_name = "openpype_splash.png" return get_resource("icons", splash_file_name) diff --git a/pype/resources/icons/Spine.json b/pype/resources/icons/Spine.json deleted file mode 100644 index 8c70d52b25..0000000000 --- a/pype/resources/icons/Spine.json +++ /dev/null @@ -1,22 +0,0 @@ -{"skeleton":{"images":""}, -"bones":[{"name":"root"}], -"slots":[ - {"name":"workfiles","bone":"root","attachment":"workfiles"}, - {"name":"circle_green","bone":"root","attachment":"circle_green"}, - {"name":"circle_red","bone":"root","attachment":"circle_red"}, - {"name":"lookmanager","bone":"root","attachment":"lookmanager"}, - {"name":"inventory","bone":"root","attachment":"inventory"}, - {"name":"loader","bone":"root","attachment":"loader"} -], -"skins":{ - "default":{ - "workfiles":{"workfiles":{"x":3877,"y":1247,"width":500,"height":500}}, - "circle_green":{"circle_green":{"x":3877,"y":280,"width":500,"height":500}}, - "circle_red":{"circle_red":{"x":5748,"y":280,"width":500,"height":500}}, - "lookmanager":{"lookmanager":{"x":5631,"y":1253,"width":500,"height":500}}, - "inventory":{"inventory":{"x":6335,"y":1265,"width":500,"height":500}}, - "loader":{"loader":{"x":4827,"y":1247,"width":500,"height":500}} - } -}, -"animations":{"animation":{}} -} \ No newline at end of file diff --git a/pype/resources/icons/openpype_icon.png b/pype/resources/icons/openpype_icon.png new file mode 100644 index 0000000000..c3ab1d3002 Binary files /dev/null and b/pype/resources/icons/openpype_icon.png differ diff --git a/pype/resources/icons/pype_icon_dev.png b/pype/resources/icons/openpype_icon_staging.png similarity index 100% rename from pype/resources/icons/pype_icon_dev.png rename to pype/resources/icons/openpype_icon_staging.png diff --git a/pype/resources/icons/pype_splash.png b/pype/resources/icons/openpype_splash.png similarity index 100% rename from pype/resources/icons/pype_splash.png rename to pype/resources/icons/openpype_splash.png diff --git a/pype/resources/icons/pype_splash_dev.png b/pype/resources/icons/openpype_splash_staging.png similarity index 100% rename from pype/resources/icons/pype_splash_dev.png rename to pype/resources/icons/openpype_splash_staging.png diff --git a/pype/tools/settings/settings/style/__init__.py b/pype/tools/settings/settings/style/__init__.py index a8f202d97b..9bb5e851b4 100644 --- a/pype/tools/settings/settings/style/__init__.py +++ b/pype/tools/settings/settings/style/__init__.py @@ -9,4 +9,4 @@ def load_stylesheet(): def app_icon_path(): - return os.path.join(os.path.dirname(__file__), "pype_icon.png") + return os.path.join(os.path.dirname(__file__), "openpype_icon.png") diff --git a/setup.py b/setup.py index e3be48d6e0..65956485d5 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ build_options = dict( optimize=0 ) -icon_path = pype_root / "igniter" / "pype.ico" +icon_path = pype_root / "igniter" / "openpype.ico" executables = [ Executable("start.py", base=None,