diff --git a/novelwriter/core/buildsettings.py b/novelwriter/core/buildsettings.py index d033c83f..d38f3347 100644 --- a/novelwriter/core/buildsettings.py +++ b/novelwriter/core/buildsettings.py @@ -102,15 +102,15 @@ SETTINGS_LABELS = { "filter.includeInactive": QT_TRANSLATE_NOOP("Builds", "Inactive Documents"), "headings": QT_TRANSLATE_NOOP("Builds", "Headings"), - "headings.fmtTitle": QT_TRANSLATE_NOOP("Builds", "Title Headings"), - "headings.fmtChapter": QT_TRANSLATE_NOOP("Builds", "Chapter Headings"), - "headings.fmtUnnumbered": QT_TRANSLATE_NOOP("Builds", "Unnumbered Headings"), - "headings.fmtScene": QT_TRANSLATE_NOOP("Builds", "Scene Headings"), - "headings.fmtHardScene": QT_TRANSLATE_NOOP("Builds", "Hard Scene Headings"), - "headings.fmtSection": QT_TRANSLATE_NOOP("Builds", "Section Headings"), - "headings.hideScene": QT_TRANSLATE_NOOP("Builds", "Hide Scene Headings"), - "headings.hideHardScene": QT_TRANSLATE_NOOP("Builds", "Hide Hard Scene Headings"), - "headings.hideSection": QT_TRANSLATE_NOOP("Builds", "Hide Section Headings"), + "headings.fmtTitle": QT_TRANSLATE_NOOP("Builds", "Partition Format"), + "headings.fmtChapter": QT_TRANSLATE_NOOP("Builds", "Chapter Format"), + "headings.fmtUnnumbered": QT_TRANSLATE_NOOP("Builds", "Unnumbered Format"), + "headings.fmtScene": QT_TRANSLATE_NOOP("Builds", "Scene Format"), + "headings.fmtHardScene": QT_TRANSLATE_NOOP("Builds", "Hard Scene Format"), + "headings.fmtSection": QT_TRANSLATE_NOOP("Builds", "Section Format"), + "headings.hideScene": QT_TRANSLATE_NOOP("Builds", "Hide Scene Breaks"), + "headings.hideHardScene": QT_TRANSLATE_NOOP("Builds", "Hide Hard Scene Breaks"), + "headings.hideSection": QT_TRANSLATE_NOOP("Builds", "Hide Section Breaks"), "text.grpContent": QT_TRANSLATE_NOOP("Builds", "Text Content"), "text.includeSynopsis": QT_TRANSLATE_NOOP("Builds", "Include Synopsis"), diff --git a/novelwriter/tools/manuscript.py b/novelwriter/tools/manuscript.py index 7ef2bfa0..aa686d74 100644 --- a/novelwriter/tools/manuscript.py +++ b/novelwriter/tools/manuscript.py @@ -610,16 +610,15 @@ class _DetailsWidget(QWidget): item.setText(0, build.getLabel("headings")) item.setText(1, "") self.listView.addTopLevelItem(item) - entries = [ + for key in [ "headings.fmtTitle", "headings.fmtChapter", "headings.fmtUnnumbered", - "headings.fmtScene", "headings.fmtSection" - ] - for key in entries: + "headings.fmtScene", "headings.fmtHardScene", "headings.fmtSection" + ]: sub = QTreeWidgetItem() sub.setText(0, build.getLabel(key)) sub.setText(1, hFmt.apply(build.getStr(key), title, 0)) item.addChild(sub) - for key in ["headings.hideScene", "headings.hideSection"]: + for key in ["headings.hideScene", "headings.hideHardScene", "headings.hideSection"]: sub = QTreeWidgetItem() sub.setText(0, build.getLabel(key)) sub.setIcon(1, on if build.getBool(key) else off) @@ -630,11 +629,10 @@ class _DetailsWidget(QWidget): item.setText(0, build.getLabel("text.grpContent")) item.setText(1, "") self.listView.addTopLevelItem(item) - entries = [ + for key in [ "text.includeSynopsis", "text.includeComments", "text.includeKeywords", "text.includeBodyText", - ] - for key in entries: + ]: sub = QTreeWidgetItem() sub.setText(0, build.getLabel(key)) sub.setIcon(1, on if build.getBool(key) else off) diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py index a0f9c75d..b298adbd 100644 --- a/novelwriter/tools/manussettings.py +++ b/novelwriter/tools/manussettings.py @@ -604,7 +604,7 @@ class _HeadingsTab(NScrollablePage): self.formatBox.setHorizontalSpacing(vSp) # 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) @@ -620,7 +620,7 @@ class _HeadingsTab(NScrollablePage): self.formatBox.addLayout(wrapTitle, 0, 1) # 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) @@ -636,7 +636,7 @@ class _HeadingsTab(NScrollablePage): self.formatBox.addLayout(wrapChapter, 1, 1) # 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) @@ -653,7 +653,7 @@ class _HeadingsTab(NScrollablePage): # 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) @@ -680,7 +680,7 @@ class _HeadingsTab(NScrollablePage): # Alt Scene Heading hardSceneHideTip = self._build.getLabel("headings.hideHardScene") - self.lblHScene = QLabel(self._build.getLabel("headings.fmtHardScene")) + self.lblHScene = QLabel(self._build.getLabel("headings.fmtHardScene"), self) self.fmtHScene = QLineEdit("", self) self.fmtHScene.setReadOnly(True) self.btnHScene = QToolButton(self) @@ -707,7 +707,7 @@ class _HeadingsTab(NScrollablePage): # 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) diff --git a/tests/test_core/test_core_buildsettings.py b/tests/test_core/test_core_buildsettings.py index 78f09600..bccccae1 100644 --- a/tests/test_core/test_core_buildsettings.py +++ b/tests/test_core/test_core_buildsettings.py @@ -196,8 +196,8 @@ def testCoreBuildSettings_BuildValues(): assert build.getFloat(floatSetting) == 2.5 # Check labels - assert build.getLabel(strSetting) == "Title Headings" - assert BuildSettings.getLabel(strSetting) == "Title Headings" + assert build.getLabel(strSetting) == "Partition Format" + assert BuildSettings.getLabel(strSetting) == "Partition Format" # Pack the values data = build.pack()