From 19bdbf9aca568110f9cb63f7687c150d737d03e6 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 25 Jan 2025 15:26:25 +0100
Subject: [PATCH] Update build settings margin labels
---
i18n/nw_base.ts | 129 ++++++++++++++++++-----------
novelwriter/core/buildsettings.py | 7 ++
novelwriter/tools/manussettings.py | 16 ++--
3 files changed, 97 insertions(+), 55 deletions(-)
diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts
index eadcf053..fc052990 100644
--- a/i18n/nw_base.ts
+++ b/i18n/nw_base.ts
@@ -178,68 +178,103 @@
Text Margins
+
+
+ Title and Partition
+
+
- Page Layout
+ Heading 1 and Chapter
- Unit
+ Heading 2 and Scene
- Page Size
+ Heading 3 and Section
- Page Margins
+ Heading 4
+
+
+
+
+ Text Paragraph
- Document Style
-
-
-
-
- Page Header
+ Scene Separator
- Page Counter Offset
+ Page Layout
- Add Colours to Headings
+ Unit
- Increase Size of Headings
+ Page Size
- Bold Headings
+ Page Margins
- HTML Options
+ Document Style
- Add CSS Styles
+ Page Header
+ Page Counter Offset
+
+
+
+
+ Add Colours to Headings
+
+
+
+
+ Increase Size of Headings
+
+
+
+
+ Bold Headings
+
+
+
+
+ HTML Options
+
+
+
+
+ Add CSS Styles
+
+
+
+
Preserve Tab Characters
@@ -1363,12 +1398,12 @@
-
+
Class
-
+
Usage
@@ -3739,7 +3774,7 @@
NovelSelector
-
+
All Novel Folders
@@ -4896,121 +4931,121 @@
_TreeContextMenu
-
+
Empty Trash
-
+
Rename
-
+
Duplicate
-
+
Open Document
-
+
View Document
-
+
Create New ...
-
+
Rename to Heading
-
+
Set Active to ...
-
+
Toggle Active
-
+
Set Status to ...
-
-
+
+
Manage Labels ...
-
+
Set Importance to ...
-
+
Transform ...
-
-
-
-
+
+
+
+
Convert to {0}
-
+
Merge Child Items into Self
-
+
Merge Child Items into New
-
+
Merge Documents in Folder
-
+
Split Document by Headings
-
+
Expand All
-
+
Collapse All
-
+
Delete Permanently
-
+
Move to Trash
-
+
Do you want to convert the folder to a {0}? This action cannot be reversed.
@@ -5018,7 +5053,7 @@
_UpdatableMenu
-
+
From Template
diff --git a/novelwriter/core/buildsettings.py b/novelwriter/core/buildsettings.py
index 0d2d3b44..ace47d64 100644
--- a/novelwriter/core/buildsettings.py
+++ b/novelwriter/core/buildsettings.py
@@ -159,6 +159,13 @@ SETTINGS_LABELS = {
"format.indentFirstPar": QT_TRANSLATE_NOOP("Builds", "Indent First Paragraph"),
"format.grpMargins": QT_TRANSLATE_NOOP("Builds", "Text Margins"),
+ "format.titleMargin": QT_TRANSLATE_NOOP("Builds", "Title and Partition"),
+ "format.h1Margin": QT_TRANSLATE_NOOP("Builds", "Heading 1 and Chapter"),
+ "format.h2Margin": QT_TRANSLATE_NOOP("Builds", "Heading 2 and Scene"),
+ "format.h3Margin": QT_TRANSLATE_NOOP("Builds", "Heading 3 and Section"),
+ "format.h4Margin": QT_TRANSLATE_NOOP("Builds", "Heading 4"),
+ "format.textMargin": QT_TRANSLATE_NOOP("Builds", "Text Paragraph"),
+ "format.sepMargin": QT_TRANSLATE_NOOP("Builds", "Scene Separator"),
"format.grpPage": QT_TRANSLATE_NOOP("Builds", "Page Layout"),
"format.pageUnit": QT_TRANSLATE_NOOP("Builds", "Unit"),
diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py
index b0023c67..8c2f96e4 100644
--- a/novelwriter/tools/manussettings.py
+++ b/novelwriter/tools/manussettings.py
@@ -38,7 +38,7 @@ from PyQt5.QtWidgets import (
from novelwriter import CONFIG, SHARED
from novelwriter.common import describeFont, fontMatcher, qtLambda
-from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwStyles, trConst
+from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst
from novelwriter.core.buildsettings import BuildSettings, FilterMode
from novelwriter.extensions.configlayout import (
NColourLabel, NFixedPage, NScrollableForm, NScrollablePage
@@ -1074,7 +1074,7 @@ class _FormattingTab(NScrollableForm):
self.titleMarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["H0"]),
+ self._build.getLabel("format.titleMargin"),
[pixT, self.titleMarginT, 6, pixB, self.titleMarginB],
unit="em",
)
@@ -1087,7 +1087,7 @@ class _FormattingTab(NScrollableForm):
self.h1MarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["H1"]),
+ self._build.getLabel("format.h1Margin"),
[pixT, self.h1MarginT, 6, pixB, self.h1MarginB],
unit="em",
)
@@ -1100,7 +1100,7 @@ class _FormattingTab(NScrollableForm):
self.h2MarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["H2"]),
+ self._build.getLabel("format.h2Margin"),
[pixT, self.h2MarginT, 6, pixB, self.h2MarginB],
unit="em",
)
@@ -1113,7 +1113,7 @@ class _FormattingTab(NScrollableForm):
self.h3MarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["H3"]),
+ self._build.getLabel("format.h3Margin"),
[pixT, self.h3MarginT, 6, pixB, self.h3MarginB],
unit="em",
)
@@ -1126,7 +1126,7 @@ class _FormattingTab(NScrollableForm):
self.h4MarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["H4"]),
+ self._build.getLabel("format.h4Margin"),
[pixT, self.h4MarginT, 6, pixB, self.h4MarginB],
unit="em",
)
@@ -1139,7 +1139,7 @@ class _FormattingTab(NScrollableForm):
self.textMarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["TT"]),
+ self._build.getLabel("format.textMargin"),
[pixT, self.textMarginT, 6, pixB, self.textMarginB],
unit="em",
)
@@ -1152,7 +1152,7 @@ class _FormattingTab(NScrollableForm):
self.sepMarginB.setFixedWidth(dbW)
self.addRow(
- trConst(nwStyles.T_LABEL["SP"]),
+ self._build.getLabel("format.sepMargin"),
[pixT, self.sepMarginT, 6, pixB, self.sepMarginB],
unit="em",
)