Merge pull request #3014 from ales-erjavec/combobox-search-filter

[ENH] Combo Box Search Filter

Author: lanzagar

Orange/widgets/unsupervised/owhierarchicalclustering.py

@@ -11,8 +11,7 @@
 from AnyQt.QtWidgets import (
     QGraphicsWidget, QGraphicsObject, QGraphicsLinearLayout, QGraphicsPathItem,
     QGraphicsScene, QGraphicsView, QGridLayout, QFormLayout, QSizePolicy,
-    QGraphicsSimpleTextItem,
-    QGraphicsLayoutItem, QAction,
+    QGraphicsSimpleTextItem, QGraphicsLayoutItem, QAction, QComboBox
 )
 from AnyQt.QtGui import (
     QTransform, QPainterPath, QPainterPathStroker, QColor, QBrush, QPen,
@@ -32,7 +31,7 @@
     leaves, prune, top_clusters
 
 from Orange.widgets import widget, gui, settings
-from Orange.widgets.utils import colorpalette, itemmodels
+from Orange.widgets.utils import colorpalette, itemmodels, combobox
 from Orange.widgets.utils.annotated_data import (create_annotated_table,
                                                  ANNOTATED_DATA_SIGNAL_NAME)
 from Orange.widgets.widget import Input, Output, Msg
@@ -825,9 +824,18 @@ def __init__(self):
 
         model = itemmodels.VariableListModel()
         model[:] = self.basic_annotations
-        self.label_cb = gui.comboBox(
-            self.controlArea, self, "annotation", box="Annotation",
-            model=model, callback=self._update_labels, contentsLength=12)
+
+        box = gui.widgetBox(self.controlArea, "Annotations")
+        self.label_cb = combobox.ComboBoxSearch(
+            minimumContentsLength=14,
+            sizeAdjustPolicy=QComboBox.AdjustToMinimumContentsLengthWithIcon
+        )
+        box.layout().addWidget(self.label_cb)
+        self.label_cb.activated[int].connect(
+            lambda idx: setattr(self, "annotation", model[idx])
+        )
+        self.label_cb.activated.connect(self._update_labels)
+        self.label_cb.setModel(model)
 
         box = gui.radioButtons(
             self.controlArea, self, "pruning", box="Pruning",
@@ -1052,6 +1060,7 @@ def _set_items(self, items, axis=1):
             else:
                 self.annotation = "Enumeration"
             self.openContext(items.domain)
+            self.label_cb.setCurrentIndex(model.indexOf(self.annotation))
         else:
             name_option = bool(
                 items is not None and (
@@ -1711,7 +1720,7 @@ def clusters_at_height(root, height):
     return cluster_list
 
 
-def main(argv=None):
+def main(argv=None):  # pragma: no cover
     from AnyQt.QtWidgets import QApplication
     import sip
     import Orange.distance as distance
@@ -1737,12 +1746,13 @@ def main(argv=None):
     rval = app.exec_()
     w.set_distances(None)
     w.handleNewSignals()
-
+    w.saveSettings()
     w.onDeleteWidget()
     sip.delete(w)
     del w
     app.processEvents()
     return rval
 
-if __name__ == "__main__":
+
+if __name__ == "__main__":  # pragma: no cover
     sys.exit(main())