Fixed merge conflicts

2019-06-09 09:39:18 +02:00
parent 121473969e 94da52982d
commit 579db06651
4 changed files with 23 additions and 6 deletions
@@ -48,6 +48,11 @@ class GuiDocViewer(QTextBrowser):
        self.setMinimumWidth(300)
        self.initEditor()

+        theOpt = QTextOption()
+        if self.mainConf.doJustify:
+            theOpt.setAlignment(Qt.AlignJustify)
+        self.theQDoc.setDefaultTextOption(theOpt)
+
        logger.debug("DocViewer initialisation complete")

        return