From 3a69b9956d6d9ca82a99edb77c8ad52fa6b11084 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 20 Aug 2020 15:15:10 +0200
Subject: [PATCH 1/2] moved resources to widgets folder

---
 .../{ => widgets}/resources/__init__.py             |   0
 .../{ => widgets}/resources/edit.svg                |   0
 .../{ => widgets}/resources/file.png                | Bin
 .../{ => widgets}/resources/files.png               | Bin
 .../{ => widgets}/resources/houdini.png             | Bin
 .../{ => widgets}/resources/image_file.png          | Bin
 .../{ => widgets}/resources/image_files.png         | Bin
 .../{ => widgets}/resources/information.svg         |   0
 .../{ => widgets}/resources/maya.png                | Bin
 .../{ => widgets}/resources/menu.png                | Bin
 .../{ => widgets}/resources/menu_disabled.png       | Bin
 .../{ => widgets}/resources/menu_hover.png          | Bin
 .../{ => widgets}/resources/menu_pressed.png        | Bin
 .../{ => widgets}/resources/menu_pressed_hover.png  | Bin
 .../{ => widgets}/resources/nuke.png                | Bin
 .../{ => widgets}/resources/premiere.png            | Bin
 .../{ => widgets}/resources/trash.png               | Bin
 .../{ => widgets}/resources/trash_disabled.png      | Bin
 .../{ => widgets}/resources/trash_hover.png         | Bin
 .../{ => widgets}/resources/trash_pressed.png       | Bin
 .../{ => widgets}/resources/trash_pressed_hover.png | Bin
 .../{ => widgets}/resources/video_file.png          | Bin
 22 files changed, 0 insertions(+), 0 deletions(-)
 rename pype/tools/standalonepublish/{ => widgets}/resources/__init__.py (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/edit.svg (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/file.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/files.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/houdini.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/image_file.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/image_files.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/information.svg (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/maya.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/menu.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/menu_disabled.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/menu_hover.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/menu_pressed.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/menu_pressed_hover.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/nuke.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/premiere.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/trash.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/trash_disabled.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/trash_hover.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/trash_pressed.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/trash_pressed_hover.png (100%)
 rename pype/tools/standalonepublish/{ => widgets}/resources/video_file.png (100%)

diff --git a/pype/tools/standalonepublish/resources/__init__.py b/pype/tools/standalonepublish/widgets/resources/__init__.py
similarity index 100%
rename from pype/tools/standalonepublish/resources/__init__.py
rename to pype/tools/standalonepublish/widgets/resources/__init__.py
diff --git a/pype/tools/standalonepublish/resources/edit.svg b/pype/tools/standalonepublish/widgets/resources/edit.svg
similarity index 100%
rename from pype/tools/standalonepublish/resources/edit.svg
rename to pype/tools/standalonepublish/widgets/resources/edit.svg
diff --git a/pype/tools/standalonepublish/resources/file.png b/pype/tools/standalonepublish/widgets/resources/file.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/file.png
rename to pype/tools/standalonepublish/widgets/resources/file.png
diff --git a/pype/tools/standalonepublish/resources/files.png b/pype/tools/standalonepublish/widgets/resources/files.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/files.png
rename to pype/tools/standalonepublish/widgets/resources/files.png
diff --git a/pype/tools/standalonepublish/resources/houdini.png b/pype/tools/standalonepublish/widgets/resources/houdini.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/houdini.png
rename to pype/tools/standalonepublish/widgets/resources/houdini.png
diff --git a/pype/tools/standalonepublish/resources/image_file.png b/pype/tools/standalonepublish/widgets/resources/image_file.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/image_file.png
rename to pype/tools/standalonepublish/widgets/resources/image_file.png
diff --git a/pype/tools/standalonepublish/resources/image_files.png b/pype/tools/standalonepublish/widgets/resources/image_files.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/image_files.png
rename to pype/tools/standalonepublish/widgets/resources/image_files.png
diff --git a/pype/tools/standalonepublish/resources/information.svg b/pype/tools/standalonepublish/widgets/resources/information.svg
similarity index 100%
rename from pype/tools/standalonepublish/resources/information.svg
rename to pype/tools/standalonepublish/widgets/resources/information.svg
diff --git a/pype/tools/standalonepublish/resources/maya.png b/pype/tools/standalonepublish/widgets/resources/maya.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/maya.png
rename to pype/tools/standalonepublish/widgets/resources/maya.png
diff --git a/pype/tools/standalonepublish/resources/menu.png b/pype/tools/standalonepublish/widgets/resources/menu.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/menu.png
rename to pype/tools/standalonepublish/widgets/resources/menu.png
diff --git a/pype/tools/standalonepublish/resources/menu_disabled.png b/pype/tools/standalonepublish/widgets/resources/menu_disabled.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/menu_disabled.png
rename to pype/tools/standalonepublish/widgets/resources/menu_disabled.png
diff --git a/pype/tools/standalonepublish/resources/menu_hover.png b/pype/tools/standalonepublish/widgets/resources/menu_hover.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/menu_hover.png
rename to pype/tools/standalonepublish/widgets/resources/menu_hover.png
diff --git a/pype/tools/standalonepublish/resources/menu_pressed.png b/pype/tools/standalonepublish/widgets/resources/menu_pressed.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/menu_pressed.png
rename to pype/tools/standalonepublish/widgets/resources/menu_pressed.png
diff --git a/pype/tools/standalonepublish/resources/menu_pressed_hover.png b/pype/tools/standalonepublish/widgets/resources/menu_pressed_hover.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/menu_pressed_hover.png
rename to pype/tools/standalonepublish/widgets/resources/menu_pressed_hover.png
diff --git a/pype/tools/standalonepublish/resources/nuke.png b/pype/tools/standalonepublish/widgets/resources/nuke.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/nuke.png
rename to pype/tools/standalonepublish/widgets/resources/nuke.png
diff --git a/pype/tools/standalonepublish/resources/premiere.png b/pype/tools/standalonepublish/widgets/resources/premiere.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/premiere.png
rename to pype/tools/standalonepublish/widgets/resources/premiere.png
diff --git a/pype/tools/standalonepublish/resources/trash.png b/pype/tools/standalonepublish/widgets/resources/trash.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/trash.png
rename to pype/tools/standalonepublish/widgets/resources/trash.png
diff --git a/pype/tools/standalonepublish/resources/trash_disabled.png b/pype/tools/standalonepublish/widgets/resources/trash_disabled.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/trash_disabled.png
rename to pype/tools/standalonepublish/widgets/resources/trash_disabled.png
diff --git a/pype/tools/standalonepublish/resources/trash_hover.png b/pype/tools/standalonepublish/widgets/resources/trash_hover.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/trash_hover.png
rename to pype/tools/standalonepublish/widgets/resources/trash_hover.png
diff --git a/pype/tools/standalonepublish/resources/trash_pressed.png b/pype/tools/standalonepublish/widgets/resources/trash_pressed.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/trash_pressed.png
rename to pype/tools/standalonepublish/widgets/resources/trash_pressed.png
diff --git a/pype/tools/standalonepublish/resources/trash_pressed_hover.png b/pype/tools/standalonepublish/widgets/resources/trash_pressed_hover.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/trash_pressed_hover.png
rename to pype/tools/standalonepublish/widgets/resources/trash_pressed_hover.png
diff --git a/pype/tools/standalonepublish/resources/video_file.png b/pype/tools/standalonepublish/widgets/resources/video_file.png
similarity index 100%
rename from pype/tools/standalonepublish/resources/video_file.png
rename to pype/tools/standalonepublish/widgets/resources/video_file.png

From 1e101c1fbc408e7fe77809dca3385b14e16fdea6 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 20 Aug 2020 15:15:28 +0200
Subject: [PATCH 2/2] PngFactory do not create Qt object on init

---
 .../widgets/widget_component_item.py          | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/pype/tools/standalonepublish/widgets/widget_component_item.py b/pype/tools/standalonepublish/widgets/widget_component_item.py
index dd838075e3..3850d68b96 100644
--- a/pype/tools/standalonepublish/widgets/widget_component_item.py
+++ b/pype/tools/standalonepublish/widgets/widget_component_item.py
@@ -1,6 +1,6 @@
 import os
 from Qt import QtCore, QtGui, QtWidgets
-from pype.resources import get_resource
+from .resources import get_resource
 from avalon import style
 
 
@@ -353,27 +353,37 @@ class LightingButton(QtWidgets.QPushButton):
 
 
 class PngFactory:
-    png_names = {
-        "trash": {
-            "normal": QtGui.QIcon(get_resource("trash.png")),
-            "hover": QtGui.QIcon(get_resource("trash_hover.png")),
-            "pressed": QtGui.QIcon(get_resource("trash_pressed.png")),
-            "pressed_hover": QtGui.QIcon(
-                get_resource("trash_pressed_hover.png")
-            ),
-            "disabled": QtGui.QIcon(get_resource("trash_disabled.png"))
-        },
+    png_names = None
 
-        "menu": {
-            "normal": QtGui.QIcon(get_resource("menu.png")),
-            "hover": QtGui.QIcon(get_resource("menu_hover.png")),
-            "pressed": QtGui.QIcon(get_resource("menu_pressed.png")),
-            "pressed_hover": QtGui.QIcon(
-                get_resource("menu_pressed_hover.png")
-            ),
-            "disabled": QtGui.QIcon(get_resource("menu_disabled.png"))
+    @classmethod
+    def init(cls):
+        cls.png_names = {
+            "trash": {
+                "normal": QtGui.QIcon(get_resource("trash.png")),
+                "hover": QtGui.QIcon(get_resource("trash_hover.png")),
+                "pressed": QtGui.QIcon(get_resource("trash_pressed.png")),
+                "pressed_hover": QtGui.QIcon(
+                    get_resource("trash_pressed_hover.png")
+                ),
+                "disabled": QtGui.QIcon(get_resource("trash_disabled.png"))
+            },
+
+            "menu": {
+                "normal": QtGui.QIcon(get_resource("menu.png")),
+                "hover": QtGui.QIcon(get_resource("menu_hover.png")),
+                "pressed": QtGui.QIcon(get_resource("menu_pressed.png")),
+                "pressed_hover": QtGui.QIcon(
+                    get_resource("menu_pressed_hover.png")
+                ),
+                "disabled": QtGui.QIcon(get_resource("menu_disabled.png"))
+            }
         }
-    }
+
+    @classmethod
+    def get_png(cls, name):
+        if cls.png_names is None:
+            cls.init()
+        return cls.png_names.get(name)
 
 
 class PngButton(QtWidgets.QPushButton):
@@ -406,7 +416,7 @@ class PngButton(QtWidgets.QPushButton):
 
         png_dict = {}
         if name:
-            png_dict = PngFactory.png_names.get(name) or {}
+            png_dict = PngFactory.get_png(name) or {}
             if not png_dict:
                 print((
                     "WARNING: There is not set icon with name \"{}\""