Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: shotgunsoftware/tk-multi-publish2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4bdd9116d915e11a19c53b918dd0f655c62619cf
Choose a base ref
..
head repository: shotgunsoftware/tk-multi-publish2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce3cbed4202295c8bd0d12e77ec4ac74cfc9b14d
Choose a head ref
5 changes: 0 additions & 5 deletions hooks/collector.py
View file
Original file line number Diff line number Diff line change
@@ -124,11 +124,6 @@ def common_file_info(self):
"icon": self._get_icon_path("texture.png"),
"item_type": "file.texture",
},
"LUT File": {
"extensions": ["cube", "cc", "ccc", "lut", "cub"],
"icon": self._get_icon_path("lut.png"),
"item_type": "file.lut",
},
}

return self._common_file_info
Binary file removed hooks/icons/lut.png
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions python/tk_multi_publish2/progress/progress_handler.py
View file
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ def process_log_message(self, message, status, action):
item.setText(0, message)

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

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

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

self._progress_details.log_tree.setCurrentItem(item)
4 changes: 2 additions & 2 deletions python/tk_multi_publish2/publish_tree_widget/tree_node_item.py
View file
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@ def double_clicked(self, column):
else:
icon = self._expanded_icon

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

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

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

class TopLevelTreeNodeItem(TreeNodeItem):
"""