Merge branch 'release'

This commit is contained in:
Veronica Berglyd Olsen
2024-05-01 19:38:38 +02:00
3 changed files with 7 additions and 9 deletions
+1 -1
View File
@@ -334,7 +334,7 @@ class GuiDocEditor(QPlainTextEdit):
font = QFont() font = QFont()
font.setFamily(CONFIG.textFont) font.setFamily(CONFIG.textFont)
font.setPointSize(CONFIG.textSize) font.setPointSize(CONFIG.textSize)
self.setFont(font) self._qDocument.setDefaultFont(font)
# Set default text margins # Set default text margins
# Due to cursor visibility, a part of the margin must be # Due to cursor visibility, a part of the margin must be
+1 -1
View File
@@ -146,7 +146,7 @@ class GuiDocViewer(QTextBrowser):
font = QFont() font = QFont()
font.setFamily(CONFIG.textFont) font.setFamily(CONFIG.textFont)
font.setPointSize(CONFIG.textSize) font.setPointSize(CONFIG.textSize)
self.setFont(font) self.document().setDefaultFont(font)
# Set the widget colours to match syntax theme # Set the widget colours to match syntax theme
mainPalette = self.palette() mainPalette = self.palette()
+5 -7
View File
@@ -27,13 +27,13 @@ import logging
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
from PyQt5.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot from PyQt5.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFontDialog,
QFontDialog, QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel, QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu,
QLineEdit, QMenu, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget, QTreeWidget,
QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget QTreeWidgetItem, QVBoxLayout, QWidget
) )
from novelwriter import CONFIG, SHARED from novelwriter import CONFIG, SHARED
@@ -1060,8 +1060,6 @@ class _FormatTab(NScrollableForm):
def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None: def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
super().__init__(parent=buildMain) super().__init__(parent=buildMain)
self.buildMain = buildMain
self._build = build self._build = build
self._unitScale = 1.0 self._unitScale = 1.0