From 3ac669d9a54da86151e8ac13f72ac49f93740f64 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 24 Nov 2021 21:10:14 +0100 Subject: [PATCH] moved task roles to tasks_widget as it's only place where are used --- openpype/tools/utils/constants.py | 4 ---- openpype/tools/utils/models.py | 5 +---- openpype/tools/utils/tasks_widget.py | 10 +++++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/openpype/tools/utils/constants.py b/openpype/tools/utils/constants.py index 33bdf43c08..8f12c57321 100644 --- a/openpype/tools/utils/constants.py +++ b/openpype/tools/utils/constants.py @@ -5,10 +5,6 @@ DEFAULT_PROJECT_LABEL = "< Default >" PROJECT_NAME_ROLE = QtCore.Qt.UserRole + 101 PROJECT_IS_ACTIVE_ROLE = QtCore.Qt.UserRole + 102 -TASK_NAME_ROLE = QtCore.Qt.UserRole + 301 -TASK_TYPE_ROLE = QtCore.Qt.UserRole + 302 -TASK_ORDER_ROLE = QtCore.Qt.UserRole + 303 - LOCAL_PROVIDER_ROLE = QtCore.Qt.UserRole + 500 # provider of active site REMOTE_PROVIDER_ROLE = QtCore.Qt.UserRole + 501 # provider of remote site LOCAL_PROGRESS_ROLE = QtCore.Qt.UserRole + 502 # percentage downld on active diff --git a/openpype/tools/utils/models.py b/openpype/tools/utils/models.py index 819eda00b4..ffcdc7a820 100644 --- a/openpype/tools/utils/models.py +++ b/openpype/tools/utils/models.py @@ -11,10 +11,7 @@ from . import lib from .constants import ( PROJECT_IS_ACTIVE_ROLE, PROJECT_NAME_ROLE, - DEFAULT_PROJECT_LABEL, - TASK_ORDER_ROLE, - TASK_TYPE_ROLE, - TASK_NAME_ROLE + DEFAULT_PROJECT_LABEL ) log = logging.getLogger(__name__) diff --git a/openpype/tools/utils/tasks_widget.py b/openpype/tools/utils/tasks_widget.py index 513402b455..419e77c780 100644 --- a/openpype/tools/utils/tasks_widget.py +++ b/openpype/tools/utils/tasks_widget.py @@ -4,11 +4,11 @@ from avalon import style from avalon.vendor import qtawesome from .views import DeselectableTreeView -from .constants import ( - TASK_ORDER_ROLE, - TASK_TYPE_ROLE, - TASK_NAME_ROLE -) + + +TASK_NAME_ROLE = QtCore.Qt.UserRole + 1 +TASK_TYPE_ROLE = QtCore.Qt.UserRole + 2 +TASK_ORDER_ROLE = QtCore.Qt.UserRole + 3 class TasksModel(QtGui.QStandardItemModel):