Update cursor and messagebox enums

novelwriter/shared.py

@@ -441,9 +441,9 @@ class _GuiAlert(QMessageBox):
         Yes/No buttons or just an Ok button.
         """
         if isYesNo:
-            self.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
+            self.setStandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
         else:
-            self.setStandardButtons(QMessageBox.Ok)
+            self.setStandardButtons(QMessageBox.StandardButton.Ok)
         pSz = 2*self._theme.baseIconHeight
         if level == self.INFO:
             self.setIconPixmap(self._theme.getPixmap("alert_info", (pSz, pSz)))

tests/conftest.py

@@ -144,7 +144,7 @@ def projPath(fncPath):
 def mockGUI(qtbot, monkeypatch):
     """Create a mock instance of novelWriter's main GUI class."""
     monkeypatch.setattr(QMessageBox, "exec", lambda *a: None)
-    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.Yes)
+    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.Yes)
     gui = MockGuiMain()
     theme = MockTheme()
     monkeypatch.setattr(SHARED, "_gui", gui)
@@ -156,7 +156,7 @@ def mockGUI(qtbot, monkeypatch):
 def nwGUI(qtbot, monkeypatch, functionFixture):
     """Create an instance of the novelWriter GUI."""
     monkeypatch.setattr(QMessageBox, "exec", lambda *a: None)
-    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.Yes)
+    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.Yes)
 
     nwGUI = main(["--testmode", f"--config={_TMP_CONF}", f"--data={_TMP_CONF}"])
     qtbot.addWidget(nwGUI)

tests/test_base/test_base_shared.py

@@ -126,7 +126,7 @@ def testBaseSharedData_Projects(monkeypatch, caplog, fncPath):
 def testBaseSharedData_Alerts(qtbot, monkeypatch, caplog):
     """Test SharedData class alert helper functions."""
     monkeypatch.setattr(QMessageBox, "exec", lambda *a: None)
-    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.Yes)
+    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.Yes)
 
     shared = SharedData()
 

tests/test_core/test_core_project.py

@@ -271,14 +271,14 @@ def testCoreProject_Open(monkeypatch, caplog, mockGUI, fncPath, mockRnd):
     # Won't convert legacy file
     with monkeypatch.context() as mp:
         mp.setattr(ProjectXMLReader, "state", property(lambda *a: XMLReadState.WAS_LEGACY))
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert project.openProject(fncPath, clearLock=True) is False
         assert "The file format of your project is about to be" in SHARED.lastAlert
 
     # Won't open project from newer version
     with monkeypatch.context() as mp:
         mp.setattr(ProjectXMLReader, "hexVersion", property(lambda *a: 0x99999999))
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert project.openProject(fncPath, clearLock=True) is False
         assert "This project was saved by a newer version" in SHARED.lastAlert
 

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,
-    QtMoveRight
+    QtMoveAnchor, QtMoveRight
 )
 
 from tests.mocked import causeOSError
@@ -989,8 +989,8 @@ def testGuiEditor_TextManipulation(qtbot, nwGUI, projPath, ipsumText, mockRnd):
     # Past Paragraph
     docEditor.replaceText(text)
     cursor = docEditor.textCursor()
-    cursor.setPosition(13, QTextCursor.MoveAnchor)
+    cursor.setPosition(13, QtMoveAnchor)
-    cursor.setPosition(1000, QTextCursor.KeepAnchor)
+    cursor.setPosition(1000, QtKeepAnchor)
     docEditor.setTextCursor(cursor)
     docEditor._wrapSelection("=")
 
@@ -1021,8 +1021,8 @@ def testGuiEditor_TextManipulation(qtbot, nwGUI, projPath, ipsumText, mockRnd):
     # Past Paragraph
     docEditor.replaceText(text)
     cursor = docEditor.textCursor()
-    cursor.setPosition(13, QTextCursor.MoveAnchor)
+    cursor.setPosition(13, QtMoveAnchor)
-    cursor.setPosition(1000, QTextCursor.KeepAnchor)
+    cursor.setPosition(1000, QtKeepAnchor)
     docEditor.setTextCursor(cursor)
     docEditor._toggleFormat(1, "=")
 
@@ -1130,8 +1130,8 @@ def testGuiEditor_TextManipulation(qtbot, nwGUI, projPath, ipsumText, mockRnd):
     text = "### A Scene\n\n%s\n\n%s" % (parOne, parTwo)
     docEditor.replaceText(text)
     cursor = docEditor.textCursor()
-    cursor.setPosition(16, QTextCursor.MoveAnchor)
+    cursor.setPosition(16, QtMoveAnchor)
-    cursor.setPosition(680, QTextCursor.KeepAnchor)
+    cursor.setPosition(680, QtKeepAnchor)
     docEditor.setTextCursor(cursor)
     docEditor._removeInParLineBreaks()
 

tests/test_gui/test_gui_i18n.py

@@ -50,7 +50,7 @@ def testGuiI18n_Localisation(qtbot, monkeypatch, language, nwGUI, projPath):
     """Test loading the gui with a specific language."""
     monkeypatch.setattr(QDialog, "exec", lambda *a: None)
     monkeypatch.setattr(QMessageBox, "exec", lambda *a: None)
-    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.Yes)
+    monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.Yes)
 
     # Set the test language
     CONFIG.guiLocale = language

tests/test_gui/test_gui_mainmenu.py

@@ -29,6 +29,7 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.constants import nwKeyWords, nwUnicode
 from novelwriter.enum import nwDocAction, nwDocInsert
 from novelwriter.gui.doceditor import GuiDocEditor
+from novelwriter.types import QtKeepAnchor, QtMoveRight
 
 from tests.tools import C, buildTestProject, writeFile
 
@@ -301,7 +302,7 @@ def testGuiMainMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
     ))
     cursor = nwGUI.docEditor.textCursor()
     cursor.setPosition(74)
-    cursor.movePosition(QTextCursor.Right, QTextCursor.KeepAnchor, 29)
+    cursor.movePosition(QtMoveRight, QtKeepAnchor, 29)
     nwGUI.docEditor.setTextCursor(cursor)
     nwGUI.mainMenu.aFmtRmBreaks.activate(QAction.ActionEvent.Trigger)
     assert nwGUI.docEditor.getText() == (
@@ -567,7 +568,7 @@ def testGuiMainMenu_Insert(qtbot, monkeypatch, nwGUI, fncPath, projPath, mockRnd
 
     # The document isn't empty, so the message box should pop
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a, **k: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a, **k: QMessageBox.StandardButton.No)
         assert not nwGUI.importDocument()
         assert nwGUI.docEditor.getText() == "Bar"
 

tests/test_gui/test_gui_projtree.py

@@ -411,7 +411,7 @@ def testGuiProjTree_MoveItemToTrash(qtbot, caplog, monkeypatch, nwGUI, projPath,
 
     # User cancels action
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert projTree.moveItemToTrash(C.hTitlePage) is False
         assert project.tree.isTrash(C.hTitlePage) is False
 
@@ -456,7 +456,7 @@ def testGuiProjTree_PermanentlyDeleteItem(qtbot, caplog, monkeypatch, nwGUI, pro
 
     # User cancels action
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert projTree.permDeleteItem(C.hTitlePage) is False
         assert C.hTitlePage in project.tree
 
@@ -506,7 +506,7 @@ def testGuiProjTree_EmptyTrash(qtbot, caplog, monkeypatch, nwGUI, projPath, mock
 
     # User cancels
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert projTree.emptyTrash() is False
         assert C.hTitlePage in project.tree
         assert C.hChapterDir in project.tree
@@ -751,7 +751,7 @@ def testGuiProjTree_Duplicate(qtbot, monkeypatch, nwGUI: GuiMain, projPath, mock
 
     # Duplicate title page, but select no
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert projTree._duplicateFromHandle(C.hTitlePage) is False
         assert len(SHARED.project.tree) == 8
 
@@ -1313,7 +1313,7 @@ def testGuiProjTree_ContextMenu(qtbot, monkeypatch, nwGUI, projPath, mockRnd):
 
     # Click no on the dialog
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         ctxMenu._covertFolderToFile(nwItemLayout.DOCUMENT)
         assert SHARED.project.tree[hNewFolderOne].isFolderType()  # type: ignore
 

tests/test_tools/test_tools_manusbuild.py

@@ -133,7 +133,7 @@ def testToolManuscriptBuild_Main(
     manus.buildPath.setText(str(fncPath))
     manus.buildName.setText("TestBuild")
     with monkeypatch.context() as mp:
-        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.No)
+        mp.setattr(QMessageBox, "result", lambda *a: QMessageBox.StandardButton.No)
         assert manus._runBuild() is False
 
     # Test that the open button works