From e779375b9b3e61d5d9e1810cdb7ca6f67d1d7f8b Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 22 Sep 2020 16:55:31 +0200 Subject: [PATCH] renamed CheckComboBox to MultiSelectionComboBox --- .../settings/settings/widgets/item_types.py | 4 ++-- .../widgets/multiselection_combobox.py | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pype/tools/settings/settings/widgets/item_types.py b/pype/tools/settings/settings/widgets/item_types.py index 274aeff86a..33585773f9 100644 --- a/pype/tools/settings/settings/widgets/item_types.py +++ b/pype/tools/settings/settings/widgets/item_types.py @@ -9,7 +9,7 @@ from .widgets import ( GridLabelWidget, ComboBox ) -from .multiselection_combobox import CheckComboBox +from .multiselection_combobox import MultiSelectionComboBox from .lib import NOT_SET, METADATA_KEY, TypeToKlass, CHILD_OFFSET from avalon.vendor import qtawesome @@ -864,7 +864,7 @@ class EnumeratorWidget(QtWidgets.QWidget, InputObject): if self.multiselection: placeholder = input_data.get("placeholder") - self.input_field = CheckComboBox( + self.input_field = MultiSelectionComboBox( placeholder=placeholder, parent=self ) else: diff --git a/pype/tools/settings/settings/widgets/multiselection_combobox.py b/pype/tools/settings/settings/widgets/multiselection_combobox.py index 30b0c89d28..d49ebeb45a 100644 --- a/pype/tools/settings/settings/widgets/multiselection_combobox.py +++ b/pype/tools/settings/settings/widgets/multiselection_combobox.py @@ -120,7 +120,7 @@ class ComboMenuDelegate(QtWidgets.QAbstractItemDelegate): return menuoption -class CheckComboBox(QtWidgets.QComboBox): +class MultiSelectionComboBox(QtWidgets.QComboBox): value_changed = QtCore.Signal() ignored_keys = { QtCore.Qt.Key_Up, @@ -141,7 +141,7 @@ class CheckComboBox(QtWidgets.QComboBox): def __init__( self, parent=None, placeholder="", separator=", ", **kwargs ): - super(CheckComboBox, self).__init__(parent=parent, **kwargs) + super(MultiSelectionComboBox, self).__init__(parent=parent, **kwargs) self.setFocusPolicy(QtCore.Qt.StrongFocus) self._popup_is_shown = False @@ -162,7 +162,7 @@ class CheckComboBox(QtWidgets.QComboBox): def mousePressEvent(self, event): """Reimplemented.""" self._popup_is_shown = False - super(CheckComboBox, self).mousePressEvent(event) + super(MultiSelectionComboBox, self).mousePressEvent(event) if self._popup_is_shown: self._initial_mouse_pos = self.mapToGlobal(event.pos()) self._block_mouse_release_timer.start( @@ -173,11 +173,11 @@ class CheckComboBox(QtWidgets.QComboBox): """Reimplemented.""" if event.type() == QtCore.QEvent.StyleChange: self._update_item_delegate() - super(CheckComboBox, self).changeEvent(event) + super(MultiSelectionComboBox, self).changeEvent(event) def showPopup(self): """Reimplemented.""" - super(CheckComboBox, self).showPopup() + super(MultiSelectionComboBox, self).showPopup() view = self.view() view.installEventFilter(self) view.viewport().installEventFilter(self) @@ -189,7 +189,7 @@ class CheckComboBox(QtWidgets.QComboBox): self.view().viewport().removeEventFilter(self) self._popup_is_shown = False self._initial_mouse_pos = None - super(CheckComboBox, self).hidePopup() + super(MultiSelectionComboBox, self).hidePopup() self.view().clearFocus() def eventFilter(self, obj, event): @@ -256,7 +256,7 @@ class CheckComboBox(QtWidgets.QComboBox): return True # TODO: handle QtCore.Qt.Key_Enter, Key_Return? - return super(CheckComboBox, self).eventFilter(obj, event) + return super(MultiSelectionComboBox, self).eventFilter(obj, event) def paintEvent(self, event): """Reimplemented.""" @@ -306,7 +306,7 @@ class CheckComboBox(QtWidgets.QComboBox): ) def resizeEvent(self, *args, **kwargs): - super(CheckComboBox, self).resizeEvent(*args, **kwargs) + super(MultiSelectionComboBox, self).resizeEvent(*args, **kwargs) self.update_size_hint() def update_size_hint(self): @@ -358,7 +358,7 @@ class CheckComboBox(QtWidgets.QComboBox): self.updateGeometry() def sizeHint(self): - value = super(CheckComboBox, self).sizeHint() + value = super(MultiSelectionComboBox, self).sizeHint() lines = len(self.lines) if lines == 0: lines = 1 @@ -411,7 +411,7 @@ class CheckComboBox(QtWidgets.QComboBox): event.ignore() return - return super(CheckComboBox, self).keyPressEvent(event) + return super(MultiSelectionComboBox, self).keyPressEvent(event) def _update_item_delegate(self): opt = QtWidgets.QStyleOptionComboBox()