Collect all alignment flags into a new types module

tests/test_gui/test_gui_doceditor.py

@@ -30,13 +30,14 @@ from PyQt5.QtCore import QThreadPool, Qt
 from PyQt5.QtWidgets import QAction, QMenu, qApp
 
 from novelwriter import CONFIG, SHARED
+from novelwriter.constants import nwKeyWords, nwUnicode
+from novelwriter.dialogs.editlabel import GuiEditLabel
 from novelwriter.enum import (
     nwDocAction, nwDocInsert, nwItemClass, nwItemLayout, nwTrinary, nwWidget
 )
-from novelwriter.constants import nwKeyWords, nwUnicode
 from novelwriter.gui.doceditor import GuiDocEditor, GuiDocToolBar
 from novelwriter.text.counting import standardCounter
-from novelwriter.dialogs.editlabel import GuiEditLabel
+from novelwriter.types import QtAlignJustify, QtAlignLeft
 
 KEY_DELAY = 1
 
@@ -53,7 +54,7 @@ def testGuiEditor_Init(qtbot, nwGUI, projPath, ipsumText, mockRnd):
 
     # Check Defaults
     qDoc = nwGUI.docEditor.document()
-    assert qDoc.defaultTextOption().alignment() == Qt.AlignLeft
+    assert qDoc.defaultTextOption().alignment() == QtAlignLeft
     assert nwGUI.docEditor.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
     assert nwGUI.docEditor.horizontalScrollBarPolicy() == Qt.ScrollBarAsNeeded
     assert nwGUI.docEditor._typPadChar == nwUnicode.U_NBSP
@@ -76,7 +77,7 @@ def testGuiEditor_Init(qtbot, nwGUI, projPath, ipsumText, mockRnd):
 
     qDoc = nwGUI.docEditor.document()
     assert CONFIG.textFont == qDoc.defaultFont().family()
-    assert qDoc.defaultTextOption().alignment() == Qt.AlignJustify
+    assert qDoc.defaultTextOption().alignment() == QtAlignJustify
     assert qDoc.defaultTextOption().flags() & QTextOption.ShowTabsAndSpaces
     assert qDoc.defaultTextOption().flags() & QTextOption.ShowLineAndParagraphSeparators
     assert nwGUI.docEditor.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff

tests/test_tools/test_tools_manuscript.py

@@ -20,26 +20,27 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import sys
 import pytest
+import sys
 
 from pathlib import Path
 from pytestqt.qtbot import QtBot
 
-from novelwriter.constants import nwHeadFmt
-from tools import C, buildTestProject
 from mocked import causeOSError
+from tools import C, buildTestProject
 
-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import QAction, QDialogButtonBox, QListWidgetItem
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtPrintSupport import QPrintPreviewDialog
+from PyQt5.QtWidgets import QAction, QDialogButtonBox, QListWidgetItem
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.guimain import GuiMain
+from novelwriter.constants import nwHeadFmt
 from novelwriter.core.buildsettings import BuildSettings
-from novelwriter.tools.manuscript import GuiManuscript
+from novelwriter.guimain import GuiMain
 from novelwriter.tools.manusbuild import GuiManuscriptBuild
+from novelwriter.tools.manuscript import GuiManuscript
 from novelwriter.tools.manussettings import GuiBuildSettings
+from novelwriter.types import QtAlignAbsolute, QtAlignJustify
 
 
 @pytest.mark.gui
@@ -262,11 +263,11 @@ def testManuscript_Features(monkeypatch, qtbot, nwGUI, projPath, mockRnd):
     assert manus.docStats.maxTotalChars.text() == "117"
 
     # Toggle justify
-    assert manus.docPreview.document().defaultTextOption().alignment() == Qt.AlignAbsolute
+    assert manus.docPreview.document().defaultTextOption().alignment() == QtAlignAbsolute
     manus.docPreview.setJustify(True)
-    assert manus.docPreview.document().defaultTextOption().alignment() == Qt.AlignJustify
+    assert manus.docPreview.document().defaultTextOption().alignment() == QtAlignJustify
     manus.docPreview.setJustify(False)
-    assert manus.docPreview.document().defaultTextOption().alignment() == Qt.AlignAbsolute
+    assert manus.docPreview.document().defaultTextOption().alignment() == QtAlignAbsolute
 
     # Tests are too fast to trigger this one, so we trigger it manually to ensure it isn't failing
     manus.docPreview._hideProgress()