added more colors to items

openpype/tools/new_publisher/publish_log_viewer/constants.py

@@ -6,7 +6,8 @@ ITEM_IS_GROUP_ROLE = QtCore.Qt.UserRole + 2
 ITEM_LABEL_ROLE = QtCore.Qt.UserRole + 3
 ITEM_ERRORED_ROLE = QtCore.Qt.UserRole + 4
 PLUGIN_SKIPPED_ROLE = QtCore.Qt.UserRole + 5
-INSTANCE_REMOVED_ROLE = QtCore.Qt.UserRole + 6
+PLUGIN_PASSED_ROLE = QtCore.Qt.UserRole + 6
+INSTANCE_REMOVED_ROLE = QtCore.Qt.UserRole + 7
 
 
 __all__ = (

openpype/tools/new_publisher/publish_log_viewer/delegates.py

@@ -1,12 +1,11 @@
-import platform
+import os
 import collections
 from Qt import QtWidgets, QtCore, QtGui
 from .constants import (
-    ITEM_ID_ROLE,
     ITEM_IS_GROUP_ROLE,
     ITEM_ERRORED_ROLE,
-    ITEM_LABEL_ROLE,
     PLUGIN_SKIPPED_ROLE,
+    PLUGIN_PASSED_ROLE,
     INSTANCE_REMOVED_ROLE
 )
 
@@ -25,6 +24,13 @@ colors = {
     "group-selected-hover": QtGui.QColor("#555555")
 }
 
+def get_image_path(filename):
+    return os.path.join(
+        os.path.dirname(os.path.abspath(__file__)),
+        "images",
+        filename
+    )
+
 
 class GroupItemDelegate(QtWidgets.QStyledItemDelegate):
     """Generic delegate for instance header"""
@@ -130,32 +136,64 @@ class GroupItemDelegate(QtWidgets.QStyledItemDelegate):
         if icons_by_size and size in icons_by_size:
             return icons_by_size[size]
 
+        offset = int(size * cls._item_pix_offset_ratio)
+        offset_size = size - (2 * offset)
         pix = QtGui.QPixmap(size, size)
         pix.fill(QtCore.Qt.transparent)
 
         painter = QtGui.QPainter(pix)
         painter.setRenderHint(QtGui.QPainter.Antialiasing)
 
+        draw_ellipse = True
         if name == "error":
             color = QtGui.QColor(colors["error"])
             painter.setPen(QtCore.Qt.NoPen)
             painter.setBrush(color)
+
         elif name == "skipped":
             color = QtGui.QColor(QtCore.Qt.white)
             pen = QtGui.QPen(color)
             pen.setWidth(int(size * cls._item_border_size))
             painter.setPen(pen)
             painter.setBrush(QtCore.Qt.transparent)
+
+        elif name == "passed":
+            color = QtGui.QColor(colors["ok"])
+            painter.setPen(QtCore.Qt.NoPen)
+            painter.setBrush(color)
+
+        elif name == "removed":
+            draw_ellipse = False
+            image_path = get_image_path("deleted_instance.png")
+
+            source_pix = QtGui.QPixmap(image_path)
+            width = offset_size
+            height = offset_size
+            if source_pix.width() > source_pix.height():
+                height = source_pix.width() / width * source_pix.height()
+            else:
+                width = source_pix.height() / height * source_pix.width()
+
+            scaled_pix = source_pix.scaled(
+                width,
+                height,
+                QtCore.Qt.KeepAspectRatio,
+                QtCore.Qt.SmoothTransformation
+            )
+            start_point = QtCore.QPointF(
+                offset + ((offset_size / 2) - (scaled_pix.width() / 2)),
+                offset + ((offset_size / 2) - (scaled_pix.height() / 2))
+            )
+            painter.drawPixmap(start_point, scaled_pix)
+
         else:
             color = QtGui.QColor(QtCore.Qt.white)
             painter.setPen(QtCore.Qt.NoPen)
             painter.setBrush(color)
 
-        offset = int(size * cls._item_pix_offset_ratio)
-        painter.drawEllipse(
-            offset, offset,
-            size - (2 * offset), size - (2 * offset)
-        )
+        if draw_ellipse:
+            painter.drawEllipse(offset, offset, offset_size, offset_size)
+
         painter.end()
 
         cls._item_icons_by_name_and_size[name][size] = pix
@@ -202,6 +240,10 @@ class GroupItemDelegate(QtWidgets.QStyledItemDelegate):
             expander_icon = self._get_icon("error", icon_size)
         elif index.data(PLUGIN_SKIPPED_ROLE):
             expander_icon = self._get_icon("skipped", icon_size)
+        elif index.data(PLUGIN_PASSED_ROLE):
+            expander_icon = self._get_icon("passed", icon_size)
+        elif index.data(INSTANCE_REMOVED_ROLE):
+            expander_icon = self._get_icon("removed", icon_size)
         else:
             expander_icon = self._get_icon("", icon_size)
 

openpype/tools/new_publisher/publish_log_viewer/model.py

@@ -9,6 +9,7 @@ from .constants import (
     ITEM_LABEL_ROLE,
     ITEM_ERRORED_ROLE,
     PLUGIN_SKIPPED_ROLE,
+    PLUGIN_PASSED_ROLE,
     INSTANCE_REMOVED_ROLE
 )
 
@@ -160,6 +161,7 @@ class PluginsModel(QtGui.QStandardItemModel):
                 item.setData(plugin_item.label, ITEM_LABEL_ROLE)
                 item.setData(plugin_item.id, ITEM_ID_ROLE)
                 item.setData(plugin_item.skipped, PLUGIN_SKIPPED_ROLE)
+                item.setData(plugin_item.passed, PLUGIN_PASSED_ROLE)
                 item.setData(plugin_item.errored, ITEM_ERRORED_ROLE)
                 items.append(item)
                 self._items_by_id[plugin_item.id] = item