Merge branch 'main' into 216-improve-wheel-scrolling-in-node-library

pywr-editor · Feb 17, 2024 · aa6c3a3 · aa6c3a3
2 parents 57263f1 + 6d88951
commit aa6c3a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pywr_editor/dialogs/search/search_dialog.py b/pywr_editor/dialogs/search/search_dialog.py
@@ -46,6 +46,8 @@ def __init__(
         completer.setCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
         completer.setFilterMode(Qt.MatchFlag.MatchContains)
         completer.setModel(model)
+        completer.setMaxVisibleItems(10)
+        completer.popup().setStyleSheet("::item{ padding: 5px }")
         # noinspection PyTypeChecker
         completer.connect(
             completer, SIGNAL("activated(QModelIndex)"), self.open_component
@@ -60,7 +62,10 @@ def __init__(
         line_edit.setStyleSheet("#search_field { font-size: 20px }")
 
         # Description
-        description = QLabel("Start typing to find and open any model components")
+        description = QLabel(
+            "Start typing to find any model components. Click on an item or press ENTER"
+            " to open its configuration"
+        )
         description.setStyleSheet("font-size: 11px; border: 0")
 
         self.setObjectName("search_dialog")

diff --git a/pywr_editor/dialogs/search/search_model.py b/pywr_editor/dialogs/search/search_model.py
@@ -39,7 +39,7 @@ def __init__(self, model_config: ModelConfig):
                         ExtensionIcon(model_config.tables.get_extension(name))
                     ),
                     "comp_type": None,
-                    "type": ItemType.TABLE,
+                    "type": ItemType.TABLE.value,
                 }
             )
         for name in model_config.parameters.names:
@@ -49,7 +49,7 @@ def __init__(self, model_config: ModelConfig):
                     "name": name,
                     "icon": QIcon(ParameterIcon(param_obj.key)),
                     "comp_type": f"{param_obj.humanised_type} - parameter",
-                    "type": ItemType.PARAMETER,
+                    "type": ItemType.PARAMETER.value,
                 }
             )
 
@@ -59,8 +59,8 @@ def __init__(self, model_config: ModelConfig):
                 {
                     "name": name,
                     "icon": QIcon(RecorderIcon(recorder_obj.key)),
-                    "comp_type": f"{recorder_obj.humanised_type} - recorder",  #
-                    "type": ItemType.RECORDER,
+                    "comp_type": f"{recorder_obj.humanised_type} - recorder",
+                    "type": ItemType.RECORDER.value,
                 }
             )
 
@@ -77,7 +77,7 @@ def __init__(self, model_config: ModelConfig):
                     "name": name,
                     "icon": QIcon(icon),
                     "comp_type": node_obj.humanised_type,
-                    "type": ItemType.NODE,
+                    "type": ItemType.NODE.value,
                 }
             )