General: Staging icon

openpype/hosts/maya/api/shader_definition_editor.py

@@ -31,7 +31,7 @@ def __init__(self, parent=None):
 
  self.setObjectName("shaderDefinitionEditor")
  self.setWindowTitle("OpenPype shader name definition editor")
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
  self.setWindowFlags(QtCore.Qt.Window)
  self.setParent(parent)

openpype/lib/pype_info.py

@@ -16,6 +16,17 @@ def get_pype_version():
  return openpype.version.__version__
 
 
+def is_running_staging():
+ """Currently used OpenPype is staging version.
+
+ Returns:
+ bool: True if openpype version containt 'staging'.
+ """
+ if "staging" in get_pype_version():
+ return True
+ return False
+
+
 def get_pype_info():
  """Information about currently used Pype process."""
  executable_args = get_pype_execute_args()

openpype/modules/default_modules/avalon_apps/avalon_app.py

@@ -60,7 +60,7 @@ def tray_init(self):
  from Qt import QtGui
 
  self.libraryloader = app.Window(
- icon=QtGui.QIcon(resources.pype_icon_filepath()),
+ icon=QtGui.QIcon(resources.get_openpype_icon_filepath()),
  show_projects=True,
  show_libraries=True
  )

openpype/modules/default_modules/clockify/widgets.py

@@ -13,7 +13,7 @@ def __init__(self, messages, title):
  super(MessageWidget, self).__init__()
 
  # Icon
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
 
  self.setWindowFlags(
@@ -90,7 +90,7 @@ def __init__(self, clockapi, optional=True):
  self.validated = False
 
  # Icon
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
 
  self.setWindowTitle("Clockify settings")

openpype/modules/default_modules/ftrack/tray/login_dialog.py

@@ -25,7 +25,7 @@ def __init__(self, module, parent=None):
  self._is_logged = False
  self._in_advance_mode = False
 
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
 
  self.setWindowFlags(

openpype/modules/default_modules/muster/widget_login.py

@@ -17,7 +17,7 @@ def __init__(self, module, parent=None):
  self.module = module
 
  # Icon
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
 
  self.setWindowFlags(

openpype/modules/default_modules/python_console_interpreter/window/widgets.py

@@ -331,7 +331,7 @@ def __init__(self, parent=None):
  super(PythonInterpreterWidget, self).__init__(parent)
 
  self.setWindowTitle("OpenPype Console")
- self.setWindowIcon(QtGui.QIcon(resources.pype_icon_filepath()))
+ self.setWindowIcon(QtGui.QIcon(resources.get_openpype_icon_filepath()))
 
  self.ansi_escape = re.compile(
  r"(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]"

openpype/modules/default_modules/sync_server/tray/app.py

@@ -26,7 +26,7 @@ def __init__(self, sync_server, parent=None):
  self.setFocusPolicy(QtCore.Qt.StrongFocus)
 
  self.setStyleSheet(style.load_stylesheet())
- self.setWindowIcon(QtGui.QIcon(resources.pype_icon_filepath()))
+ self.setWindowIcon(QtGui.QIcon(resources.get_openpype_icon_filepath()))
  self.resize(1450, 700)
 
  self.timer = QtCore.QTimer()

openpype/modules/default_modules/timers_manager/widget_user_idle.py

@@ -16,7 +16,7 @@ def __init__(self, module):
 
  self.module = module
 
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
  self.setWindowFlags(
  QtCore.Qt.WindowCloseButtonHint

openpype/plugins/load/delivery.py

@@ -71,7 +71,7 @@ def __init__(self, contexts, log=None, parent=None):
  self._set_representations(contexts)
 
  self.setWindowTitle("OpenPype - Deliver versions")
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
 
  self.setWindowFlags(

openpype/resources/__init__.py

@@ -1,5 +1,5 @@
 import os
-
+from openpype.lib.pype_info import is_running_staging
 
 RESOURCES_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -30,22 +30,22 @@ def get_liberation_font_path(bold=False, italic=False):
  return font_path
 
 
-def pype_icon_filepath(debug=None):
- if debug is None:
- debug = bool(os.getenv("OPENPYPE_DEV"))
+def get_openpype_icon_filepath(staging=None):
+ if staging is None:
+ staging = is_running_staging()
 
- if debug:
+ if staging:
  icon_file_name = "openpype_icon_staging.png"
  else:
  icon_file_name = "openpype_icon.png"
  return get_resource("icons", icon_file_name)
 
 
-def pype_splash_filepath(debug=None):
- if debug is None:
- debug = bool(os.getenv("OPENPYPE_DEV"))
+def get_openpype_splash_filepath(staging=None):
+ if staging is None:
+ staging = is_running_staging()
 
- if debug:
+ if staging:
  splash_file_name = "openpype_splash_staging.png"
  else:
  splash_file_name = "openpype_splash.png"

openpype/style/__init__.py

@@ -91,4 +91,4 @@ def load_stylesheet():
 
 
 def app_icon_path():
- return resources.pype_icon_filepath()
+ return resources.get_openpype_icon_filepath()

openpype/tools/launcher/actions.py

@@ -84,7 +84,7 @@ def is_compatible(self, session):
 
  def _show_message_box(self, title, message, details=None):
  dialog = QtWidgets.QMessageBox()
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  dialog.setWindowIcon(icon)
  dialog.setStyleSheet(style.load_stylesheet())
  dialog.setWindowTitle(title)

openpype/tools/launcher/window.py

@@ -261,7 +261,7 @@ def __init__(self, parent=None):
  self.setFocusPolicy(QtCore.Qt.StrongFocus)
  self.setAttribute(QtCore.Qt.WA_DeleteOnClose, False)
 
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
  self.setStyleSheet(style.load_stylesheet())
 

openpype/tools/project_manager/project_manager/window.py

@@ -29,7 +29,7 @@ def __init__(self, parent=None):
  self._user_passed = False
 
  self.setWindowTitle("OpenPype Project Manager")
- self.setWindowIcon(QtGui.QIcon(resources.pype_icon_filepath()))
+ self.setWindowIcon(QtGui.QIcon(resources.get_openpype_icon_filepath()))
 
  # Top part of window
  top_part_widget = QtWidgets.QWidget(self)

openpype/tools/settings/settings/style/__init__.py

@@ -10,4 +10,4 @@ def load_stylesheet():
 
 
 def app_icon_path():
- return resources.pype_icon_filepath()
+ return resources.get_openpype_icon_filepath()

openpype/tools/standalonepublish/app.py

@@ -231,7 +231,7 @@ def main():
  qt_app = QtWidgets.QApplication([])
  # app.setQuitOnLastWindowClosed(False)
  qt_app.setStyleSheet(style.load_stylesheet())
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  qt_app.setWindowIcon(icon)
 
  def signal_handler(sig, frame):

openpype/tools/tray/pype_info_widget.py

@@ -214,7 +214,7 @@ def __init__(self, parent=None):
 
  self.setStyleSheet(style.load_stylesheet())
 
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
  self.setWindowIcon(icon)
  self.setWindowTitle("OpenPype info")
 

openpype/tools/tray/pype_tray.py

@@ -200,7 +200,7 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
  doubleclick_time_ms = 100
 
  def __init__(self, parent):
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
 
  super(SystemTrayIcon, self).__init__(icon, parent)
 
@@ -308,7 +308,7 @@ def __init__(self):
  splash_widget.hide()
 
  def set_splash(self):
- splash_pix = QtGui.QPixmap(resources.pype_splash_filepath())
+ splash_pix = QtGui.QPixmap(resources.get_openpype_splash_filepath())
  splash = QtWidgets.QSplashScreen(splash_pix)
  splash.setMask(splash_pix.mask())
  splash.setEnabled(False)