novelWriter 2.3rc1__py3-none-any.whl → 2.4b1__py3-none-any.whl

novelwriter/tools/manussettings.py

@@ -37,7 +37,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.constants import nwHeadFmt, nwLabels, trConst
+from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst
 from novelwriter.core.buildsettings import BuildSettings, FilterMode
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NSpinBox
@@ -584,7 +584,8 @@ class _HeadingsTab(NScrollablePage):
     EDIT_CHAPTER = 2
     EDIT_UNNUM   = 3
     EDIT_SCENE   = 4
-    EDIT_SECTION = 5
+    EDIT_HSCENE  = 5
+    EDIT_SECTION = 6
 
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
@@ -593,122 +594,123 @@ class _HeadingsTab(NScrollablePage):
         self._editing = 0
 
         iPx = SHARED.theme.baseIconSize
+        sSp = CONFIG.pxInt(16)
         vSp = CONFIG.pxInt(12)
         bSp = CONFIG.pxInt(6)
 
         # Format Boxes
         # ============
         self.formatBox = QGridLayout()
-        self.formatBox.setHorizontalSpacing(vSp)
+        self.formatBox.setHorizontalSpacing(bSp)
 
         # Title Heading
-        self.lblTitle = QLabel(self._build.getLabel("headings.fmtTitle"))
+        self.lblTitle = QLabel(self._build.getLabel("headings.fmtTitle"), self)
         self.fmtTitle = QLineEdit("", self)
         self.fmtTitle.setReadOnly(True)
         self.btnTitle = QToolButton(self)
         self.btnTitle.setIcon(SHARED.theme.getIcon("edit"))
         self.btnTitle.clicked.connect(lambda: self._editHeading(self.EDIT_TITLE))
+        self.hdeTitle = QLabel(self.tr("Hide"), self)
+        self.hdeTitle.setIndent(bSp)
+        self.swtTitle = NSwitch(self, height=iPx)
 
-        wrapTitle = QHBoxLayout()
-        wrapTitle.addWidget(self.fmtTitle)
-        wrapTitle.addWidget(self.btnTitle)
-        wrapTitle.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblTitle, 0, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapTitle,     0, 1, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblTitle, 0, 0)
+        self.formatBox.addWidget(self.fmtTitle, 0, 1)
+        self.formatBox.addWidget(self.btnTitle, 0, 2)
+        self.formatBox.addWidget(self.hdeTitle, 0, 3)
+        self.formatBox.addWidget(self.swtTitle, 0, 4)
 
         # Chapter Heading
-        self.lblChapter = QLabel(self._build.getLabel("headings.fmtChapter"))
+        self.lblChapter = QLabel(self._build.getLabel("headings.fmtChapter"), self)
         self.fmtChapter = QLineEdit("", self)
         self.fmtChapter.setReadOnly(True)
         self.btnChapter = QToolButton(self)
         self.btnChapter.setIcon(SHARED.theme.getIcon("edit"))
         self.btnChapter.clicked.connect(lambda: self._editHeading(self.EDIT_CHAPTER))
+        self.hdeChapter = QLabel(self.tr("Hide"), self)
+        self.hdeChapter.setIndent(bSp)
+        self.swtChapter = NSwitch(self, height=iPx)
 
-        wrapChapter = QHBoxLayout()
-        wrapChapter.addWidget(self.fmtChapter)
-        wrapChapter.addWidget(self.btnChapter)
-        wrapChapter.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblChapter, 1, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapChapter,     1, 1, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblChapter, 1, 0)
+        self.formatBox.addWidget(self.fmtChapter, 1, 1)
+        self.formatBox.addWidget(self.btnChapter, 1, 2)
+        self.formatBox.addWidget(self.hdeChapter, 1, 3)
+        self.formatBox.addWidget(self.swtChapter, 1, 4)
 
         # Unnumbered Chapter Heading
-        self.lblUnnumbered = QLabel(self._build.getLabel("headings.fmtUnnumbered"))
+        self.lblUnnumbered = QLabel(self._build.getLabel("headings.fmtUnnumbered"), self)
         self.fmtUnnumbered = QLineEdit("", self)
         self.fmtUnnumbered.setReadOnly(True)
         self.btnUnnumbered = QToolButton(self)
         self.btnUnnumbered.setIcon(SHARED.theme.getIcon("edit"))
         self.btnUnnumbered.clicked.connect(lambda: self._editHeading(self.EDIT_UNNUM))
+        self.hdeUnnumbered = QLabel(self.tr("Hide"), self)
+        self.hdeUnnumbered.setIndent(bSp)
+        self.swtUnnumbered = NSwitch(self, height=iPx)
 
-        wrapUnnumbered = QHBoxLayout()
-        wrapUnnumbered.addWidget(self.fmtUnnumbered)
-        wrapUnnumbered.addWidget(self.btnUnnumbered)
-        wrapUnnumbered.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblUnnumbered, 2, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapUnnumbered,     2, 1, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblUnnumbered, 2, 0)
+        self.formatBox.addWidget(self.fmtUnnumbered, 2, 1)
+        self.formatBox.addWidget(self.btnUnnumbered, 2, 2)
+        self.formatBox.addWidget(self.hdeUnnumbered, 2, 3)
+        self.formatBox.addWidget(self.swtUnnumbered, 2, 4)
 
         # Scene Heading
-        sceneHideTip = self._build.getLabel("headings.hideScene")
-        self.lblScene = QLabel(self._build.getLabel("headings.fmtScene"))
+        self.lblScene = QLabel(self._build.getLabel("headings.fmtScene"), self)
         self.fmtScene = QLineEdit("", self)
         self.fmtScene.setReadOnly(True)
         self.btnScene = QToolButton(self)
         self.btnScene.setIcon(SHARED.theme.getIcon("edit"))
         self.btnScene.clicked.connect(lambda: self._editHeading(self.EDIT_SCENE))
-        self.hdeScene = QLabel(self.tr("Hide"))
-        self.hdeScene.setToolTip(sceneHideTip)
+        self.hdeScene = QLabel(self.tr("Hide"), self)
+        self.hdeScene.setIndent(bSp)
         self.swtScene = NSwitch(self, height=iPx)
-        self.swtScene.setToolTip(sceneHideTip)
-
-        wrapScene = QHBoxLayout()
-        wrapScene.addWidget(self.fmtScene)
-        wrapScene.addWidget(self.btnScene)
-        wrapScene.setSpacing(bSp)
-
-        wrapSceneHide = QHBoxLayout()
-        wrapSceneHide.addWidget(self.hdeScene)
-        wrapSceneHide.addWidget(self.swtScene)
-        wrapSceneHide.setSpacing(bSp)
 
-        self.formatBox.addWidget(self.lblScene, 3, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapScene,     3, 1, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapSceneHide, 3, 2, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblScene, 3, 0)
+        self.formatBox.addWidget(self.fmtScene, 3, 1)
+        self.formatBox.addWidget(self.btnScene, 3, 2)
+        self.formatBox.addWidget(self.hdeScene, 3, 3)
+        self.formatBox.addWidget(self.swtScene, 3, 4)
+
+        # Alt Scene Heading
+        self.lblHScene = QLabel(self._build.getLabel("headings.fmtHardScene"), self)
+        self.fmtHScene = QLineEdit("", self)
+        self.fmtHScene.setReadOnly(True)
+        self.btnHScene = QToolButton(self)
+        self.btnHScene.setIcon(SHARED.theme.getIcon("edit"))
+        self.btnHScene.clicked.connect(lambda: self._editHeading(self.EDIT_HSCENE))
+        self.hdeHScene = QLabel(self.tr("Hide"), self)
+        self.hdeHScene.setIndent(bSp)
+        self.swtHScene = NSwitch(self, height=iPx)
+
+        self.formatBox.addWidget(self.lblHScene, 4, 0)
+        self.formatBox.addWidget(self.fmtHScene, 4, 1)
+        self.formatBox.addWidget(self.btnHScene, 4, 2)
+        self.formatBox.addWidget(self.hdeHScene, 4, 3)
+        self.formatBox.addWidget(self.swtHScene, 4, 4)
 
         # Section Heading
-        sectionHideTip = self._build.getLabel("headings.hideSection")
-        self.lblSection = QLabel(self._build.getLabel("headings.fmtSection"))
+        self.lblSection = QLabel(self._build.getLabel("headings.fmtSection"), self)
         self.fmtSection = QLineEdit("", self)
         self.fmtSection.setReadOnly(True)
         self.btnSection = QToolButton(self)
         self.btnSection.setIcon(SHARED.theme.getIcon("edit"))
         self.btnSection.clicked.connect(lambda: self._editHeading(self.EDIT_SECTION))
-        self.hdeSection = QLabel(self.tr("Hide"))
-        self.hdeSection.setToolTip(sectionHideTip)
+        self.hdeSection = QLabel(self.tr("Hide"), self)
+        self.hdeSection.setIndent(bSp)
         self.swtSection = NSwitch(self, height=iPx)
-        self.swtSection.setToolTip(sectionHideTip)
 
-        wrapSection = QHBoxLayout()
-        wrapSection.addWidget(self.fmtSection)
-        wrapSection.addWidget(self.btnSection)
-        wrapSection.setSpacing(bSp)
-
-        wrapSectionHide = QHBoxLayout()
-        wrapSectionHide.addWidget(self.hdeSection)
-        wrapSectionHide.addWidget(self.swtSection)
-        wrapSectionHide.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblSection, 4, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapSection,     4, 1, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapSectionHide, 4, 2, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblSection, 5, 0)
+        self.formatBox.addWidget(self.fmtSection, 5, 1)
+        self.formatBox.addWidget(self.btnSection, 5, 2)
+        self.formatBox.addWidget(self.hdeSection, 5, 3)
+        self.formatBox.addWidget(self.swtSection, 5, 4)
 
         # Edit Form
         # =========
 
         self.lblEditForm = QLabel(self.tr("Editing: {0}").format(self.tr("None")))
 
-        self.editTextBox = QPlainTextEdit()
+        self.editTextBox = QPlainTextEdit(self)
         self.editTextBox.setFixedHeight(5*iPx)
         self.editTextBox.setEnabled(False)
 
@@ -735,10 +737,10 @@ class _HeadingsTab(NScrollablePage):
         self.aInsCharPOV.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.CHAR_POV))
         self.aInsCharFocus.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.CHAR_FOCUS))
 
-        self.btnInsert = QPushButton(self.tr("Insert"))
+        self.btnInsert = QPushButton(self.tr("Insert"), self)
         self.btnInsert.setMenu(self.menuInsert)
 
-        self.btnApply = QPushButton(self.tr("Apply"))
+        self.btnApply = QPushButton(self.tr("Apply"), self)
         self.btnApply.clicked.connect(self._saveFormat)
 
         self.formButtonBox = QHBoxLayout()
@@ -751,13 +753,72 @@ class _HeadingsTab(NScrollablePage):
         self.editFormBox.addWidget(self.editTextBox)
         self.editFormBox.addLayout(self.formButtonBox)
 
+        # Layout Matrix
+        # =============
+        self.layoutMatrix = QGridLayout()
+        self.layoutMatrix.setVerticalSpacing(vSp)
+        self.layoutMatrix.setHorizontalSpacing(vSp)
+
+        # Heading
+        self.layoutHeading = QLabel("<b>{0}</b>".format(self.tr("Additional Styling")), self)
+        self.layoutMatrix.addWidget(self.layoutHeading, 0, 0, 1, 5)
+
+        # Title Layout
+        self.mtxTitle = QLabel(self._build.getLabel("headings.fmtTitle"))
+        self.centerTitle = NSwitch(self, height=iPx)
+        self.breakTitle = NSwitch(self, height=iPx)
+        lblCenterT = QLabel(self.tr("Centre"))
+        lblCenterT.setIndent(sSp)
+        lblBreakT = QLabel(self.tr("Page Break"))
+        lblBreakT.setIndent(sSp)
+
+        self.layoutMatrix.addWidget(self.mtxTitle,    1, 0)
+        self.layoutMatrix.addWidget(lblCenterT,       1, 1)
+        self.layoutMatrix.addWidget(self.centerTitle, 1, 2)
+        self.layoutMatrix.addWidget(lblBreakT,        1, 3)
+        self.layoutMatrix.addWidget(self.breakTitle,  1, 4)
+
+        # Chapter Layout
+        self.mtxChapter = QLabel(self._build.getLabel("headings.fmtChapter"))
+        self.centerChapter = NSwitch(self, height=iPx)
+        self.breakChapter = NSwitch(self, height=iPx)
+        lblCenterC = QLabel(self.tr("Centre"))
+        lblCenterC.setIndent(sSp)
+        lblBreakC = QLabel(self.tr("Page Break"))
+        lblBreakC.setIndent(sSp)
+
+        self.layoutMatrix.addWidget(self.mtxChapter,    2, 0)
+        self.layoutMatrix.addWidget(lblCenterC,         2, 1)
+        self.layoutMatrix.addWidget(self.centerChapter, 2, 2)
+        self.layoutMatrix.addWidget(lblBreakC,          2, 3)
+        self.layoutMatrix.addWidget(self.breakChapter,  2, 4)
+
+        # Scene Layout
+        self.mtxScene = QLabel(self._build.getLabel("headings.fmtScene"))
+        self.centerScene = NSwitch(self, height=iPx)
+        self.breakScene = NSwitch(self, height=iPx)
+        lblCenterS = QLabel(self.tr("Centre"))
+        lblCenterS.setIndent(sSp)
+        lblBreakS = QLabel(self.tr("Page Break"))
+        lblBreakS.setIndent(sSp)
+
+        self.layoutMatrix.addWidget(self.mtxScene,    3, 0)
+        self.layoutMatrix.addWidget(lblCenterS,       3, 1)
+        self.layoutMatrix.addWidget(self.centerScene, 3, 2)
+        self.layoutMatrix.addWidget(lblBreakS,        3, 3)
+        self.layoutMatrix.addWidget(self.breakScene,  3, 4)
+
+        self.layoutMatrix.setColumnStretch(5, 1)
+
         # Assemble
         # ========
 
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.formatBox)
-        self.outerBox.addSpacing(CONFIG.pxInt(16))
+        self.outerBox.addSpacing(sSp)
         self.outerBox.addLayout(self.editFormBox)
+        self.outerBox.addSpacing(sSp)
+        self.outerBox.addLayout(self.layoutMatrix)
         self.outerBox.addStretch(1)
 
         self.setCentralLayout(self.outerBox)
@@ -770,15 +831,39 @@ class _HeadingsTab(NScrollablePage):
         self.fmtChapter.setText(self._build.getStr("headings.fmtChapter"))
         self.fmtUnnumbered.setText(self._build.getStr("headings.fmtUnnumbered"))
         self.fmtScene.setText(self._build.getStr("headings.fmtScene"))
+        self.fmtHScene.setText(self._build.getStr("headings.fmtHardScene"))
         self.fmtSection.setText(self._build.getStr("headings.fmtSection"))
+
+        self.swtTitle.setChecked(self._build.getBool("headings.hideTitle"))
+        self.swtChapter.setChecked(self._build.getBool("headings.hideChapter"))
+        self.swtUnnumbered.setChecked(self._build.getBool("headings.hideUnnumbered"))
         self.swtScene.setChecked(self._build.getBool("headings.hideScene"))
+        self.swtHScene.setChecked(self._build.getBool("headings.hideHardScene"))
         self.swtSection.setChecked(self._build.getBool("headings.hideSection"))
+
+        self.centerTitle.setChecked(self._build.getBool("headings.centerTitle"))
+        self.centerChapter.setChecked(self._build.getBool("headings.centerChapter"))
+        self.centerScene.setChecked(self._build.getBool("headings.centerScene"))
+        self.breakTitle.setChecked(self._build.getBool("headings.breakTitle"))
+        self.breakChapter.setChecked(self._build.getBool("headings.breakChapter"))
+        self.breakScene.setChecked(self._build.getBool("headings.breakScene"))
         return
 
     def saveContent(self) -> None:
         """Save choices back into build object."""
+        self._build.setValue("headings.hideTitle", self.swtTitle.isChecked())
+        self._build.setValue("headings.hideChapter", self.swtChapter.isChecked())
+        self._build.setValue("headings.hideUnnumbered", self.swtUnnumbered.isChecked())
         self._build.setValue("headings.hideScene", self.swtScene.isChecked())
+        self._build.setValue("headings.hideHardScene", self.swtHScene.isChecked())
         self._build.setValue("headings.hideSection", self.swtSection.isChecked())
+
+        self._build.setValue("headings.centerTitle", self.centerTitle.isChecked())
+        self._build.setValue("headings.centerChapter", self.centerChapter.isChecked())
+        self._build.setValue("headings.centerScene", self.centerScene.isChecked())
+        self._build.setValue("headings.breakTitle", self.breakTitle.isChecked())
+        self._build.setValue("headings.breakChapter", self.breakChapter.isChecked())
+        self._build.setValue("headings.breakScene", self.breakScene.isChecked())
         return
 
     ##
@@ -809,6 +894,9 @@ class _HeadingsTab(NScrollablePage):
         elif heading == self.EDIT_SCENE:
             text = self.fmtScene.text()
             label = self._build.getLabel("headings.fmtScene")
+        elif heading == self.EDIT_HSCENE:
+            text = self.fmtHScene.text()
+            label = self._build.getLabel("headings.fmtHardScene")
         elif heading == self.EDIT_SECTION:
             text = self.fmtSection.text()
             label = self._build.getLabel("headings.fmtSection")
@@ -844,6 +932,9 @@ class _HeadingsTab(NScrollablePage):
         elif heading == self.EDIT_SCENE:
             self.fmtScene.setText(text)
             self._build.setValue("headings.fmtScene", text)
+        elif heading == self.EDIT_HSCENE:
+            self.fmtHScene.setText(text)
+            self._build.setValue("headings.fmtHardScene", text)
         elif heading == self.EDIT_SECTION:
             self.fmtSection.setText(text)
             self._build.setValue("headings.fmtSection", text)
@@ -894,16 +985,32 @@ class _ContentTab(NScrollableForm):
         iPx = SHARED.theme.baseIconSize
 
         # Text Content
+        self.incBodyText = NSwitch(self, height=iPx)
         self.incSynopsis = NSwitch(self, height=iPx)
         self.incComments = NSwitch(self, height=iPx)
         self.incKeywords = NSwitch(self, height=iPx)
-        self.incBodyText = NSwitch(self, height=iPx)
+
+        self.ignoredKeywords = QLineEdit(self)
+
+        self.mnKeywords = QMenu(self)
+        for keyword in nwKeyWords.VALID_KEYS:
+            self.mnKeywords.addAction(
+                trConst(nwLabels.KEY_NAME[keyword]),
+                lambda keyword=keyword: self._updateIgnoredKeywords(keyword)
+            )
+
+        self.ignoredKeywordsButton = QToolButton(self)
+        self.ignoredKeywordsButton.setIcon(SHARED.theme.getIcon("add"))
+        self.ignoredKeywordsButton.setMenu(self.mnKeywords)
+        self.ignoredKeywordsButton.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         self.addGroupLabel(self._build.getLabel("text.grpContent"))
+        self.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
         self.addRow(self._build.getLabel("text.includeSynopsis"), self.incSynopsis)
         self.addRow(self._build.getLabel("text.includeComments"), self.incComments)
         self.addRow(self._build.getLabel("text.includeKeywords"), self.incKeywords)
-        self.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
+        self.addRow(self._build.getLabel("text.ignoredKeywords"), self.ignoredKeywords,
+                    button=self.ignoredKeywordsButton, stretch=(1, 1))
 
         # Insert Content
         self.addNoteHead = NSwitch(self, height=iPx)
@@ -918,22 +1025,39 @@ class _ContentTab(NScrollableForm):
 
     def loadContent(self) -> None:
         """Populate the widgets."""
+        self.incBodyText.setChecked(self._build.getBool("text.includeBodyText"))
         self.incSynopsis.setChecked(self._build.getBool("text.includeSynopsis"))
         self.incComments.setChecked(self._build.getBool("text.includeComments"))
         self.incKeywords.setChecked(self._build.getBool("text.includeKeywords"))
-        self.incBodyText.setChecked(self._build.getBool("text.includeBodyText"))
+        self.ignoredKeywords.setText(self._build.getStr("text.ignoredKeywords"))
         self.addNoteHead.setChecked(self._build.getBool("text.addNoteHeadings"))
+        self._updateIgnoredKeywords()
         return
 
     def saveContent(self) -> None:
         """Save choices back into build object."""
+        self._updateIgnoredKeywords()
+        self._build.setValue("text.includeBodyText", self.incBodyText.isChecked())
         self._build.setValue("text.includeSynopsis", self.incSynopsis.isChecked())
         self._build.setValue("text.includeComments", self.incComments.isChecked())
         self._build.setValue("text.includeKeywords", self.incKeywords.isChecked())
-        self._build.setValue("text.includeBodyText", self.incBodyText.isChecked())
+        self._build.setValue("text.ignoredKeywords", self.ignoredKeywords.text())
         self._build.setValue("text.addNoteHeadings", self.addNoteHead.isChecked())
         return
 
+    ##
+    #  Internal Functions
+    ##
+
+    def _updateIgnoredKeywords(self, keyword: str | None = None) -> None:
+        """Update the ignored keywords list."""
+        current = [x.lower().strip() for x in self.ignoredKeywords.text().split(",")]
+        if keyword:
+            current.append(keyword)
+        verified = set(x for x in current if x in nwKeyWords.VALID_KEYS)
+        self.ignoredKeywords.setText(", ".join(verified))
+        return
+
 # END Class _ContentTab
 
 
@@ -1239,12 +1363,24 @@ class _OutputTab(NScrollableForm):
         self.odtPageCountOffset.setMinimumWidth(spW)
         self.addRow(self._build.getLabel("odt.pageCountOffset"), self.odtPageCountOffset)
 
+        self.odtFirstLineIndent = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("odt.firstLineIndent"), self.odtFirstLineIndent)
+
         # HTML Document
         self.addGroupLabel(self._build.getLabel("html"))
 
         self.htmlAddStyles = NSwitch(self, height=iPx)
         self.addRow(self._build.getLabel("html.addStyles"), self.htmlAddStyles)
 
+        self.htmlPreserveTabs = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("html.preserveTabs"), self.htmlPreserveTabs)
+
+        # Markdown Document
+        self.addGroupLabel(self._build.getLabel("md"))
+
+        self.mdPreserveBreaks = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("md.preserveBreaks"), self.mdPreserveBreaks)
+
         # Finalise
         self.finalise()
 
@@ -1255,7 +1391,10 @@ class _OutputTab(NScrollableForm):
         self.odtAddColours.setChecked(self._build.getBool("odt.addColours"))
         self.odtPageHeader.setText(self._build.getStr("odt.pageHeader"))
         self.odtPageCountOffset.setValue(self._build.getInt("odt.pageCountOffset"))
+        self.odtFirstLineIndent.setChecked(self._build.getBool("odt.firstLineIndent"))
         self.htmlAddStyles.setChecked(self._build.getBool("html.addStyles"))
+        self.htmlPreserveTabs.setChecked(self._build.getBool("html.preserveTabs"))
+        self.mdPreserveBreaks.setChecked(self._build.getBool("md.preserveBreaks"))
         return
 
     def saveContent(self) -> None:
@@ -1263,7 +1402,10 @@ class _OutputTab(NScrollableForm):
         self._build.setValue("odt.addColours", self.odtAddColours.isChecked())
         self._build.setValue("odt.pageHeader", self.odtPageHeader.text())
         self._build.setValue("odt.pageCountOffset", self.odtPageCountOffset.value())
+        self._build.setValue("odt.firstLineIndent", self.odtFirstLineIndent.isChecked())
         self._build.setValue("html.addStyles", self.htmlAddStyles.isChecked())
+        self._build.setValue("html.preserveTabs", self.htmlPreserveTabs.isChecked())
+        self._build.setValue("md.preserveBreaks", self.mdPreserveBreaks.isChecked())
         return
 
     ##
@@ -1273,6 +1415,7 @@ class _OutputTab(NScrollableForm):
     def _resetPageHeader(self) -> None:
         """Reset the ODT header format to default."""
         self.odtPageHeader.setText(nwHeadFmt.ODT_AUTO)
+        self.odtPageHeader.setCursorPosition(0)
         return
 
 # END Class _OutputTab

novelwriter/tools/noveldetails.py

@@ -216,7 +216,7 @@ class _OverviewPage(NScrollablePage):
         self.projForm.addRow("<b>{0}</b>".format(self.tr("Editing Time")), self.projEditTime)
         self.projForm.addRow("<b>{0}</b>".format(self.tr("Word Count")), self.projWords)
         self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Novels")), self.projNovels)
-        self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Notes ")), self.projNotes)
+        self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Notes")), self.projNotes)
         self.projForm.setContentsMargins(mPx, 0, 0, 0)
         self.projForm.setHorizontalSpacing(hPx)
         self.projForm.setVerticalSpacing(vPx)

novelwriter/tools/welcome.py

@@ -45,6 +45,7 @@ from novelwriter.enum import nwItemClass
 from novelwriter.common import formatInt, makeFileNameSafe
 from novelwriter.constants import nwFiles
 from novelwriter.core.coretools import ProjectBuilder
+from novelwriter.extensions.configlayout import NWrappedWidgetBox
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.modified import NSpinBox
 from novelwriter.extensions.versioninfo import VersionInfoWidget
@@ -455,7 +456,7 @@ class _ProjectListModel(QAbstractListModel):
         opened = self.tr("Last Opened")
         records = sorted(CONFIG.recentProjects.listEntries(), key=lambda x: x[3], reverse=True)
         for path, title, count, time in records:
-            when = datetime.fromtimestamp(time).strftime("%x")
+            when = CONFIG.localDate(datetime.fromtimestamp(time))
             data.append((title, path, f"{opened}: {when}, {words}: {formatInt(count)}"))
         self._data = data
         return
@@ -630,20 +631,18 @@ class _NewProjectForm(QWidget):
         self.numChapters.setValue(5)
         self.numChapters.setToolTip(self.tr("Set to 0 to only add scenes"))
 
-        self.chapterBox = QHBoxLayout()
-        self.chapterBox.addWidget(QLabel(self.tr("Add")))
-        self.chapterBox.addWidget(self.numChapters)
-        self.chapterBox.addWidget(QLabel(self.tr("chapter documents")))
+        self.chapterBox = NWrappedWidgetBox(
+            self.tr("Add {0} chapter documents"), self.numChapters
+        )
         self.chapterBox.addStretch(1)
 
         self.numScenes = NSpinBox(self)
         self.numScenes.setRange(0, 200)
         self.numScenes.setValue(5)
 
-        self.sceneBox = QHBoxLayout()
-        self.sceneBox.addWidget(QLabel(self.tr("Add")))
-        self.sceneBox.addWidget(self.numScenes)
-        self.sceneBox.addWidget(QLabel(self.tr("scene documents (to each chapter)")))
+        self.sceneBox = NWrappedWidgetBox(
+            self.tr("Add {0} scene documents (to each chapter)"), self.numScenes
+        )
         self.sceneBox.addStretch(1)
 
         self.novelForm = QVBoxLayout()

novelWriter-2.3rc1.dist-info/entry_points.txt

@@ -1,5 +0,0 @@
-[console_script]
-novelwriter-cli = novelwriter:main
-
-[gui_scripts]
-novelwriter = novelwriter:main