Merge branch 'develop' into enhancement/bump-required-launcher

Author: iLLiCiTiT

client/ayon_core/style/style.css

@@ -490,6 +490,10 @@ QListView::item {
     height: 1.0em;
 }
 
+QTreeView::item:!enabled {
+    background: {color:bg-view};
+}
+
 QAbstractItemView:disabled{
     background: {color:bg-view-disabled};
     alternate-background-color: {color:bg-view-alternate-disabled};

client/ayon_core/tools/common_models/projects.py

@@ -360,7 +360,7 @@ def get_project_entity(self, project_name):
         if not project_cache.is_valid:
             entity = None
             if project_name:
-                entity = ayon_api.get_project(project_name)
+                entity = ayon_api.get_rest_project(project_name)
             project_cache.update_data(entity)
         return project_cache.get_data()
 

client/ayon_core/tools/loader/ui/folders_widget.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-import qtpy
 from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core.style import get_objected_colors
@@ -13,11 +12,6 @@
 )
 from ayon_core.tools.utils.folders_widget import FOLDER_ID_ROLE
 
-if qtpy.API == "pyside":
-    from PySide.QtGui import QStyleOptionViewItemV4
-elif qtpy.API == "pyqt4":
-    from PyQt4.QtGui import QStyleOptionViewItemV4
-
 UNDERLINE_COLORS_ROLE = QtCore.Qt.UserRole + 50
 
 
@@ -47,9 +41,6 @@ def sizeHint(self, option, index):
 
     def paint(self, painter, option, index):
         """Replicate painting of an item and draw color bars if needed."""
-        # Qt4 compat
-        if qtpy.API in ("pyside", "pyqt4"):
-            option = QStyleOptionViewItemV4(option)
 
         painter.save()
 

client/ayon_core/tools/loader/ui/products_widget.py

@@ -196,7 +196,7 @@ def __init__(self, controller, parent):
         products_view.setSelectionMode(
             QtWidgets.QAbstractItemView.ExtendedSelection
         )
-        products_view.setAllColumnsShowFocus(True)
+        products_view.setAllColumnsShowFocus(False)
         # TODO - add context menu
         products_view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         products_view.setSortingEnabled(True)

client/ayon_core/tools/utils/models.py

@@ -1,7 +1,6 @@
 import re
 import logging
 
-import qtpy
 from qtpy import QtCore
 
 log = logging.getLogger(__name__)
@@ -62,11 +61,7 @@ def setData(self, index, value, role=QtCore.Qt.EditRole):
                 key = self.Columns[column]
                 item[key] = value
 
-                # passing `list()` for PyQt5 (see PYSIDE-462)
-                if qtpy.API in ("pyqt4", "pyside"):
-                    self.dataChanged.emit(index, index)
-                else:
-                    self.dataChanged.emit(index, index, [role])
+                self.dataChanged.emit(index, index, [role])
 
                 # must return true if successful
                 return True