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

Merge release 2.6 into main

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-01-26 20:50:58 +01:00
parent 9e2310fdf3 448057edf6
commit c1b35b6672
69 changed files with 2442 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/tools/manussettings.py
+8 -8
View File
@@ -38,7 +38,7 @@ from PyQt6.QtWidgets import (
from novelwriter import CONFIG, SHARED
from novelwriter.common import describeFont, fontMatcher, qtAddAction, 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 (
NColorLabel, NFixedPage, NScrollableForm, NScrollablePage
@@ -1065,7 +1065,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",
)
@@ -1078,7 +1078,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",
)
@@ -1091,7 +1091,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",
)
@@ -1104,7 +1104,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",
)
@@ -1117,7 +1117,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",
)
@@ -1130,7 +1130,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",
)
@@ -1143,7 +1143,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",
)