diff --git a/nw/config.py b/nw/config.py index a1e222dd..4f690be3 100644 --- a/nw/config.py +++ b/nw/config.py @@ -141,6 +141,7 @@ class Config: ## State self.showRefPanel = True self.viewComments = True + self.viewSynopsis = True # Check Qt5 Versions verQt = splitVersionNumber(QT_VERSION_STR) @@ -478,6 +479,9 @@ class Config: self.viewComments = self._parseLine( cnfParse, cnfSec, "viewcomments", self.CNF_BOOL, self.viewComments ) + self.viewSynopsis = self._parseLine( + cnfParse, cnfSec, "viewsynopsis", self.CNF_BOOL, self.viewSynopsis + ) ## Path cnfSec = "Path" @@ -569,6 +573,7 @@ class Config: cnfParse.add_section(cnfSec) cnfParse.set(cnfSec,"showrefpanel",str(self.showRefPanel)) cnfParse.set(cnfSec,"viewcomments",str(self.viewComments)) + cnfParse.set(cnfSec,"viewsynopsis",str(self.viewSynopsis)) ## Path cnfSec = "Path" @@ -753,11 +758,6 @@ class Config: self.confChanged = True return self.showRefPanel - def setViewComments(self, checkState): - self.viewComments = checkState - self.confChanged = True - return self.viewComments - def getErrData(self): errMessage = "
".join(self.errData) self.hasError = False diff --git a/nw/gui/preferences.py b/nw/gui/preferences.py index 17487a31..5c0ef235 100644 --- a/nw/gui/preferences.py +++ b/nw/gui/preferences.py @@ -62,7 +62,7 @@ class GuiPreferences(PagedDialog): self.tabAutoRep = GuiConfigEditAutoReplaceTab(self.theParent) self.addTab(self.tabGeneral, "General") - self.addTab(self.tabLayout, "Layout") + self.addTab(self.tabLayout, "Text Layout") self.addTab(self.tabEditing, "Editor") self.addTab(self.tabAutoRep, "Auto-Replace") @@ -506,6 +506,26 @@ class GuiConfigEditLayoutTab(QWidget): self.showLineEndings ) + # Render Options + # ============== + self.mainForm.addGroupLabel("Render Text") + + ## Render Comments + self.viewComments = QSwitch() + self.viewComments.setChecked(self.mainConf.viewComments) + self.mainForm.addRow( + "Render comments in document view panel", + self.viewComments + ) + + ## Render Synopsis + self.viewSynopsis = QSwitch() + self.viewSynopsis.setChecked(self.mainConf.viewSynopsis) + self.mainForm.addRow( + "Render synopsis in document view panel", + self.viewSynopsis + ) + return def saveValues(self): @@ -523,6 +543,8 @@ class GuiConfigEditLayoutTab(QWidget): tabWidth = self.tabWidth.value() showTabsNSpaces = self.showTabsNSpaces.isChecked() showLineEndings = self.showLineEndings.isChecked() + viewComments = self.viewComments.isChecked() + viewSynopsis = self.viewSynopsis.isChecked() self.mainConf.textFont = textFont self.mainConf.textSize = textSize @@ -534,6 +556,8 @@ class GuiConfigEditLayoutTab(QWidget): self.mainConf.tabWidth = tabWidth self.mainConf.showTabsNSpaces = showTabsNSpaces self.mainConf.showLineEndings = showLineEndings + self.mainConf.viewComments = viewComments + self.mainConf.viewSynopsis = viewSynopsis self.mainConf.confChanged = True