Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Simplify the ODT header format" (#1758)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-03-17 10:42:27 +01:00
parent 439938ba58
commit cdb84851b2
9 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/reference/coreToOdt_SaveFlat_document.fodt
+1 -1
View File
@@ -76,7 +76,7 @@
<office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="PM1">
<style:header>
<text:p text:style-name="Header"><text:page-number text:page-adjust="-1">2</text:page-number></text:p>
<text:p text:style-name="Header">Test Project / Jane Smith / <text:page-number text:page-adjust="-1">2</text:page-number></text:p>
</style:header>
<style:header-first>
<text:p text:style-name="Header" />
tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
+1 -1
View File
@@ -100,7 +100,7 @@
<office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="PM1">
<style:header>
<text:p text:style-name="Header"><text:page-number text:select-page="current">2</text:page-number></text:p>
<text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number></text:p>
</style:header>
<style:header-first>
<text:p text:style-name="Header" />
tests/test_core/test_core_toodt.py
+3 -3
View File
@@ -693,8 +693,8 @@ def testCoreToOdt_SaveFlat(mockGUI, fncPath, tstPaths):
assert odt._dLanguage == "nb"
odt.setColourHeaders(True)
assert odt._colourHead is True
odt.setHeaderFormat(nwHeadFmt.ODT_PAGE, 1)
assert odt._headerFormat == nwHeadFmt.ODT_PAGE
odt.setHeaderFormat(nwHeadFmt.ODT_AUTO, 1)
assert odt._headerFormat == nwHeadFmt.ODT_AUTO
odt.setPageLayout(148, 210, 20, 18, 17, 15)
assert odt._mDocWidth == "14.800cm"
@@ -741,7 +741,7 @@ def testCoreToOdt_SaveFull(mockGUI, fncPath, tstPaths):
odt._isNovel = True
# Set a format without page number
odt.setHeaderFormat("Test Project - Jane Smith", 0)
odt.setHeaderFormat(f"{nwHeadFmt.ODT_PROJECT} - {nwHeadFmt.ODT_AUTHOR}", 0)
odt._text = (
"## Chapter One\n\n"
tests/test_tools/test_tools_manussettings.py
+3 -4
View File
@@ -649,7 +649,7 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
# Check initial values
assert outTab.odtAddColours.isChecked() is False
assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_PAGE
assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
assert outTab.htmlAddStyles.isChecked() is False
# Toggle all
@@ -663,13 +663,12 @@ def testBuildSettings_Output(qtbot: QtBot, nwGUI: GuiMain):
outTab.saveContent()
assert build.getBool("odt.addColours") is True
assert build.getStr("odt.pageHeaderText") == "Stuff"
assert build.getStr("odt.pageHeader") == "Stuff"
assert build.getBool("html.addStyles") is True
# Reset header format
SHARED.project.data.setName("Test Project")
outTab.btnPageHeader.click()
assert outTab.odtPageHeader.text() == f"Test Project / {nwHeadFmt.ODT_PAGE}"
assert outTab.odtPageHeader.text() == nwHeadFmt.ODT_AUTO
# Finish
bSettings._dialogButtonClicked(bSettings.buttonBox.button(QDialogButtonBox.Close))