From 2bf78abf6341f2ac5056a5c735a14a20162a8604 Mon Sep 17 00:00:00 2001 From: Joseph Yu Date: Tue, 14 May 2019 20:01:56 +0100 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 06eb7bf2..40fe8596 100644 --- a/python/tk_multi_workfiles/step_list_filter.py +++ b/python/tk_multi_workfiles/step_list_filter.py @@ -220,7 +220,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 8a95ba2e0c037e522f74e8b4d58fb3060770cb1b Mon Sep 17 00:00:00 2001 From: Joseph Yu Date: Wed, 15 May 2019 11:03:25 +0100 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 d2d6f360..bab5acb8 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