Merge pull request #3658 from BigRoy/manager_add_subsetgroup_column

Scene Inventory: Add subsetGroup column

openpype/tools/sceneinventory/model.py

@@ -34,7 +34,8 @@
 class InventoryModel(TreeModel):
  """The model for the inventory"""
 
- Columns = ["Name", "version", "count", "family", "loader", "objectName"]
+ Columns = ["Name", "version", "count", "family",
+ "group", "loader", "objectName"]
 
  OUTDATED_COLOR = QtGui.QColor(235, 30, 30)
  CHILD_OUTDATED_COLOR = QtGui.QColor(200, 160, 30)
@@ -157,8 +158,13 @@ def data(self, index, role):
  # Family icon
  return item.get("familyIcon", None)
 
+ column_name = self.Columns[index.column()]
+
+ if column_name == "group" and item.get("group"):
+ return qtawesome.icon("fa.object-group",
+ color=get_default_entity_icon_color())
+
  if item.get("isGroupNode"):
- column_name = self.Columns[index.column()]
  if column_name == "active_site":
  provider = item.get("active_site_provider")
  return self._site_icons.get(provider)
@@ -423,6 +429,7 @@ def add_items(self, items, parent=None):
  group_node["familyIcon"] = family_icon
  group_node["count"] = len(group_items)
  group_node["isGroupNode"] = True
+ group_node["group"] = subset["data"].get("subsetGroup")
 
  if self.sync_enabled:
  progress = get_progress_for_repre(

openpype/tools/sceneinventory/window.py

@@ -89,7 +89,8 @@ def __init__(self, parent=None):
  view.setColumnWidth(1, 55) # version
  view.setColumnWidth(2, 55) # count
  view.setColumnWidth(3, 150) # family
- view.setColumnWidth(4, 100) # namespace
+ view.setColumnWidth(4, 120) # group
+ view.setColumnWidth(5, 150) # loader
 
  # apply delegates
  version_delegate = VersionDelegate(legacy_io, self)