use class attributes from classes instead of objects

This commit is contained in:
Jakub Trllo 2022-12-21 15:19:40 +01:00
parent 8277adc7df
commit 8e19d0957d
12 changed files with 59 additions and 30 deletions

View file

@ -156,8 +156,10 @@ class SyncProjectListWidget(QtWidgets.QWidget):
if selected_index and \
selected_index.isValid() and \
not self._selection_changed:
mode = QtCore.QItemSelectionModel.Select | \
QtCore.QItemSelectionModel.Rows
mode = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
self.project_list.selectionModel().select(selected_index, mode)
if self.current_project:
@ -271,8 +273,10 @@ class _SyncRepresentationWidget(QtWidgets.QWidget):
for selected_id in self._selected_ids:
index = self.model.get_index(selected_id)
if index and index.isValid():
mode = QtCore.QItemSelectionModel.Select | \
QtCore.QItemSelectionModel.Rows
mode = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
self.selection_model.select(index, mode)
existing_ids.add(selected_id)

View file

@ -40,7 +40,7 @@ class ProjectIconView(QtWidgets.QListView):
# Workaround for scrolling being super slow or fast when
# toggling between the two visual modes
self.setVerticalScrollMode(self.ScrollPerPixel)
self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
self.setObjectName("IconView")
self._mode = None

View file

@ -80,7 +80,7 @@ class PluginLoadReportWidget(QtWidgets.QWidget):
view.setTextElideMode(QtCore.Qt.ElideLeft)
view.setHeaderHidden(True)
view.setAlternatingRowColors(True)
view.setVerticalScrollMode(view.ScrollPerPixel)
view.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
model = PluginLoadReportModel()
view.setModel(model)

View file

@ -1031,17 +1031,20 @@ class InstanceListView(AbstractInstanceView):
selection_model.setCurrentIndex(
first_index,
selection_model.ClearAndSelect | selection_model.Rows
QtCore.QItemSelectionModel.ClearAndSelect
| QtCore.QItemSelectionModel.Rows
)
for index in select_indexes:
proxy_index = proxy_model.mapFromSource(index)
selection_model.select(
proxy_index,
selection_model.Select | selection_model.Rows
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
selection_model.setCurrentIndex(
last_index,
selection_model.Select | selection_model.Rows
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)

View file

@ -412,7 +412,8 @@ class AssetsField(BaseClickableFrame):
icon_btn
):
size_policy = widget.sizePolicy()
size_policy.setVerticalPolicy(size_policy.MinimumExpanding)
size_policy.setVerticalPolicy(
QtWidgets.QSizePolicy.MinimumExpanding)
widget.setSizePolicy(size_policy)
name_input.clicked.connect(self._mouse_release_callback)
icon_btn.clicked.connect(self._mouse_release_callback)
@ -595,7 +596,8 @@ class TasksCombobox(QtWidgets.QComboBox):
# Make sure combobox is extended horizontally
size_policy = self.sizePolicy()
size_policy.setHorizontalPolicy(size_policy.MinimumExpanding)
size_policy.setHorizontalPolicy(
QtWidgets.QSizePolicy.MinimumExpanding)
self.setSizePolicy(size_policy)
def set_invalid_empty_task(self, invalid=True):

View file

@ -24,7 +24,7 @@ class OverviewView(QtWidgets.QTreeView):
self.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
self.setItemsExpandable(True)
self.setVerticalScrollMode(QtWidgets.QTreeView.ScrollPerPixel)
self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
self.setHeaderHidden(True)
self.setRootIsDecorated(False)
self.setIndentation(0)
@ -248,7 +248,7 @@ class TerminalView(QtWidgets.QTreeView):
self.setAutoScroll(False)
self.setHeaderHidden(True)
self.setIndentation(0)
self.setVerticalScrollMode(QtWidgets.QTreeView.ScrollPerPixel)
self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
self.verticalScrollBar().setSingleStep(10)
self.setRootIsDecorated(False)

View file

@ -546,9 +546,9 @@ class SceneInventoryView(QtWidgets.QTreeView):
selection_model = self.selectionModel()
select_mode = {
"select": selection_model.Select,
"deselect": selection_model.Deselect,
"toggle": selection_model.Toggle,
"select": QtCore.QItemSelectionModel.Select,
"deselect": QtCore.QItemSelectionModel.Deselect,
"toggle": QtCore.QItemSelectionModel.Toggle,
}[options.get("mode", "select")]
for index in iter_model_rows(model, 0):
@ -559,7 +559,7 @@ class SceneInventoryView(QtWidgets.QTreeView):
name = item.get("objectName")
if name in object_names:
self.scrollTo(index) # Ensure item is visible
flags = select_mode | selection_model.Rows
flags = select_mode | QtCore.QItemSelectionModel.Rows
selection_model.select(index, flags)
object_names.remove(name)

View file

@ -339,7 +339,7 @@ class BreadcrumbsButton(QtWidgets.QToolButton):
# fixed size breadcrumbs
self.setMinimumSize(self.minimumSizeHint())
size_policy = self.sizePolicy()
size_policy.setVerticalPolicy(size_policy.Minimum)
size_policy.setVerticalPolicy(QtWidgets.QSizePolicy.Minimum)
self.setSizePolicy(size_policy)
menu.triggered.connect(self._on_menu_click)
@ -369,7 +369,7 @@ class BreadcrumbsAddressBar(QtWidgets.QFrame):
super(BreadcrumbsAddressBar, self).__init__(parent)
self.setAutoFillBackground(True)
self.setFrameShape(self.StyledPanel)
self.setFrameShape(QtWidgets.QFrame.StyledPanel)
# Edit presented path textually
proxy_model = BreadcrumbsProxy()

View file

@ -86,7 +86,10 @@ def preserve_selection(tree_view,
model = tree_view.model()
selection_model = tree_view.selectionModel()
flags = selection_model.Select | selection_model.Rows
flags = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
if current_index:
current_index_value = tree_view.currentIndex().data(role)
@ -410,7 +413,10 @@ class AssetWidget(QtWidgets.QWidget):
selection_model.clearSelection()
# Select
mode = selection_model.Select | selection_model.Rows
mode = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
for index in _iter_model_rows(
self.proxy, column=0, include_root=False
):

View file

@ -60,7 +60,7 @@ class AssetsView(TreeViewSpinner, DeselectableTreeView):
self._flick_charm_activated = True
self._before_flick_scroll_mode = self.verticalScrollMode()
self._flick_charm.activateOn(self)
self.setVerticalScrollMode(self.ScrollPerPixel)
self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
def deactivate_flick_charm(self):
if not self._flick_charm_activated:
@ -623,7 +623,8 @@ class AssetsWidget(QtWidgets.QWidget):
filter_input,
):
size_policy = widget.sizePolicy()
size_policy.setVerticalPolicy(size_policy.MinimumExpanding)
size_policy.setVerticalPolicy(
QtWidgets.QSizePolicy.MinimumExpanding)
widget.setSizePolicy(size_policy)
# Layout
@ -778,7 +779,10 @@ class AssetsWidget(QtWidgets.QWidget):
selection_model = self._view.selectionModel()
selection_model.clearSelection()
mode = selection_model.Select | selection_model.Rows
mode = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
for index in valid_indexes:
self._view.expand(self._proxy.parent(index))
selection_model.select(index, mode)

View file

@ -79,11 +79,15 @@ def paint_image_with_color(image, color):
pixmap.fill(QtCore.Qt.transparent)
painter = QtGui.QPainter(pixmap)
painter.setRenderHints(
painter.Antialiasing
| painter.SmoothPixmapTransform
| painter.HighQualityAntialiasing
render_hints = (
QtGui.QPainter.Antialiasing
| QtGui.QPainter.SmoothPixmapTransform
)
# Deprecated since 5.14
if hasattr(QtGui.QPainter, "HighQualityAntialiasing"):
render_hints |= QtGui.QPainter.HighQualityAntialiasing
painter.setRenderHints(render_hints)
painter.setClipRegion(alpha_region)
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(color)
@ -329,7 +333,10 @@ def preserve_selection(tree_view, column=0, role=None, current_index=True):
role = QtCore.Qt.DisplayRole
model = tree_view.model()
selection_model = tree_view.selectionModel()
flags = selection_model.Select | selection_model.Rows
flags = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
if current_index:
current_index_value = tree_view.currentIndex().data(role)

View file

@ -257,7 +257,10 @@ class TasksWidget(QtWidgets.QWidget):
selection_model.clearSelection()
# Select the task
mode = selection_model.Select | selection_model.Rows
mode = (
QtCore.QItemSelectionModel.Select
| QtCore.QItemSelectionModel.Rows
)
for row in range(task_view_model.rowCount()):
index = task_view_model.index(row, 0)
name = index.data(TASK_NAME_ROLE)