support new method for regex filtering

This commit is contained in:
Jakub Trllo 2022-12-21 15:19:57 +01:00
parent 8e19d0957d
commit 7cd57e051a
3 changed files with 17 additions and 4 deletions

View file

@ -264,8 +264,8 @@ class SubsetWidget(QtWidgets.QWidget):
group_checkbox.stateChanged.connect(self.set_grouping)
subset_filter.textChanged.connect(proxy.setFilterRegExp)
subset_filter.textChanged.connect(view.expandAll)
subset_filter.textChanged.connect(self._subset_changed)
model.refreshed.connect(self.refreshed)
self.proxy = proxy
@ -293,6 +293,13 @@ class SubsetWidget(QtWidgets.QWidget):
current_index=False):
self.model.set_grouping(state)
def _subset_changed(self, text):
if hasattr(self.proxy, "setFilterRegularExpression"):
self.proxy.setFilterRegularExpression(text)
else:
self.proxy.setFilterRegExp(text)
self.view.expandAll()
def set_loading_state(self, loading, empty):
view = self.view

View file

@ -160,7 +160,10 @@ class SceneInventoryWindow(QtWidgets.QDialog):
self._model.set_hierarchy_view(enabled)
def _on_text_filter_change(self, text_filter):
self._proxy.setFilterRegExp(text_filter)
if hasattr(self._proxy, "setFilterRegularExpression"):
self._proxy.setFilterRegularExpression(text_filter)
else:
self._proxy.setFilterRegExp(text_filter)
def _on_outdated_state_change(self):
self._proxy.set_filter_outdated(

View file

@ -106,7 +106,10 @@ class SearchEntitiesDialog(QtWidgets.QDialog):
def _on_filter_timer(self):
text = self._filter_edit.text()
self._proxy.setFilterRegExp(text)
if hasattr(self._proxy, "setFilterRegularExpression"):
self._proxy.setFilterRegularExpression(text)
else:
self._proxy.setFilterRegExp(text)
# WARNING This expanding and resizing is relatively slow.
self._view.expandAll()