Merge pull request #4924 from PrimozGodec/list-view-search

[ENH] Replace listViews with searchable listViews

Author: janezd

Orange/widgets/data/owdiscretize.py

@@ -9,6 +9,7 @@
 )
 from AnyQt.QtGui import QValidator, QPalette
 from AnyQt.QtCore import Qt, QTimer, QPoint
+from orangewidget.utils.listview import ListViewSearch
 
 import Orange.data
 import Orange.preprocess.discretize as disc
@@ -406,7 +407,7 @@ def set_manual_default_cuts():
         )
 
         # List view with all attributes
-        self.varview = QListView(
+        self.varview = ListViewSearch(
             selectionMode=QListView.ExtendedSelection,
             uniformItemSizes=True,
         )

Orange/widgets/data/owimpute.py

@@ -15,6 +15,7 @@
 )
 from AnyQt.QtCore import Qt, QThread, QModelIndex
 from AnyQt.QtCore import pyqtSlot as Slot
+from orangewidget.utils.listview import ListViewSearch
 
 import Orange.data
 from Orange.preprocess import impute
@@ -28,7 +29,6 @@
 from Orange.widgets.widget import OWWidget, Msg, Input, Output
 from Orange.classification import SimpleTreeLearner
 
-
 DisplayMethodRole = Qt.UserRole
 StateRole = DisplayMethodRole + 0xf4
 
@@ -195,7 +195,7 @@ def __init__(self):
         horizontal_layout = QHBoxLayout(box)
         main_layout.addWidget(box)
 
-        self.varview = QListView(
+        self.varview = ListViewSearch(
             selectionMode=QListView.ExtendedSelection,
             uniformItemSizes=True
         )

Orange/widgets/unsupervised/owcorrespondence.py

@@ -6,6 +6,7 @@
 from AnyQt.QtWidgets import QListView, QApplication
 from AnyQt.QtGui import QBrush, QColor, QPainter
 from AnyQt.QtCore import QEvent
+from orangewidget.utils.listview import ListViewSearch
 
 import pyqtgraph as pg
 from Orange.data import Table, Domain, ContinuousVariable, StringVariable
@@ -62,7 +63,7 @@ def __init__(self):
 
         box = gui.vBox(self.controlArea, "Variables")
         self.varlist = itemmodels.VariableListModel()
-        self.varview = view = QListView(
+        self.varview = view = ListViewSearch(
             selectionMode=QListView.MultiSelection,
             uniformItemSizes=True
         )

Orange/widgets/visualize/owboxplot.py

@@ -6,10 +6,11 @@
 from AnyQt.QtWidgets import (
     QGraphicsView, QGraphicsScene, QGraphicsItem, QGraphicsSimpleTextItem,
     QGraphicsTextItem, QGraphicsItemGroup, QGraphicsLineItem,
-    QGraphicsPathItem, QGraphicsRectItem, QSizePolicy,
-    QListView)
+    QGraphicsPathItem, QGraphicsRectItem, QSizePolicy
+)
 from AnyQt.QtGui import QPen, QColor, QBrush, QPainterPath, QPainter, QFont
 from AnyQt.QtCore import Qt, QEvent, QRectF, QSize, QSortFilterProxyModel
+from orangewidget.utils.listview import ListViewSearch
 
 import scipy.special
 from scipy.stats import f_oneway, chi2_contingency
@@ -201,7 +202,7 @@ def __init__(self):
         sorted_model.setSourceModel(self.attrs)
         sorted_model.sort(0)
         box = gui.vBox(self.controlArea, "Variable")
-        view = self.attr_list = QListView()
+        view = self.attr_list = ListViewSearch()
         view.setModel(sorted_model)
         view.setSelectionMode(view.SingleSelection)
         view.selectionModel().selectionChanged.connect(self.attr_changed)
@@ -223,7 +224,7 @@ def __init__(self):
         sorted_model.sort(0)
 
         box = gui.vBox(self.controlArea, "Subgroups")
-        view = self.group_list = QListView()
+        view = self.group_list = ListViewSearch()
         view.setModel(sorted_model)
         view.selectionModel().selectionChanged.connect(self.grouping_changed)
         view.setMinimumSize(QSize(30, 30))

Orange/widgets/visualize/owdistributions.py

@@ -8,6 +8,7 @@
 from AnyQt.QtWidgets import QGraphicsRectItem
 from AnyQt.QtGui import QColor, QPen, QBrush, QPainter, QPalette, QPolygonF
 from AnyQt.QtCore import Qt, QRectF, QPointF, pyqtSignal as Signal
+from orangewidget.utils.listview import ListViewSearch
 import pyqtgraph as pg
 
 from Orange.data import Table, DiscreteVariable, ContinuousVariable, Domain
@@ -319,7 +320,9 @@ def __init__(self):
             self.controlArea, self, "var", box="Variable",
             model=DomainModel(valid_types=DomainModel.PRIMITIVE,
                               separators=False),
-            callback=self._on_var_changed)
+            callback=self._on_var_changed,
+            viewType=ListViewSearch
+        )
         gui.checkBox(
             varview.box, self, "sort_by_freq", "Sort categories by frequency",
             callback=self._on_sort_by_freq, stateWhenDisabled=False)

Orange/widgets/visualize/owlineplot.py

@@ -6,12 +6,13 @@
 
 from AnyQt.QtCore import Qt, QSize, QLineF, pyqtSignal as Signal
 from AnyQt.QtGui import QPainter, QPen, QColor
-from AnyQt.QtWidgets import QApplication, QGraphicsLineItem
+from AnyQt.QtWidgets import QApplication, QGraphicsLineItem, QSizePolicy
 
 import pyqtgraph as pg
 from pyqtgraph.functions import mkPen
 from pyqtgraph.graphicsItems.ViewBox import ViewBox
 
+from orangewidget.utils.listview import ListViewSearch
 from orangewidget.utils.visual_settings_dlg import VisualSettingsDialog
 
 from Orange.data import Table, DiscreteVariable
@@ -676,13 +677,14 @@ def _add_controls(self):
         self.group_view = gui.listView(
             self.controlArea, self, "group_var", box="Group by",
             model=self.group_vars, callback=self.__group_var_changed,
-            sizeHint=QSize(30, 100))
+            sizeHint=QSize(30, 100), viewType=ListViewSearch,
+            sizePolicy=(QSizePolicy.Minimum, QSizePolicy.Expanding)
+        )
         self.group_view.setEnabled(False)
 
         plot_gui = OWPlotGUI(self)
         plot_gui.box_zoom_select(self.controlArea)
 
-        gui.rubber(self.controlArea)
         gui.auto_send(self.controlArea, self, "auto_commit")
 
         self.info.set_input_summary(self.info.NoInput)