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

novelwriter/tools/manussettings.py

@@ -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/types.py

@@ -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
 
@@ -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