master merge fixes

Author: iLLiCiTiT

avalon/pipeline.py

@@ -978,9 +978,6 @@ def update_current_task(task=None, asset=None, app=None):
                                       "type": "asset"})
         assert asset_document, "Asset must exist"
         changed["AVALON_SILO"] = asset_document.get("silo") or ""
-        parents = asset_document["data"]["parents"]
-        hierarchy = os.path.sep.join(parents) or ""
-        changed['AVALON_HIERARCHY'] = hierarchy
 
     # Compute work directory (with the temporary changed session so far)
     project = io.find_one({"type": "project"},
@@ -995,10 +992,8 @@ def update_current_task(task=None, asset=None, app=None):
     if not os.path.exists(workdir):
         os.makedirs(workdir)
 
-    parents = asset_document['data'].get('parents', [])
-    hierarchy = ""
-    if len(parents) > 0:
-        hierarchy = os.path.sep.join(parents)
+    parents = asset_document["data"].get("parents") or []
+    hierarchy = os.path.sep.join(parents) or ""
     changed['AVALON_HIERARCHY'] = hierarchy
 
     # Update the full session in one go to avoid half updates

avalon/tools/contextmanager/app.py

@@ -226,7 +226,7 @@ def show(parent=None):
 
     with lib.application():
         window = App(parent)
-        window.show()
         window.setStyleSheet(style.load_stylesheet())
+        window.show()
 
         module.window = window

avalon/tools/creator/app.py

@@ -362,14 +362,6 @@ def _on_data_changed(self):
             else:
                 subset.as_new()
 
-            # Indicate subset existence
-            if not subset_name:
-                subset.as_empty()
-            elif subset_name in existed_subsets:
-                subset.as_exists()
-            else:
-                subset.as_new()
-
             item.setData(ExistsRole, True)
 
         else:
@@ -636,8 +628,8 @@ def show(debug=False, parent=None):
 
     with lib.application():
         window = Window(parent)
+        window.setStyleSheet(style.load_stylesheet())
         window.refresh()
         window.show()
-        window.setStyleSheet(style.load_stylesheet())
 
         module.window = window

avalon/tools/loader/app.py

@@ -492,7 +492,7 @@ def show(debug=False, parent=None, use_context=False):
             module.window.refresh()
             return
         except RuntimeError as e:
-            if not str(e).rstrip().endswith("already deleted."):
+            if not e.message.rstrip().endswith("already deleted."):
                 raise
 
             # Garbage collected
@@ -502,7 +502,12 @@ def show(debug=False, parent=None, use_context=False):
         import traceback
         sys.excepthook = lambda typ, val, tb: traceback.print_last()
 
-    with lib.application():
+        io.install()
+
+        any_project = next(
+            project for project in io.projects()
+            if project.get("active", True) is not False
+        )
 
         api.Session["AVALON_PROJECT"] = any_project["name"]
         module.project = any_project["name"]
@@ -516,7 +521,6 @@ def show(debug=False, parent=None, use_context=False):
         window = Window(parent)
         window.setStyleSheet(style.load_stylesheet())
         window.show()
-        window.setStyleSheet(style.load_stylesheet())
 
         if use_context:
             context = {"asset": api.Session["AVALON_ASSET"]}

avalon/tools/loader/delegates.py

@@ -2,7 +2,9 @@
 from datetime import datetime
 import logging
 
-from ...vendor.Qt import QtWidgets
+from ...vendor.Qt import QtWidgets, QtGui, QtCore
+from ...vendor import Qt
+from ..models import AssetModel
 
 log = logging.getLogger(__name__)
 
@@ -100,3 +102,149 @@ class PrettyTimeDelegate(QtWidgets.QStyledItemDelegate):
 
     def displayText(self, value, locale):
         return pretty_timestamp(value)
+
+
+class AssetDelegate(QtWidgets.QItemDelegate):
+    bar_height = 3
+
+    def sizeHint(self, option, index):
+        result = super(AssetDelegate, self).sizeHint(option, index)
+        height = result.height()
+        result.setHeight(height + self.bar_height)
+
+        return result
+
+    def paint(self, painter, option, index):
+        painter.save()
+
+        item_rect = QtCore.QRect(option.rect)
+        item_rect.setHeight(option.rect.height() - self.bar_height)
+
+        subset_colors = index.data(AssetModel.subsetColorsRole)
+        subset_colors_width = 0
+        if subset_colors:
+            subset_colors_width = option.rect.width()/len(subset_colors)
+
+        subset_rects = []
+        counter = 0
+        for subset_c in subset_colors:
+            new_color = None
+            new_rect = None
+            if subset_c:
+                new_color = QtGui.QColor(*subset_c)
+
+                new_rect = QtCore.QRect(
+                    option.rect.left() + (counter * subset_colors_width),
+                    option.rect.top() + (option.rect.height()-self.bar_height),
+                    subset_colors_width,
+                    self.bar_height
+                )
+            subset_rects.append((new_color, new_rect))
+            counter += 1
+
+        # Background
+        bg_color = QtGui.QColor(60, 60, 60)
+        if option.state & QtWidgets.QStyle.State_Selected:
+            if len(subset_colors) == 0:
+                item_rect.setTop(item_rect.top() + (self.bar_height / 2))
+            if option.state & QtWidgets.QStyle.State_MouseOver:
+                bg_color.setRgb(70, 70, 70)
+        else:
+            item_rect.setTop(item_rect.top() + (self.bar_height / 2))
+            if option.state & QtWidgets.QStyle.State_MouseOver:
+                bg_color.setAlpha(100)
+            else:
+                bg_color.setAlpha(0)
+
+        # # -- When not needed to do a rounded corners (easier and without painter restore):
+        # painter.fillRect(
+        #     item_rect,
+        #     QtGui.QBrush(bg_color)
+        # )
+        pen = painter.pen()
+        pen.setStyle(QtCore.Qt.NoPen)
+        pen.setWidth(0)
+        painter.setPen(pen)
+        painter.setBrush(QtGui.QBrush(bg_color))
+        painter.drawRoundedRect(option.rect, 3, 3)
+
+        if option.state & QtWidgets.QStyle.State_Selected:
+            for color, subset_rect in subset_rects:
+                if not color or not subset_rect:
+                    continue
+                painter.fillRect(subset_rect, QtGui.QBrush(color))
+
+        painter.restore()
+        painter.save()
+
+        # Icon
+        icon_index = index.model().index(
+            index.row(), index.column(), index.parent()
+        )
+        # - Default icon_rect if not icon
+        icon_rect = QtCore.QRect(
+            item_rect.left(),
+            item_rect.top(),
+            # To make sure it's same size all the time
+            option.rect.height() - self.bar_height,
+            option.rect.height() - self.bar_height
+        )
+        icon = index.model().data(icon_index, QtCore.Qt.DecorationRole)
+
+        if icon:
+            margin = 0
+            mode = QtGui.QIcon.Normal
+
+            if not (option.state & QtWidgets.QStyle.State_Enabled):
+                mode = QtGui.QIcon.Disabled
+            elif option.state & QtWidgets.QStyle.State_Selected:
+                mode = QtGui.QIcon.Selected
+
+            if isinstance(icon, QtGui.QPixmap):
+                icon = QtGui.QIcon(icon)
+                option.decorationSize = icon.size() / icon.devicePixelRatio()
+
+            elif isinstance(icon, QtGui.QColor):
+                pixmap = QtGui.QPixmap(option.decorationSize)
+                pixmap.fill(icon)
+                icon = QtGui.QIcon(pixmap)
+
+            elif isinstance(icon, QtGui.QImage):
+                icon = QtGui.QIcon(QtGui.QPixmap.fromImage(icon))
+                option.decorationSize = icon.size() / icon.devicePixelRatio()
+
+            elif isinstance(icon, QtGui.QIcon):
+                state = QtGui.QIcon.Off
+                if option.state & QtWidgets.QStyle.State_Open:
+                    state = QtGui.QIcon.On
+                actualSize = option.icon.actualSize(
+                    option.decorationSize, mode, state
+                )
+                option.decorationSize = QtCore.QSize(
+                    min(option.decorationSize.width(), actualSize.width()),
+                    min(option.decorationSize.height(), actualSize.height())
+                )
+
+            state = QtGui.QIcon.Off
+            if option.state & QtWidgets.QStyle.State_Open:
+                state = QtGui.QIcon.On
+
+            icon.paint(
+                painter, icon_rect,
+                QtCore.Qt.AlignLeft , mode, state
+            )
+
+        # Text
+        text_rect = QtCore.QRect(
+            icon_rect.left() + icon_rect.width() + 2,
+            item_rect.top(),
+            item_rect.width(),
+            item_rect.height()
+        )
+
+        painter.drawText(
+            text_rect, QtCore.Qt.AlignVCenter,
+            index.data(QtCore.Qt.DisplayRole)
+        )
+
+        painter.restore()