Skip to content

Commit

Permalink
Merge pull request #351 from vkbo/hide_doc_footer
Browse files Browse the repository at this point in the history
Hide docFooter in Zen Mode
  • Loading branch information
vkbo committed Jun 27, 2020
2 parents dad4677 + 6b70d96 commit c572eb0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
5 changes: 5 additions & 0 deletions nw/config.py
Expand Up @@ -112,6 +112,7 @@ def __init__(self):
self.textMargin = 40
self.tabWidth = 40
self.zenWidth = 800
self.hideZenFooter = False
self.doJustify = False
self.autoSelect = True
self.doReplace = True
Expand Down Expand Up @@ -417,6 +418,9 @@ def loadConfig(self):
self.zenWidth = self._parseLine(
cnfParse, cnfSec, "zenwidth", self.CNF_INT, self.zenWidth
)
self.hideZenFooter = self._parseLine(
cnfParse, cnfSec, "hidezenfooter", self.CNF_BOOL, self.hideZenFooter
)
self.doJustify = self._parseLine(
cnfParse, cnfSec, "justify", self.CNF_BOOL, self.doJustify
)
Expand Down Expand Up @@ -569,6 +573,7 @@ def saveConfig(self):
cnfParse.set(cnfSec,"margin", str(self.textMargin))
cnfParse.set(cnfSec,"tabwidth", str(self.tabWidth))
cnfParse.set(cnfSec,"zenwidth", str(self.zenWidth))
cnfParse.set(cnfSec,"hidezenfooter", str(self.hideZenFooter))
cnfParse.set(cnfSec,"justify", str(self.doJustify))
cnfParse.set(cnfSec,"autoselect", str(self.autoSelect))
cnfParse.set(cnfSec,"autoreplace", str(self.doReplace))
Expand Down
10 changes: 10 additions & 0 deletions nw/gui/preferences.py
Expand Up @@ -452,6 +452,14 @@ def __init__(self, theParent):
"If disabled, minimum text width is defined by the margin setting."
)

## Zen Mode Footer
self.hideZenFooter = QSwitch()
self.hideZenFooter.setChecked(self.mainConf.hideZenFooter)
self.mainForm.addRow(
"Hide document footer in \"Zen Mode\"",
self.hideZenFooter
)

## Justify Text
self.textJustify = QSwitch()
self.textJustify.setChecked(self.mainConf.textFixedW)
Expand Down Expand Up @@ -538,6 +546,7 @@ def saveValues(self):
textWidth = self.textFlowMax.value()
zenWidth = self.zenDocWidth.value()
textFixedW = not self.textFlowFixed.isChecked()
hideZenFooter = self.hideZenFooter.isChecked()
doJustify = self.textJustify.isChecked()
textMargin = self.textMargin.value()
tabWidth = self.tabWidth.value()
Expand All @@ -551,6 +560,7 @@ def saveValues(self):
self.mainConf.textWidth = textWidth
self.mainConf.zenWidth = zenWidth
self.mainConf.textFixedW = textFixedW
self.mainConf.hideZenFooter = hideZenFooter
self.mainConf.doJustify = doJustify
self.mainConf.textMargin = textMargin
self.mainConf.tabWidth = tabWidth
Expand Down
3 changes: 3 additions & 0 deletions nw/guimain.py
Expand Up @@ -942,6 +942,9 @@ def toggleZenMode(self):
self.mainMenu.setVisible(isVisible)
self.tabWidget.tabBar().setVisible(isVisible)

hideDocFooter = self.isZenMode and self.mainConf.hideZenFooter
self.docEditor.docFooter.setVisible(not hideDocFooter)

if self.splitView.isVisible():
self.splitView.setVisible(False)
elif self.docViewer.theHandle is not None:
Expand Down
3 changes: 2 additions & 1 deletion tests/reference/novelwriter.conf
@@ -1,5 +1,5 @@
[Main]
timestamp = 2020-06-17 19:45:53
timestamp = 2020-06-27 21:21:19
theme = default
syntax = default_light
icons = typicons_colour_light
Expand Down Expand Up @@ -29,6 +29,7 @@ width = 600
margin = 40
tabwidth = 40
zenwidth = 800
hidezenfooter = False
justify = False
autoselect = True
autoreplace = True
Expand Down

0 comments on commit c572eb0

Please sign in to comment.