PR feedback

Author: barbalt

lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/collection/includeExcludeWidget.py

@@ -87,9 +87,6 @@ def __init__(
 
         headerLayout.addWidget(self._filterWidget)
         headerLayout.addWidget(separator)
-
-        # Will need a separator for future designs
-        # headerLayout.addWidget(separator)
         headerLayout.addWidget(menuButton)
         includeExcludeLayout.addWidget(headerWidget)
 
@@ -209,6 +206,7 @@ def onRemoveSelectionFromInclude(self):
         self._updatingUI = False
         self.updateUI()
         self.onListSelectionChanged()
+        self._include.list.update_placeholder()
 
     def onRemoveSelectionFromExclude(self):
         self._updatingUI = True
@@ -217,6 +215,7 @@ def onRemoveSelectionFromExclude(self):
         self._updatingUI = False
         self.updateUI()
         self.onListSelectionChanged()
+        self._exclude.list.update_placeholder()
 
     def onListSelectionChanged(self):
         includesSelected = self._include.list.hasSelectedItems
@@ -229,7 +228,7 @@ def onListSelectionChanged(self):
         try:
             self._deleteBtn.pressed.disconnect(self.onRemoveSelectionFromInclude)
             self._deleteBtn.pressed.disconnect(self.onRemoveSelectionFromExclude)
-        except:
+        except Exception:
             pass
 
         if includesSelected and excludeSelected:
@@ -301,17 +300,6 @@ def addItemToCollection(self, items):
 
         self.control.update()
 
-    """
-    def removeItemToCollection(self, item):
-        if self.control._collection is not None:
-            if self.widget.headerTitle == "Include":
-                self.control._collection.GetIncludesRel().RemoveTarget(item)
-            elif self.widget.headerTitle == "Exclude":
-                self.control._collection.GetExcludesRel().RemoveTarget(item)
-
-        self.control.update()
-    """
-
     def _validatePath(self, collection, path):
 
         if not Sdf.Path.IsValidPathString(path):
@@ -321,7 +309,7 @@ def _validatePath(self, collection, path):
         prim = stage.GetPrimAtPath(Sdf.Path(path))
 
         if not prim or not prim.IsValid():
-            raise ValueError("Value must be a float or an int")(
+            raise ValueError(
                 "Error: The dragged object is not in the same stage as the collection. Ensure that objects belong to the same stage before adding them"
             )
 

lib/mayaUsd/resources/ae/usd-shared-components/src/python/usdSharedComponents/common/filteredStringListView.py

@@ -18,6 +18,7 @@
         QStyleOptionViewItem,
         QStyledItemDelegate,
         QListView,
+        QLabel
     )
 except:
     from PySide2.QtCore import (  # type: ignore
@@ -31,7 +32,7 @@
         Signal,
     )
     from PySide2.QtGui import QPainter, QPaintEvent, QPen, QColor  # type: ignore
-    from PySide2.QtWidgets import QStyleOptionViewItem, QStyledItemDelegate, QListView  # type: ignore
+    from PySide2.QtWidgets import QStyleOptionViewItem, QStyledItemDelegate, QListView, QLabel  # type: ignore
 
 
 kNoObjectFoundLabel = "No objects found"
@@ -81,6 +82,11 @@ def __init__(self, items: Sequence[str] = [], headerTitle: str = "", parent=None
             lambda: self.selectionChanged.emit()
         )
 
+        self.placeholder_label = QLabel("Drag objects here or click “+” to add", self)
+        self.placeholder_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.placeholder_label.setStyleSheet("color: gray; font-size: 18px;")
+        self.placeholder_label.hide()
+
     def drawFrame(self, painter: QPainter):
         pass
 
@@ -118,13 +124,14 @@ def hasSelectedItems(self) -> bool:
     def update_placeholder(self):
         """Show or hide placeholder based on the model's content."""
         model = self.model()
-        # if model and model.rowCount() == 0:
-        #    self.placeholder_label.show()
-        # else:
-        #    self.placeholder_label.hide()
+        if model and model.rowCount() == 0:
+           self.placeholder_label.show()
+           self.placeholder_label.setGeometry(self.viewport().geometry())
+        else:
+           self.placeholder_label.hide()
 
     def resizeEvent(self, event):
         """Ensure placeholder is centered on resize."""
         super().resizeEvent(event)
-        # if self.placeholder_label.isVisible():
-        #    self.placeholder_label.setGeometry(self.viewport().geometry())
+        if self.placeholder_label.isVisible():
+           self.placeholder_label.setGeometry(self.viewport().geometry())