Merge pull request #231 from vkbo/bugfixes

Bugfixes
This commit is contained in:
Veronica K. Berglyd Olsen
2020-05-25 10:02:17 +02:00
committed by GitHub
2 changed files with 13 additions and 6 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ Likewise, the keywords ``%scnum%`` and ``%scabsnum%`` are number counters for sc
These are incremented each time a heading of level three is encountered.
The former keyword is reset to one for each new chapter, while the latter is not reset but counts from first scene encountered.
If you want to insert a line break in you=r title format, add two backslashes ``%\\%``.
If you want to insert a line break in you=r title format, add two backslashes ``\\``.
.. note::
Header formatting only applies to novel files.
+12 -5
View File
@@ -357,6 +357,7 @@ class GuiBuildNovel(QDialog):
self.htmlStyle = makeHtml.getStyleSheet()
# Load the preview document with the html data
self.docView.setJustify(justifyText)
self.docView.setStyleSheet(self.htmlStyle)
self.docView.setContent(self.htmlText)
@@ -663,11 +664,6 @@ class GuiBuildNovelDocView(QTextBrowser):
theFont.setPointSize(self.mainConf.textSize)
self.setFont(theFont)
theOpt = QTextOption()
if self.mainConf.doJustify:
theOpt.setAlignment(Qt.AlignJustify)
self.qDocument.setDefaultTextOption(theOpt)
docPalette = self.palette()
docPalette.setColor(QPalette.Base, QColor(255, 255, 255))
docPalette.setColor(QPalette.Text, QColor( 0, 0, 0))
@@ -681,6 +677,17 @@ class GuiBuildNovelDocView(QTextBrowser):
return
def setJustify(self, doJustify):
"""Set the justify text option.
"""
theOpt = self.qDocument.defaultTextOption()
if doJustify:
theOpt.setAlignment(Qt.AlignJustify)
else:
theOpt.setAlignment(Qt.AlignAbsolute)
self.qDocument.setDefaultTextOption(theOpt)
return
def setContent(self, theText):
"""Set the content, either from text or list of text.
"""