replace implemented functions instead of 'html'

This commit is contained in:
Jakub Trllo 2022-07-25 10:53:24 +02:00
parent 5e31967310
commit 307612d868
3 changed files with 7 additions and 7 deletions

View file

@ -1,9 +1,9 @@
import uuid import uuid
import html
from Qt import QtCore, QtGui from Qt import QtCore, QtGui
import pyblish.api import pyblish.api
from openpype.tools.utils.lib import html_escape
from .constants import ( from .constants import (
ITEM_ID_ROLE, ITEM_ID_ROLE,
ITEM_IS_GROUP_ROLE, ITEM_IS_GROUP_ROLE,
@ -46,7 +46,7 @@ class InstancesModel(QtGui.QStandardItemModel):
all_removed = True all_removed = True
for instance_item in instance_items: for instance_item in instance_items:
item = QtGui.QStandardItem(instance_item.label) item = QtGui.QStandardItem(instance_item.label)
instance_label = html.escape(instance_item.label) instance_label = html_escape(instance_item.label)
item.setData(instance_label, ITEM_LABEL_ROLE) item.setData(instance_label, ITEM_LABEL_ROLE)
item.setData(instance_item.errored, ITEM_ERRORED_ROLE) item.setData(instance_item.errored, ITEM_ERRORED_ROLE)
item.setData(instance_item.id, ITEM_ID_ROLE) item.setData(instance_item.id, ITEM_ID_ROLE)

View file

@ -22,13 +22,13 @@ Only one item can be selected at a time.
import re import re
import collections import collections
import html
from Qt import QtWidgets, QtCore from Qt import QtWidgets, QtCore
from openpype.widgets.nice_checkbox import NiceCheckbox from openpype.widgets.nice_checkbox import NiceCheckbox
from openpype.tools.utils import BaseClickableFrame from openpype.tools.utils import BaseClickableFrame
from openpype.tools.utils.lib import html_escape
from .widgets import ( from .widgets import (
AbstractInstanceView, AbstractInstanceView,
ContextWarningLabel, ContextWarningLabel,
@ -308,7 +308,7 @@ class InstanceCardWidget(CardWidget):
self._last_variant = variant self._last_variant = variant
self._last_subset_name = subset_name self._last_subset_name = subset_name
# Make `variant` bold # Make `variant` bold
label = html.escape(self.instance.label) label = html_escape(self.instance.label)
found_parts = set(re.findall(variant, label, re.IGNORECASE)) found_parts = set(re.findall(variant, label, re.IGNORECASE))
if found_parts: if found_parts:
for part in found_parts: for part in found_parts:

View file

@ -23,12 +23,12 @@ selection can be enabled disabled using checkbox or keyboard key presses:
``` ```
""" """
import collections import collections
import html
from Qt import QtWidgets, QtCore, QtGui from Qt import QtWidgets, QtCore, QtGui
from openpype.style import get_objected_colors from openpype.style import get_objected_colors
from openpype.widgets.nice_checkbox import NiceCheckbox from openpype.widgets.nice_checkbox import NiceCheckbox
from openpype.tools.utils.lib import html_escape
from .widgets import AbstractInstanceView from .widgets import AbstractInstanceView
from ..constants import ( from ..constants import (
INSTANCE_ID_ROLE, INSTANCE_ID_ROLE,
@ -114,7 +114,7 @@ class InstanceListItemWidget(QtWidgets.QWidget):
self.instance = instance self.instance = instance
instance_label = html.escape(instance.label) instance_label = html_escape(instance.label)
subset_name_label = QtWidgets.QLabel(instance_label, self) subset_name_label = QtWidgets.QLabel(instance_label, self)
subset_name_label.setObjectName("ListViewSubsetName") subset_name_label.setObjectName("ListViewSubsetName")
@ -181,7 +181,7 @@ class InstanceListItemWidget(QtWidgets.QWidget):
# Check subset name # Check subset name
label = self.instance.label label = self.instance.label
if label != self._instance_label_widget.text(): if label != self._instance_label_widget.text():
self._instance_label_widget.setText(html.escape(label)) self._instance_label_widget.setText(html_escape(label))
# Check active state # Check active state
self.set_active(self.instance["active"]) self.set_active(self.instance["active"])
# Check valid states # Check valid states