Apply open document shortcuts to the tree that has focus (#945)

* Better handling of Enter/Return on GUI trees, resolves #913
* Update test
* Generalise open selected handle functions
* Improve test coverage
* Update docstring

novelwriter/gui/noveltree.py

@@ -135,7 +135,7 @@ class GuiNovelTree(QTreeWidget):
         logger.verbose("Requesting refresh of the novel tree")
         treeChanged = self.theParent.treeView.changedSince(self._lastBuild)
         indexChanged = self.theIndex.novelChangedSince(self._lastBuild)
-        if not (treeChanged or indexChanged):
+        if not (treeChanged or indexChanged or overRide):
             logger.verbose("No changes have been made to the novel index")
             return
 
@@ -175,10 +175,13 @@ class GuiNovelTree(QTreeWidget):
         selected, return the first.
         """
         selItem = self.selectedItems()
+        tHandle = None
+        tLine = 0
         if selItem:
-            return selItem[0].data(self.C_TITLE, Qt.UserRole)[0]
+            tHandle = selItem[0].data(self.C_TITLE, Qt.UserRole)[0]
+            tLine = checkInt(selItem[0].data(self.C_TITLE, Qt.UserRole)[1], 1) - 1
 
-        return None
+        return tHandle, tLine
 
     ##
     #  Events
@@ -201,7 +204,7 @@ class GuiNovelTree(QTreeWidget):
             if not isinstance(selItem, QTreeWidgetItem):
                 return
 
-            tHandle = self.getSelectedHandle()
+            tHandle, _ = self.getSelectedHandle()
             if tHandle is None:
                 return
 
@@ -218,13 +221,8 @@ class GuiNovelTree(QTreeWidget):
         clicked, and send it to the main gui class for opening in the
         document editor.
         """
-        theData = tItem.data(self.C_TITLE, Qt.UserRole)
-        tHandle = theData[0]
-        tLine = checkInt(theData[1], 1)
-
-        logger.verbose("User selected entry with handle '%s' on line %s", tHandle, tLine)
+        tHandle, tLine = self.getSelectedHandle()
         self.theParent.openDocument(tHandle, tLine=tLine-1, doScroll=True)
-
         return
 
     def _itemSelected(self):

novelwriter/gui/outline.py

@@ -34,6 +34,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter.enum import nwItemLayout, nwItemType, nwOutline
+from novelwriter.common import checkInt
 from novelwriter.constants import trConst, nwKeyWords, nwLabels
 
 logger = logging.getLogger(__name__)
@@ -196,6 +197,19 @@ class GuiOutline(QTreeWidget):
         self._firstView = True
         return
 
+    def getSelectedHandle(self):
+        """Get the currently selected handle. If multiple items are
+        selected, return the first.
+        """
+        selItem = self.selectedItems()
+        tHandle = None
+        tLine = 0
+        if selItem:
+            tHandle = selItem[0].data(self._colIdx[nwOutline.TITLE], Qt.UserRole)
+            tLine = checkInt(selItem[0].text(self._colIdx[nwOutline.LINE]), 1) - 1
+
+        return tHandle, tLine
+
     ##
     #  Slots
     ##
@@ -206,15 +220,8 @@ class GuiOutline(QTreeWidget):
         clicked, and send it to the main gui class for opening in the
         document editor.
         """
-        tHandle = tItem.data(self._colIdx[nwOutline.TITLE], Qt.UserRole)
-        try:
-            tLine = int(tItem.text(self._colIdx[nwOutline.LINE]))
-        except Exception:
-            tLine = 1
-
-        logger.verbose("User selected entry with handle '%s' on line %s", tHandle, tLine)
+        tHandle, tLine = self.getSelectedHandle()
         self.theParent.openDocument(tHandle, tLine=tLine-1, doScroll=True)
-
         return
 
     @pyqtSlot()