From f70c4d860de76ecd66075762ea18c06820603e8d Mon Sep 17 00:00:00 2001 From: Joseph Yu Date: Thu, 11 Mar 2021 15:44:17 +0000 Subject: [PATCH 1/2] Fixed setIcon with pixmap error --- python/tk_multi_workfiles/step_list_filter.py | 2 +- tk-metadata/install_complete | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tk-metadata/install_complete diff --git a/python/tk_multi_workfiles/step_list_filter.py b/python/tk_multi_workfiles/step_list_filter.py index baadfaf1..8b3e4b05 100644 --- a/python/tk_multi_workfiles/step_list_filter.py +++ b/python/tk_multi_workfiles/step_list_filter.py @@ -223,7 +223,7 @@ def _ensure_widgets_for_entity_type(self, entity_type): # color otherwise it is too bright. color = [int(x) for x in step["color"].split(",")] + [200] pixmap.fill(QtGui.QColor(*color)) - widget.setIcon(pixmap) + widget.setIcon(QtGui.QIcon(pixmap)) # Turn it on if it was in the step saved filters # We do this before the toggled signal is connected to not emit # un-wanted signals. diff --git a/tk-metadata/install_complete b/tk-metadata/install_complete new file mode 100644 index 00000000..e69de29b From 050c086110ccaebf7dab844c1f54df242d604205 Mon Sep 17 00:00:00 2001 From: Joseph Yu Date: Thu, 11 Mar 2021 15:44:17 +0000 Subject: [PATCH 2/2] Added tk-metadata to .gitignore Removed tk-metadata --- .gitignore | 4 ++++ tk-metadata/install_complete | 0 2 files changed, 4 insertions(+) delete mode 100644 tk-metadata/install_complete diff --git a/.gitignore b/.gitignore index cdd148ea..7de00287 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# ---- ignore special files written during config setup +tk-metadata + +# Byte-compiled / optimized / DLL files *.py[cod] # C extensions diff --git a/tk-metadata/install_complete b/tk-metadata/install_complete deleted file mode 100644 index e69de29b..00000000