Update scrollbar enums

tests/test_gui/test_gui_doceditor.py

@@ -34,7 +34,7 @@ from novelwriter.gui.doceditor import GuiDocEditor
 from novelwriter.text.counting import standardCounter
 from novelwriter.types import (
     QtAlignJustify, QtAlignLeft, QtKeepAnchor, QtModCtrl, QtMouseLeft,
-    QtMoveAnchor, QtMoveRight
+    QtMoveAnchor, QtMoveRight, QtScrollAlwaysOff, QtScrollAsNeeded
 )
 
 from tests.mocked import causeOSError
@@ -73,8 +73,8 @@ def testGuiEditor_Init(qtbot, nwGUI, projPath, ipsumText, mockRnd):
     # Check Defaults
     qDoc = docEditor.document()
     assert qDoc.defaultTextOption().alignment() == QtAlignLeft
-    assert docEditor.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
-    assert docEditor.horizontalScrollBarPolicy() == Qt.ScrollBarAsNeeded
+    assert docEditor.verticalScrollBarPolicy() == QtScrollAsNeeded
+    assert docEditor.horizontalScrollBarPolicy() == QtScrollAsNeeded
     assert docEditor._typPadChar == nwUnicode.U_NBSP
     assert docEditor.docHeader.itemTitle.text() == (
         "Novel  \u203a  New Chapter  \u203a  New Scene"
@@ -98,8 +98,8 @@ def testGuiEditor_Init(qtbot, nwGUI, projPath, ipsumText, mockRnd):
     assert qDoc.defaultTextOption().alignment() == QtAlignJustify
     assert qDoc.defaultTextOption().flags() & QTextOption.ShowTabsAndSpaces
     assert qDoc.defaultTextOption().flags() & QTextOption.ShowLineAndParagraphSeparators
-    assert docEditor.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
-    assert docEditor.horizontalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
+    assert docEditor.verticalScrollBarPolicy() == QtScrollAlwaysOff
+    assert docEditor.horizontalScrollBarPolicy() == QtScrollAlwaysOff
     assert docEditor._typPadChar == nwUnicode.U_THNBSP
     assert docEditor.docHeader.itemTitle.text() == "New Scene"
 

tests/test_gui/test_gui_outline.py

@@ -26,11 +26,11 @@ from shutil import copyfile
 
 import pytest
 
-from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QAction, QFileDialog, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.enum import nwItemClass, nwOutline, nwView
+from novelwriter.types import QtScrollAlwaysOff, QtScrollAsNeeded
 
 from tests.tools import buildTestProject, cmpFiles, writeFile
 
@@ -53,18 +53,18 @@ def testGuiOutline_Main(qtbot, monkeypatch, nwGUI, projPath):
     CONFIG.hideVScroll = True
     CONFIG.hideHScroll = True
     outlineView.initSettings()
-    assert outlineTree.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
-    assert outlineTree.horizontalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
-    assert outlineData.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
-    assert outlineData.horizontalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
+    assert outlineTree.verticalScrollBarPolicy() == QtScrollAlwaysOff
+    assert outlineTree.horizontalScrollBarPolicy() == QtScrollAlwaysOff
+    assert outlineData.verticalScrollBarPolicy() == QtScrollAlwaysOff
+    assert outlineData.horizontalScrollBarPolicy() == QtScrollAlwaysOff
 
     CONFIG.hideVScroll = False
     CONFIG.hideHScroll = False
     outlineView.initSettings()
-    assert outlineTree.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
-    assert outlineTree.horizontalScrollBarPolicy() == Qt.ScrollBarAsNeeded
-    assert outlineData.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
-    assert outlineData.horizontalScrollBarPolicy() == Qt.ScrollBarAsNeeded
+    assert outlineTree.verticalScrollBarPolicy() == QtScrollAsNeeded
+    assert outlineTree.horizontalScrollBarPolicy() == QtScrollAsNeeded
+    assert outlineData.verticalScrollBarPolicy() == QtScrollAsNeeded
+    assert outlineData.horizontalScrollBarPolicy() == QtScrollAsNeeded
 
     # Check focus
     with monkeypatch.context() as mp:

tests/test_gui/test_gui_projtree.py

@@ -37,7 +37,10 @@ from novelwriter.dialogs.editlabel import GuiEditLabel
 from novelwriter.enum import nwFocus, nwItemClass, nwItemLayout, nwItemType
 from novelwriter.gui.projtree import GuiProjectTree, GuiProjectView, _TreeContextMenu
 from novelwriter.guimain import GuiMain
-from novelwriter.types import QtAccepted, QtModNone, QtMouseLeft, QtMouseMiddle, QtRejected
+from novelwriter.types import (
+    QtAccepted, QtModNone, QtMouseLeft, QtMouseMiddle, QtRejected,
+    QtScrollAlwaysOff, QtScrollAsNeeded
+)
 
 from tests.mocked import causeOSError
 from tests.tools import C, buildTestProject
@@ -957,14 +960,14 @@ def testGuiProjTree_Other(qtbot, monkeypatch, nwGUI: GuiMain, projPath, mockRnd)
     CONFIG.hideVScroll = True
     CONFIG.hideHScroll = True
     projView.initSettings()
-    assert projTree.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
-    assert projTree.horizontalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
+    assert projTree.verticalScrollBarPolicy() == QtScrollAlwaysOff
+    assert projTree.horizontalScrollBarPolicy() == QtScrollAlwaysOff
 
     CONFIG.hideVScroll = False
     CONFIG.hideHScroll = False
     projView.initSettings()
-    assert projTree.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
-    assert projTree.horizontalScrollBarPolicy() == Qt.ScrollBarAsNeeded
+    assert projTree.verticalScrollBarPolicy() == QtScrollAsNeeded
+    assert projTree.horizontalScrollBarPolicy() == QtScrollAsNeeded
 
     # Method: revealNewTreeItem
     # =========================