novelWriter 2.6b1__py3-none-any.whl → 2.6rc1__py3-none-any.whl

novelwriter/tools/manusbuild.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-05-24 [2.1b1] GuiManuscriptBuild
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2023 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -179,14 +179,20 @@ class GuiManuscriptBuild(NDialog):
         self.buildBox.setVerticalSpacing(sp4)
 
         # Dialog Buttons
+        self.buttonBox = QDialogButtonBox(self)
+
         self.btnOpen = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Open Folder"), self)
         self.btnOpen.setIconSize(bSz)
+        self.btnOpen.setAutoDefault(False)
+        self.buttonBox.addButton(self.btnOpen, QtRoleAction)
+
         self.btnBuild = QPushButton(SHARED.theme.getIcon("export"), self.tr("&Build"), self)
         self.btnBuild.setIconSize(bSz)
+        self.btnBuild.setAutoDefault(True)
+        self.buttonBox.addButton(self.btnBuild, QtRoleAction)
 
-        self.dlgButtons = QDialogButtonBox(QtDialogClose, self)
-        self.dlgButtons.addButton(self.btnOpen, QtRoleAction)
-        self.dlgButtons.addButton(self.btnBuild, QtRoleAction)
+        self.btnClose = self.buttonBox.addButton(QtDialogClose)
+        self.btnClose.setAutoDefault(False)
 
         # Assemble GUI
         # ============
@@ -213,7 +219,7 @@ class GuiManuscriptBuild(NDialog):
         self.outerBox.addSpacing(sp4)
         self.outerBox.addLayout(self.buildBox, 0)
         self.outerBox.addSpacing(sp16)
-        self.outerBox.addWidget(self.dlgButtons, 0)
+        self.outerBox.addWidget(self.buttonBox, 0)
         self.outerBox.setSpacing(0)
 
         self.setLayout(self.outerBox)
@@ -229,7 +235,7 @@ class GuiManuscriptBuild(NDialog):
         # Signals
         self.btnReset.clicked.connect(self._doResetBuildName)
         self.btnBrowse.clicked.connect(self._doSelectPath)
-        self.dlgButtons.clicked.connect(self._dialogButtonClicked)
+        self.buttonBox.clicked.connect(self._dialogButtonClicked)
         self.listFormats.itemSelectionChanged.connect(self._resetProgress)
 
         logger.debug("Ready: GuiManuscriptBuild")
@@ -260,7 +266,7 @@ class GuiManuscriptBuild(NDialog):
     @pyqtSlot("QAbstractButton*")
     def _dialogButtonClicked(self, button: QAbstractButton) -> None:
         """Handle button clicks from the dialog button box."""
-        role = self.dlgButtons.buttonRole(button)
+        role = self.buttonBox.buttonRole(button)
         if role == QtRoleAction:
             if button == self.btnBuild:
                 self._runBuild()
@@ -388,13 +394,9 @@ class GuiManuscriptBuild(NDialog):
                     if isinstance(rItem, NWItem):
                         rootMap[rHandle] = rItem.itemName
 
-                itemIcon = SHARED.theme.getItemIcon(
-                    nwItem.itemType, nwItem.itemClass,
-                    nwItem.itemLayout, nwItem.mainHeading
-                )
                 rootName = rootMap.get(rHandle, "??????")
                 item = QListWidgetItem(f"{rootName}: {nwItem.itemName}")
-                item.setIcon(itemIcon)
+                item.setIcon(nwItem.getMainIcon())
                 self.listContent.addItem(item)
 
         return

novelwriter/tools/manuscript.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-05-13 [2.1b1] GuiManuscript
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2023 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -986,17 +986,17 @@ class _StatsWidget(QWidget):
     def updateStats(self, data: dict[str, int]) -> None:
         """Update the stats values from a Tokenizer stats dict."""
         # Minimal
-        self.minWordCount.setText("{0:n}".format(data.get(nwStats.WORDS_ALL, 0)))
-        self.minCharCount.setText("{0:n}".format(data.get(nwStats.CHARS_ALL, 0)))
+        self.minWordCount.setText("{0:n}".format(data.get(nwStats.WORDS, 0)))
+        self.minCharCount.setText("{0:n}".format(data.get(nwStats.CHARS, 0)))
 
         # Maximal
-        self.maxTotalWords.setText("{0:n}".format(data.get(nwStats.WORDS_ALL, 0)))
+        self.maxTotalWords.setText("{0:n}".format(data.get(nwStats.WORDS, 0)))
         self.maxHeadWords.setText("{0:n}".format(data.get(nwStats.WORDS_TITLE, 0)))
         self.maxTextWords.setText("{0:n}".format(data.get(nwStats.WORDS_TEXT, 0)))
         self.maxTitleCount.setText("{0:n}".format(data.get(nwStats.TITLES, 0)))
         self.maxParCount.setText("{0:n}".format(data.get(nwStats.PARAGRAPHS, 0)))
 
-        self.maxTotalChars.setText("{0:n}".format(data.get(nwStats.CHARS_ALL, 0)))
+        self.maxTotalChars.setText("{0:n}".format(data.get(nwStats.CHARS, 0)))
         self.maxHeaderChars.setText("{0:n}".format(data.get(nwStats.CHARS_TITLE, 0)))
         self.maxTextChars.setText("{0:n}".format(data.get(nwStats.CHARS_TEXT, 0)))
 
@@ -1037,7 +1037,7 @@ class _StatsWidget(QWidget):
         hPx = CONFIG.pxInt(12)
         vPx = CONFIG.pxInt(4)
 
-        trAllChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_ALL])
+        trAllChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS])
         trTextChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TEXT])
         trTitleChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TITLE])
         trParagraphCount = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
@@ -1045,7 +1045,7 @@ class _StatsWidget(QWidget):
         trAllWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_ALL])
         trTextWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TEXT])
         trTitleWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TITLE])
-        trAllWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_ALL])
+        trAllWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS])
         trTextWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TEXT])
         trTitleWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TITLE])
 

novelwriter/tools/manussettings.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-02-13 [2.1b1] GuiBuildSettings
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2023 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,13 +31,13 @@ from PyQt5.QtCore import QEvent, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtWidgets import (
     QAbstractButton, QAbstractItemView, QDialogButtonBox, QFrame, QGridLayout,
-    QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu, QPlainTextEdit,
-    QPushButton, QSplitter, QStackedWidget, QTreeWidget, QTreeWidgetItem,
-    QVBoxLayout, QWidget
+    QHBoxLayout, QLabel, QLineEdit, QMenu, QPlainTextEdit, QPushButton,
+    QSplitter, QStackedWidget, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import describeFont, qtLambda
+from novelwriter.common import describeFont, fontMatcher, qtLambda
 from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwStyles, trConst
 from novelwriter.core.buildsettings import BuildSettings, FilterMode
 from novelwriter.extensions.configlayout import (
@@ -51,7 +51,8 @@ from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.switchbox import NSwitchBox
 from novelwriter.types import (
     QtAlignCenter, QtAlignLeft, QtDialogApply, QtDialogClose, QtDialogSave,
-    QtRoleAccept, QtRoleApply, QtRoleReject, QtUserRole
+    QtHeaderFixed, QtHeaderStretch, QtRoleAccept, QtRoleApply, QtRoleReject,
+    QtUserRole
 )
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -313,9 +314,9 @@ class _FilterTab(NFixedPage):
         treeHeader = self.optTree.header()
         treeHeader.setStretchLastSection(False)
         treeHeader.setMinimumSectionSize(iPx + cMg)  # See Issue #1551
-        treeHeader.setSectionResizeMode(self.C_NAME, QHeaderView.ResizeMode.Stretch)
-        treeHeader.setSectionResizeMode(self.C_ACTIVE, QHeaderView.ResizeMode.Fixed)
-        treeHeader.setSectionResizeMode(self.C_STATUS, QHeaderView.ResizeMode.Fixed)
+        treeHeader.setSectionResizeMode(self.C_NAME, QtHeaderStretch)
+        treeHeader.setSectionResizeMode(self.C_ACTIVE, QtHeaderFixed)
+        treeHeader.setSectionResizeMode(self.C_STATUS, QtHeaderFixed)
         treeHeader.resizeSection(self.C_ACTIVE, iPx + cMg)
         treeHeader.resizeSection(self.C_STATUS, iPx + cMg)
 
@@ -418,8 +419,7 @@ class _FilterTab(NFixedPage):
         logger.debug("Building project tree")
         self._treeMap = {}
         self.optTree.clear()
-        for nwItem in SHARED.project.iterProjectItems():
-
+        for nwItem in SHARED.project.tree:
             tHandle = nwItem.itemHandle
             pHandle = nwItem.itemParent
             rHandle = nwItem.itemRoot
@@ -428,28 +428,15 @@ class _FilterTab(NFixedPage):
                 continue
 
             isFile = nwItem.isFileType()
-            isActive = nwItem.isActive
-
             if nwItem.isInactiveClass() or not self._build.isRootAllowed(rHandle):
                 continue
 
-            hLevel = nwItem.mainHeading
-            itemIcon = SHARED.theme.getItemIcon(
-                nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
-            )
-
-            if isFile:
-                iconName = "checked" if isActive else "unchecked"
-            else:
-                iconName = "noncheckable"
-
             trItem = QTreeWidgetItem()
-            trItem.setIcon(self.C_NAME, itemIcon)
+            trItem.setIcon(self.C_NAME, nwItem.getMainIcon())
             trItem.setText(self.C_NAME, nwItem.itemName)
             trItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
             trItem.setData(self.C_DATA, self.D_FILE, isFile)
-            trItem.setIcon(self.C_ACTIVE, SHARED.theme.getIcon(iconName))
-
+            trItem.setIcon(self.C_ACTIVE, nwItem.getActiveStatus()[1])
             trItem.setTextAlignment(self.C_NAME, QtAlignLeft)
 
             if pHandle is None and nwItem.isRootType():
@@ -496,11 +483,8 @@ class _FilterTab(NFixedPage):
         self.filterOpt.addLabel(self.tr("Select Root Folders"))
         for tHandle, nwItem in SHARED.project.tree.iterRoots(None):
             if not nwItem.isInactiveClass():
-                itemIcon = SHARED.theme.getItemIcon(
-                    nwItem.itemType, nwItem.itemClass, nwItem.itemLayout
-                )
                 self.filterOpt.addItem(
-                    itemIcon, nwItem.itemName, f"root:{tHandle}",
+                    nwItem.getMainIcon(), nwItem.itemName, f"root:{tHandle}",
                     default=self._build.isRootAllowed(tHandle)
                 )
 
@@ -964,15 +948,6 @@ class _FormattingTab(NScrollableForm):
         spW = 6*SHARED.theme.textNWidth
         dbW = 8*SHARED.theme.textNWidth
 
-        # Common Translations
-
-        trW = self.tr("W:")  # Width
-        trH = self.tr("H:")  # Height
-        trT = self.tr("T:")  # Top
-        trB = self.tr("B:")  # Bottom
-        trL = self.tr("L:")  # Left
-        trR = self.tr("R:")  # Right
-
         # Text Content
         # ============
 
@@ -1084,6 +1059,13 @@ class _FormattingTab(NScrollableForm):
         self._sidebar.addButton(title, section)
         self.addGroupLabel(title, section)
 
+        pixT = SHARED.theme.getPixmap("margin_top", (iPx, iPx))
+        pixB = SHARED.theme.getPixmap("margin_bottom", (iPx, iPx))
+        pixL = SHARED.theme.getPixmap("margin_left", (iPx, iPx))
+        pixR = SHARED.theme.getPixmap("margin_right", (iPx, iPx))
+        pixH = SHARED.theme.getPixmap("size_height", (iPx, iPx))
+        pixW = SHARED.theme.getPixmap("size_width", (iPx, iPx))
+
         # Title
         self.titleMarginT = NDoubleSpinBox(self)
         self.titleMarginT.setFixedWidth(dbW)
@@ -1093,7 +1075,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["H0"]),
-            [trT, self.titleMarginT, 6, trB, self.titleMarginB],
+            [pixT, self.titleMarginT, 6, pixB, self.titleMarginB],
+            unit="em",
         )
 
         # Heading 1
@@ -1105,7 +1088,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["H1"]),
-            [trT, self.h1MarginT, 6, trB, self.h1MarginB],
+            [pixT, self.h1MarginT, 6, pixB, self.h1MarginB],
+            unit="em",
         )
 
         # Heading 2
@@ -1117,7 +1101,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["H2"]),
-            [trT, self.h2MarginT, 6, trB, self.h2MarginB],
+            [pixT, self.h2MarginT, 6, pixB, self.h2MarginB],
+            unit="em",
         )
 
         # Heading 3
@@ -1129,7 +1114,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["H3"]),
-            [trT, self.h3MarginT, 6, trB, self.h3MarginB],
+            [pixT, self.h3MarginT, 6, pixB, self.h3MarginB],
+            unit="em",
         )
 
         # Heading 4
@@ -1141,7 +1127,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["H4"]),
-            [trT, self.h4MarginT, 6, trB, self.h4MarginB],
+            [pixT, self.h4MarginT, 6, pixB, self.h4MarginB],
+            unit="em",
         )
 
         # Text
@@ -1153,7 +1140,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["TT"]),
-            [trT, self.textMarginT, 6, trB, self.textMarginB],
+            [pixT, self.textMarginT, 6, pixB, self.textMarginB],
+            unit="em",
         )
 
         # Separator
@@ -1165,7 +1153,8 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             trConst(nwStyles.T_LABEL["SP"]),
-            [trT, self.sepMarginT, 6, trB, self.sepMarginB],
+            [pixT, self.sepMarginT, 6, pixB, self.sepMarginB],
+            unit="em",
         )
 
         # Page Layout
@@ -1198,7 +1187,7 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             self._build.getLabel("format.pageSize"),
-            [self.pageSize, 6, trW, self.pageWidth, 6, trH, self.pageHeight],
+            [self.pageSize, 6, pixW, self.pageWidth, 6, pixH, self.pageHeight],
         )
 
         # Page Margins
@@ -1216,11 +1205,11 @@ class _FormattingTab(NScrollableForm):
 
         self.addRow(
             self._build.getLabel("format.pageMargins"),
-            [trT, self.topMargin, 6, trB, self.bottomMargin],
+            [pixT, self.topMargin, 6, pixB, self.bottomMargin],
         )
         self.addRow(
             "",
-            [trL, self.leftMargin, 6, trR, self.rightMargin],
+            [pixL, self.leftMargin, 6, pixR, self.rightMargin],
         )
 
         # Open Document
@@ -1292,8 +1281,9 @@ class _FormattingTab(NScrollableForm):
         # Text Format
         # ===========
 
-        self._textFont = QFont()
-        self._textFont.fromString(self._build.getStr("format.textFont"))
+        font = QFont()
+        font.fromString(self._build.getStr("format.textFont"))
+        self._textFont = fontMatcher(font)
 
         self.textFont.setText(describeFont(self._textFont))
         self.textFont.setCursorPosition(0)
@@ -1448,9 +1438,9 @@ class _FormattingTab(NScrollableForm):
         """Open the QFontDialog and set a font for the font style."""
         font, status = SHARED.getFont(self._textFont, CONFIG.nativeFont)
         if status:
-            self.textFont.setText(describeFont(font))
+            self._textFont = fontMatcher(font)
+            self.textFont.setText(describeFont(self._textFont))
             self.textFont.setCursorPosition(0)
-            self._textFont = font
         return
 
     @pyqtSlot(int)

novelwriter/tools/noveldetails.py

@@ -6,7 +6,7 @@ File History:
 Created: 2024-01-18 [2.3b1] GuiNovelDetails
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2024 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

novelwriter/tools/welcome.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-12-14 [2.3b1] GuiWelcome
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2023 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

novelwriter/tools/writingstats.py

@@ -6,7 +6,7 @@ File History:
 Created: 2019-10-20 [0.3.0] GuiWritingStats
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2019 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

novelwriter/types.py

@@ -6,7 +6,7 @@ File History:
 Created: 2024-04-01 [2.4rc1]
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2024 Veronica Berglyd Olsen and novelWriter contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ from PyQt5.QtGui import (
     QColor, QFont, QPainter, QTextBlockFormat, QTextCharFormat, QTextCursor,
     QTextFormat
 )
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QSizePolicy, QStyle
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QSizePolicy, QStyle
 
 # Qt Alignment Flags
 
@@ -66,7 +66,7 @@ QtNoBrush = Qt.BrushStyle.NoBrush
 QtNoPen = Qt.PenStyle.NoPen
 QtRoundCap = Qt.PenCapStyle.RoundCap
 QtSolidLine = Qt.PenStyle.SolidLine
-QtPaintAnitAlias = QPainter.RenderHint.Antialiasing
+QtPaintAntiAlias = QPainter.RenderHint.Antialiasing
 QtMouseOver = QStyle.StateFlag.State_MouseOver
 QtSelected = QStyle.StateFlag.State_Selected
 
@@ -119,6 +119,12 @@ QtSizeIgnored = QSizePolicy.Policy.Ignored
 QtSizeMinimum = QSizePolicy.Policy.Minimum
 QtSizeMinimumExpanding = QSizePolicy.Policy.MinimumExpanding
 
+# Resize Mode
+
+QtHeaderStretch = QHeaderView.ResizeMode.Stretch
+QtHeaderToContents = QHeaderView.ResizeMode.ResizeToContents
+QtHeaderFixed = QHeaderView.ResizeMode.Fixed
+
 # Scroll Bar Policy
 
 QtScrollAlwaysOff = Qt.ScrollBarPolicy.ScrollBarAlwaysOff