Instrumentserver navigation

src/instrumentserver/gui/base_instrument.py

@@ -108,6 +108,7 @@
 
 from instrumentserver import QtCore, QtGui, QtWidgets
 from instrumentserver.gui.shortcuts import KeyboardShortcutManager
+from instrumentserver.gui.undo_commands import ToggleStarTrashCommand
 
 
 class ItemBase(QtGui.QStandardItem):
@@ -534,6 +535,14 @@ class InstrumentTreeViewBase(QtWidgets.QTreeView):
     #: emitted when this item got its star action triggered.
     itemStarToggle = QtCore.Signal(ItemBase)
 
+    #: Signal()
+    #: emitted when the user presses Enter, F2, or Right to enter edit mode on the selected parameter.
+    editCurrentParameter = QtCore.Signal()
+
+    #: Signal()
+    #: emitted when the user presses Delete to clear the selected parameter's value.
+    clearCurrentParameter = QtCore.Signal()
+
     def __init__(
         self,
         model: QtCore.QAbstractItemModel,
@@ -586,6 +595,15 @@ def __init__(
         self.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.onContextMenuRequested)
 
+        for key in ("Return", "Enter", "F2", "Right"):
+            sc = QtWidgets.QShortcut(QtGui.QKeySequence(key), self)
+            sc.setContext(QtCore.Qt.ShortcutContext.WidgetShortcut)
+            sc.activated.connect(self.editCurrentParameter)
+
+        sc = QtWidgets.QShortcut(QtGui.QKeySequence("Backspace"), self)
+        sc.setContext(QtCore.Qt.ShortcutContext.WidgetShortcut)
+        sc.activated.connect(self.clearCurrentParameter)
+
     @QtCore.Slot()
     def fillCollapsedDict(self, parentItem: Optional[ItemBase] = None) -> None:
         """
@@ -749,6 +767,15 @@ def onContextMenuRequested(self, pos: QtCore.QPoint) -> None:
 
             self.contextMenu.exec_(self.mapToGlobal(pos))
 
+    def focusNextPrevChild(self, next: bool) -> bool:
+        current = self.currentIndex()
+        if current.isValid():
+            next_idx = self.indexBelow(current) if next else self.indexAbove(current)
+            if next_idx.isValid():
+                self.setCurrentIndex(next_idx)
+                return True
+        return super().focusNextPrevChild(next)
+
     @QtCore.Slot()
     def onStarActionTrigger(self) -> None:
         self.itemStarToggle.emit(self.lastSelectedItem)
@@ -816,6 +843,8 @@ def __init__(
         self.layout_.addWidget(self.view)
         self.setLayout(self.layout_)
 
+        self.undoStack: Any = None
+
         self.view.expandAll()
 
         if callSignals:
@@ -831,8 +860,12 @@ def connectSignals(self) -> None:
         self.proxyModel.filterIncoming.connect(self.view.fillCollapsedDict)
         self.proxyModel.filterFinished.connect(self.view.restoreCollapsedDict)
 
-        self.view.itemStarToggle.connect(self.model.onItemStarToggle)
-        self.view.itemTrashToggle.connect(self.model.onItemTrashToggle)
+        self.view.itemStarToggle.connect(
+            lambda item: self._toggleStarTrash("star", item)
+        )
+        self.view.itemTrashToggle.connect(
+            lambda item: self._toggleStarTrash("trash", item)
+        )
 
         self.lineEdit.textChanged.connect(self.proxyModel.onTextFilterChange)
 
@@ -928,13 +961,27 @@ def _toggleCurrentItem(self, signal: QtCore.SignalInstance) -> None:
             self.view.lastSelectedItem = item
             signal.emit(item)
 
+    def _toggleStarTrash(self, mode: str, item: Optional["ItemBase"] = None) -> None:
+        if item is None:
+            item = self._getCurrentItem()
+        if item is None:
+            return
+        self.view.lastSelectedItem = item
+        if self.undoStack is not None:
+            cmd = ToggleStarTrashCommand(item, self.model, mode)
+            self.undoStack.push(cmd)
+        if mode == "star":
+            self.model.onItemStarToggle(item)
+        else:
+            self.model.onItemTrashToggle(item)
+
     @QtCore.Slot()
     def _starCurrentItem(self) -> None:
-        self._toggleCurrentItem(self.view.itemStarToggle)
+        self._toggleStarTrash("star")
 
     @QtCore.Slot()
     def _trashCurrentItem(self) -> None:
-        self._toggleCurrentItem(self.view.itemTrashToggle)
+        self._toggleStarTrash("trash")
 
     @QtCore.Slot()
     def _fitCurrentColumn(self) -> None: