Allow showing comments in document view pane, with a toggle swithc in document menu

nw/gui/elements/docviewer.py

@@ -105,7 +105,7 @@ class GuiDocViewer(QTextBrowser):
         logger.debug("Generating preview for item %s" % tHandle)
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(self.theProject, self.theParent)
-        aDoc.setPreview(True)
+        aDoc.setPreview(True, self.mainConf.viewComments)
         aDoc.setText(tHandle)
         aDoc.doAutoReplace()
         aDoc.tokenizeText()
@@ -121,6 +121,10 @@ class GuiDocViewer(QTextBrowser):
 
         return True
 
+    def reloadText(self):
+        self.loadText(self.theHandle)
+        return
+
     def loadFromTag(self, theTag):
 
         logger.debug("Loading document from tag '%s'" % theTag)
@@ -180,10 +184,6 @@ class GuiDocViewer(QTextBrowser):
             "a {{"
             "  color: rgb({aColR},{aColG},{aColB});"
             "}}\n"
-            "pre {{"
-            "  color: rgb({cColR},{cColG},{cColB});"
-            "  font-size: {preSize:.1f}pt;"
-            "}}\n"
             "mark {{"
             "  color: rgb({eColR},{eColG},{eColB});"
             "}}\n"
@@ -197,6 +197,11 @@ class GuiDocViewer(QTextBrowser):
             "  color: rgb({kColR},{kColG},{kColB});"
             "  font-wright: bold;"
             "}}\n"
+            ".comment {{"
+            "  color: rgb({cColR},{cColG},{cColB});"
+            "  margin-left: 1em;"
+            "  margin-right: 1em;"
+            "}}\n"
         ).format(
             textSize = self.mainConf.textSize,
             preSize  = self.mainConf.textSize*0.9,

nw/gui/mainmenu.py

@@ -112,6 +112,11 @@ class GuiMainMenu(QMenuBar):
             self.toolsSpellCheck.setChecked(False)
         return True
 
+    def _toggleViewComments(self):
+        self.mainConf.setViewComments(self.docViewComments.isChecked())
+        self.theParent.docViewer.reloadText()
+        return True
+
     def _showAbout(self):
         listPrefix = "  •  "
         aboutMsg   = (
@@ -331,10 +336,18 @@ class GuiMainMenu(QMenuBar):
         menuItem.triggered.connect(self.theParent.closeDocViewer)
         self.docuMenu.addAction(menuItem)
 
+        # Document > Toggle View Comments
+        self.docViewComments = QAction("View Comments", self)
+        self.docViewComments.setStatusTip("Show comments in view panel")
+        self.docViewComments.setCheckable(True)
+        self.docViewComments.setChecked(self.mainConf.viewComments)
+        self.docViewComments.toggled.connect(self._toggleViewComments)
+        self.docuMenu.addAction(self.docViewComments)
+
         # Document > Separator
         self.docuMenu.addSeparator()
 
-        # Document > Close Preview
+        # Document > Import From File
         menuItem = QAction("Import from File", self)
         menuItem.setStatusTip("Import document from a text or markdown file")
         menuItem.setShortcut("Ctrl+Shift+I")