Clean up a lot more namespace flags

tests/test_tools/test_tools_manusbuild.py

@@ -27,15 +27,16 @@ from pytestqt.qtbot import QtBot
 
 from tools import buildTestProject
 
-from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QDialogButtonBox, QFileDialog, QListWidgetItem, QMessageBox
+from PyQt5.QtGui import QDesktopServices
+from PyQt5.QtWidgets import QFileDialog, QListWidgetItem, QMessageBox
 
+from novelwriter.constants import nwLabels
+from novelwriter.core.buildsettings import BuildSettings
 from novelwriter.enum import nwBuildFmt
 from novelwriter.guimain import GuiMain
-from novelwriter.constants import nwLabels
 from novelwriter.tools.manusbuild import GuiManuscriptBuild
-from novelwriter.core.buildsettings import BuildSettings
+from novelwriter.types import QtDialogClose
 
 
 @pytest.mark.gui
@@ -94,7 +95,7 @@ def testManuscriptBuild_Main(
         assert (fncPath / "TestBuild").with_suffix(nwLabels.BUILD_EXT[fmt]).exists()
         lastFmt = fmt
 
-    manus._dialogButtonClicked(manus.dlgButtons.button(QDialogButtonBox.Close))
+    manus._dialogButtonClicked(manus.dlgButtons.button(QtDialogClose))
     manus.deleteLater()
 
     assert build.lastBuildName == "TestBuild"
@@ -149,7 +150,7 @@ def testManuscriptBuild_Main(
         assert lastUrl.startswith("file://")
 
     # Finish
-    manus._dialogButtonClicked(manus.dlgButtons.button(QDialogButtonBox.Close))
+    manus._dialogButtonClicked(manus.dlgButtons.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testManuscriptBuild_Main

tests/test_tools/test_tools_manuscript.py

@@ -31,7 +31,7 @@ from tools import C, buildTestProject
 
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtPrintSupport import QPrintPreviewDialog
-from PyQt5.QtWidgets import QAction, QDialogButtonBox, QListWidgetItem
+from PyQt5.QtWidgets import QAction, QListWidgetItem
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.constants import nwHeadFmt
@@ -40,7 +40,7 @@ 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
+from novelwriter.types import QtAlignAbsolute, QtAlignJustify, QtDialogApply, QtDialogSave
 
 
 @pytest.mark.gui
@@ -118,7 +118,7 @@ def testManuscript_Builds(qtbot: QtBot, nwGUI: GuiMain, projPath: Path):
 
     with qtbot.waitSignal(bSettings.newSettingsReady, timeout=5000):
         bSettings.newSettingsReady.connect(_testNewSettingsReady)
-        bSettings.buttonBox.button(QDialogButtonBox.Save).click()
+        bSettings.buttonBox.button(QtDialogSave).click()
 
     assert isinstance(build, BuildSettings)
     assert build.name == "Test Build"
@@ -135,7 +135,7 @@ def testManuscript_Builds(qtbot: QtBot, nwGUI: GuiMain, projPath: Path):
 
     with qtbot.waitSignal(bSettings.newSettingsReady, timeout=5000):
         bSettings.newSettingsReady.connect(_testNewSettingsReady)
-        bSettings.buttonBox.button(QDialogButtonBox.Apply).click()  # Should leave the dialog open
+        bSettings.buttonBox.button(QtDialogApply).click()  # Should leave the dialog open
 
     assert isinstance(build, BuildSettings)
     assert build.name == "Test Build"

tests/test_tools/test_tools_manussettings.py

@@ -29,7 +29,7 @@ from tools import C, buildTestProject
 
 from PyQt5.QtGui import QFont
 from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialogButtonBox, QFontDialog
+from PyQt5.QtWidgets import QFontDialog
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.guimain import GuiMain
@@ -38,6 +38,7 @@ from novelwriter.core.buildsettings import BuildSettings, FilterMode
 from novelwriter.tools.manussettings import (
     GuiBuildSettings, _OutputTab, _FormatTab, _ContentTab, _HeadingsTab, _FilterTab
 )
+from novelwriter.types import QtDialogApply, QtDialogClose, QtDialogSave
 
 
 @pytest.mark.gui
@@ -80,7 +81,7 @@ def testBuildSettings_Init(qtbot: QtBot, nwGUI: GuiMain, projPath: Path, mockRnd
     # Capture Apply button
     with qtbot.waitSignal(bSettings.newSettingsReady, timeout=5000):
         bSettings.newSettingsReady.connect(_testNewSettingsReady)
-        bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Apply))
+        bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogApply))
 
     assert triggered
 
@@ -89,7 +90,7 @@ def testBuildSettings_Init(qtbot: QtBot, nwGUI: GuiMain, projPath: Path, mockRnd
 
     with qtbot.waitSignal(bSettings.newSettingsReady, timeout=5000):
         bSettings.newSettingsReady.connect(_testNewSettingsReady)
-        bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Save))
+        bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogSave))
 
     assert triggered
 
@@ -106,7 +107,7 @@ def testBuildSettings_Init(qtbot: QtBot, nwGUI: GuiMain, projPath: Path, mockRnd
     assert triggered
 
     # Finish
-    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))
+    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testBuildSettings_Init
@@ -312,7 +313,7 @@ def testBuildSettings_Filter(qtbot: QtBot, nwGUI: GuiMain, projPath: Path, mockR
     ]
 
     # Finish
-    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))
+    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testBuildSettings_Filter
@@ -484,7 +485,7 @@ def testBuildSettings_Headings(qtbot: QtBot, nwGUI: GuiMain):
     assert build.getBool("headings.hideSection") is True
 
     # Finish
-    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))
+    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testBuildSettings_Headings
@@ -546,7 +547,7 @@ def testBuildSettings_Content(qtbot: QtBot, nwGUI: GuiMain):
     assert build.getBool("text.addNoteHeadings") is True
 
     # Finish
-    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))
+    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testBuildSettings_Content
@@ -648,7 +649,7 @@ def testBuildSettings_Format(monkeypatch, qtbot: QtBot, nwGUI: GuiMain):
         assert fmtTab.textSize.value() == 10
 
     # Finish
-    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))
+    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testBuildSettings_Format
@@ -707,7 +708,7 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
     assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
 
     # Finish
-    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))
+    bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))
     # qtbot.stop()
 
 # END Test testBuildSettings_Output