Generalise ODT variables to DOC

tests/test_core/test_core_buildsettings.py

@@ -148,7 +148,7 @@ def testCoreBuildSettings_BuildValues():
     build = BuildSettings()
 
     strSetting = "headings.fmtPart"
-    intSetting = "odt.pageCountOffset"
+    intSetting = "doc.pageCountOffset"
     boolSetting = "filter.includeNovel"
     floatSetting = "format.lineHeight"
 

tests/test_core/test_core_docbuild.py

@@ -66,7 +66,7 @@ BUILD_CONF = {
         "format.stripUnicode": False,
         "format.replaceTabs": True,
         "format.firstLineIndent": True,
-        "odt.colorHeadings": True,
+        "doc.colorHeadings": True,
         "html.addStyles": True,
     },
     "content": {

tests/test_formats/test_fmt_todocx.py

@@ -497,7 +497,7 @@ def testFmtToDocX_SaveDocument(mockGUI, prjLipsum, fncPath, tstPaths):
     project = NWProject()
     project.openProject(prjLipsum)
 
-    pageHeader = f"Page {nwHeadFmt.ODT_PAGE} - {nwHeadFmt.ODT_PROJECT} ({nwHeadFmt.ODT_AUTHOR})"
+    pageHeader = f"Page {nwHeadFmt.DOC_PAGE} - {nwHeadFmt.DOC_PROJECT} ({nwHeadFmt.DOC_AUTHOR})"
 
     build = BuildSettings()
     build.setValue("filter.includeNovel", True)
@@ -508,7 +508,7 @@ def testFmtToDocX_SaveDocument(mockGUI, prjLipsum, fncPath, tstPaths):
     build.setValue("text.includeKeywords", True)
     build.setValue("format.textFont", "Source Sans Pro,12")
     build.setValue("format.firstLineIndent", True)
-    build.setValue("odt.pageHeader", pageHeader)
+    build.setValue("doc.pageHeader", pageHeader)
 
     docBuild = NWBuildDocument(project, build)
     docBuild.queueAll()

tests/test_formats/test_fmt_toodt.py

@@ -772,8 +772,8 @@ def testFmtToOdt_SaveFlat(mockGUI, fncPath, tstPaths):
     assert odt._dLanguage == ""
     odt.setLanguage("nb_NO")
     assert odt._dLanguage == "nb"
-    odt.setHeaderFormat(nwHeadFmt.ODT_AUTO, 1)
-    assert odt._headerFormat == nwHeadFmt.ODT_AUTO
+    odt.setHeaderFormat(nwHeadFmt.DOC_AUTO, 1)
+    assert odt._headerFormat == nwHeadFmt.DOC_AUTO
     odt.setFirstLineIndent(True, 1.4, False)
     assert odt._firstIndent is True
     assert odt._fTextIndent == "0.499cm"
@@ -822,7 +822,7 @@ def testFmtToOdt_SaveFull(mockGUI, fncPath, tstPaths):
     odt._isNovel = True
 
     # Set a format without page number
-    odt.setHeaderFormat(f"{nwHeadFmt.ODT_PROJECT} - {nwHeadFmt.ODT_AUTHOR}", 0)
+    odt.setHeaderFormat(f"{nwHeadFmt.DOC_PROJECT} - {nwHeadFmt.DOC_AUTHOR}", 0)
 
     odt._text = (
         "## Chapter One\n\n"

tests/test_tools/test_tools_manussettings.py

@@ -707,11 +707,11 @@ def testToolBuildSettings_FormatOutput(qtbot, nwGUI):
     """Test the format-specific settings."""
     build = BuildSettings()
 
-    build.setValue("odt.pageHeader", nwHeadFmt.ODT_AUTO)
-    build.setValue("odt.pageCountOffset", 0)
-    build.setValue("odt.colorHeadings", True)
-    build.setValue("odt.scaleHeadings", True)
-    build.setValue("odt.boldHeadings", True)
+    build.setValue("doc.pageHeader", nwHeadFmt.DOC_AUTO)
+    build.setValue("doc.pageCountOffset", 0)
+    build.setValue("doc.colorHeadings", True)
+    build.setValue("doc.scaleHeadings", True)
+    build.setValue("doc.boldHeadings", True)
 
     build.setValue("html.addStyles", False)
     build.setValue("html.preserveTabs", False)
@@ -726,7 +726,7 @@ def testToolBuildSettings_FormatOutput(qtbot, nwGUI):
     assert bSettings.toolStack.currentWidget() is fmtTab
 
     # Check initial values
-    assert fmtTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
+    assert fmtTab.odtPageHeader.text() == nwHeadFmt.DOC_AUTO
     assert fmtTab.odtPageCountOffset.value() == 0
     assert fmtTab.colorHeadings.isChecked() is True
     assert fmtTab.scaleHeadings.isChecked() is True
@@ -749,18 +749,18 @@ def testToolBuildSettings_FormatOutput(qtbot, nwGUI):
     # Save values
     fmtTab.saveContent()
 
-    assert build.getStr("odt.pageHeader") == "Stuff"
-    assert build.getInt("odt.pageCountOffset") == 1
-    assert build.getBool("odt.colorHeadings") is False
-    assert build.getBool("odt.scaleHeadings") is False
-    assert build.getBool("odt.boldHeadings") is False
+    assert build.getStr("doc.pageHeader") == "Stuff"
+    assert build.getInt("doc.pageCountOffset") == 1
+    assert build.getBool("doc.colorHeadings") is False
+    assert build.getBool("doc.scaleHeadings") is False
+    assert build.getBool("doc.boldHeadings") is False
 
     assert build.getBool("html.addStyles") is True
     assert build.getBool("html.preserveTabs") is True
 
     # Reset header format
     fmtTab.btnPageHeader.click()
-    assert fmtTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
+    assert fmtTab.odtPageHeader.text() == nwHeadFmt.DOC_AUTO
 
     # Finish
     bSettings._dialogButtonClicked(bSettings.buttonBox.button(QtDialogClose))