Merge branch 'bugfix/new_publisher_minor_fixes' into feature/OP-3445_tray-publisher-editorial

openpype/lib/applications.py

@@ -665,7 +665,11 @@ class ApplicationExecutable:
             if os.path.exists(plist_filepath):
                 import plistlib
 
-                parsed_plist = plistlib.readPlist(plist_filepath)
+                if hasattr(plistlib, "load"):
+                    with open(plist_filepath, "rb") as stream:
+                        parsed_plist = plistlib.load(stream)
+                else:
+                    parsed_plist = plistlib.readPlist(plist_filepath)
                 executable_filename = parsed_plist.get("CFBundleExecutable")
 
             if executable_filename:

openpype/tools/publisher/widgets/card_view_widgets.py

@@ -98,6 +98,7 @@ class GroupWidget(QtWidgets.QWidget):
             instances(list<CreatedInstance>): List of instances in
                 CreateContext.
         """
+    
         # Store instances by id and by subset name
         instances_by_id = {}
         instances_by_subset_name = collections.defaultdict(list)
@@ -142,6 +143,7 @@ class GroupWidget(QtWidgets.QWidget):
 
 class CardWidget(BaseClickableFrame):
     """Clickable card used as bigger button."""
+
     selected = QtCore.Signal(str, str)
     # Group identifier of card
     # - this must be set because if send when mouse is released with card id
@@ -178,6 +180,7 @@ class ContextCardWidget(CardWidget):
 
     Is not visually under group widget and is always at the top of card view.
     """
+
     def __init__(self, parent):
         super(ContextCardWidget, self).__init__(parent)
 
@@ -204,13 +207,14 @@ class ContextCardWidget(CardWidget):
 
 class InstanceCardWidget(CardWidget):
     """Card widget representing instance."""
+
     active_changed = QtCore.Signal()
 
     def __init__(self, instance, group_icon, parent):
         super(InstanceCardWidget, self).__init__(parent)
 
         self._id = instance.id
-        self._group_identifier = instance.creator_label
+        self._group_identifier = instance.group_label
         self._group_icon = group_icon
 
         self.instance = instance

openpype/widgets/attribute_defs/widgets.py

@@ -374,6 +374,10 @@ class EnumAttrWidget(_BaseAttrDefWidget):
         combo_delegate = QtWidgets.QStyledItemDelegate(input_widget)
         input_widget.setItemDelegate(combo_delegate)
 
+        line_edit = QtWidgets.QLineEdit(input_widget)
+        line_edit.setReadOnly(True)
+        input_widget.setLineEdit(line_edit)
+
         if self.attr_def.tooltip:
             input_widget.setToolTip(self.attr_def.tooltip)
 
@@ -408,7 +412,8 @@ class EnumAttrWidget(_BaseAttrDefWidget):
                 self._input_widget.setCurrentIndex(idx)
 
         else:
-            self._input_widget.lineEdit().setText("Multiselection")
+            line_edit = self._input_widget.lineEdit()
+            line_edit.setText("Multiselection")
 
 
 class UnknownAttrWidget(_BaseAttrDefWidget):