Added menu entry and function for Zen mode, and cleaned up editor resizing

This commit is contained in:
Veronica K. B. Olsen
2019-11-09 01:19:17 +01:00
parent ee34e0e395
commit 472205f1a6
4 changed files with 43 additions and 36 deletions
+12 -8
View File
@@ -21,7 +21,7 @@ from PyQt5.QtWidgets import (
)
from PyQt5.QtGui import (
QTextCursor, QTextOption, QIcon, QKeySequence, QFont, QColor,
QPalette, QTextDocument,
QPalette, QTextDocument
)
from nw.project import NWDoc
@@ -185,7 +185,6 @@ class GuiDocEditor(QTextEdit):
tHandle = self.theHandle
self.clearEditor()
self.loadText(tHandle)
self.changeWidth()
else:
self.clearEditor()
@@ -298,11 +297,13 @@ class GuiDocEditor(QTextEdit):
# General Class Methods
##
def changeWidth(self):
def resizeEvent(self, theEvent):
"""Automatically adjust the margins so the text is centred, but
only if Config.textFixedW is set to True.
"""
if self.mainConf.textFixedW:
QTextEdit.resizeEvent(self, theEvent)
if self.mainConf.textFixedW or self.theParent.isZenMode:
vBar = self.verticalScrollBar()
if vBar.isVisible():
sW = vBar.width()
@@ -313,10 +314,13 @@ class GuiDocEditor(QTextEdit):
tM = int((wW - sW - tW)/2)
if tM < self.mainConf.textMargin:
tM = self.mainConf.textMargin
docFormat = self.qDocument.rootFrame().frameFormat()
docFormat.setLeftMargin(tM)
docFormat.setRightMargin(tM)
self.qDocument.rootFrame().setFrameFormat(docFormat)
else:
tM = self.mainConf.textMargin
docFormat = self.qDocument.rootFrame().frameFormat()
docFormat.setLeftMargin(tM)
docFormat.setRightMargin(tM)
self.qDocument.rootFrame().setFrameFormat(docFormat)
return
+1 -1
View File
@@ -46,7 +46,7 @@ class GuiIcons:
DECO_MAP = {
"export" : "export.svg",
"settings" : "settings.svg",
"settings" : "gear.svg",
}
def __init__(self, theParent):
+12
View File
@@ -410,6 +410,18 @@ class GuiMainMenu(QMenuBar):
# View > Separator
self.viewMenu.addSeparator()
# View > Toggle Zen Mode
menuItem = QAction("Zen Mode", self)
menuItem.setStatusTip("Toggles zen mode, only showing text editor")
menuItem.setShortcut("F8")
menuItem.setCheckable(True)
menuItem.setChecked(self.theParent.isZenMode)
menuItem.toggled.connect(self.theParent.toggleZenMode)
self.viewMenu.addAction(menuItem)
# View > Separator
self.viewMenu.addSeparator()
# View > Project Timeline
menuItem = QAction("Show Project Timeline", self)
menuItem.setStatusTip("Open the project timeline window")