Skip to content

Commit

Permalink
Explicit QIcon for Katana/PyQt (v2.3.4+wwfx.1.0.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
Liametc authored and Joseph Yu committed Nov 18, 2020
1 parent fad5fa4 commit 80b7c7d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions python/tk_multi_publish2/progress/progress_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def process_log_message(self, message, status, action):
item.setText(0, message)

if icon:
item.setIcon(0, icon)
item.setIcon(0, QtGui.QIcon(icon))

if self._logging_parent_item:
self._logging_parent_item.addChild(item)
Expand Down Expand Up @@ -278,11 +278,11 @@ def push(self, text, icon=None, publish_instance=None):
self._logging_parent_item.addChild(item)

if icon:
item.setIcon(0, icon)
item.setIcon(0, QtGui.QIcon(icon))
self._icon_label.setPixmap(icon)
elif self._current_phase:
std_icon = self._icon_lookup[self._current_phase]
item.setIcon(0, std_icon)
item.setIcon(0, QtGui.QIcon(std_icon))
self._icon_label.setPixmap(std_icon)

self._progress_details.log_tree.setCurrentItem(item)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def double_clicked(self, column):
else:
icon = self._expanded_icon

self._embedded_widget.expand_indicator.setIcon(icon)
self._embedded_widget.expand_indicator.setIcon(QtGui.QIcon(icon))

def _check_expand_state(self):
"""
Expand All @@ -240,7 +240,7 @@ def _check_expand_state(self):
else:
icon = self._collapsed_icon

self._embedded_widget.expand_indicator.setIcon(icon)
self._embedded_widget.expand_indicator.setIcon(QtGui.QIcon(icon))


class TopLevelTreeNodeItem(TreeNodeItem):
Expand Down

0 comments on commit 80b7c7d

Please sign in to comment.