CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-15 10:22:26 +12:00
Code Issues Projects Releases Wiki Activity

Using stylesheets for QTextEdit default formatting is lot less of a headache

Browse source
This commit is contained in:
Olivier Keshavjee 2015-07-01 14:23:52 +02:00
parent ff7bf96108
commit 6744d2350a
6 changed files with 47 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/models/outlineModel.py
View file

@ -497,7 +497,7 @@ class outlineItem():
e = QTextEdit()
e.setHtml(self._data[Outline.text])
self._data[Outline.text] = e.toPlainText()
elif oldType in ["txt", "t2t"] and data == "html":
elif oldType in ["txt", "t2t"] and data == "html" and Outline.text in self._data:
self._data[Outline.text] = self._data[Outline.text].replace("\n", "<br>")
# Setting data

3
src/settingsWindow.py
View file

@ -334,7 +334,6 @@ class settingsWindow(QWidget, Ui_Settings):
# Update font and defaultBlockFormat to all textEditView. Drastically.
for w in mainWindow().findChildren(textEditView, QRegExp(".*")):
print(w.objectName(), w.parent().objectName())
w.loadFontSettings()
def choseEditorFontColor(self):
@ -344,6 +343,7 @@ class settingsWindow(QWidget, Ui_Settings):
if color.isValid():
settings.textEditor["fontColor"] = color.name()
self.setButtonColor(self.btnEditorFontColor, color.name())
self.updateEditorSettings()
def choseEditorMisspelledColor(self):
color = settings.textEditor["misspelled"]
@ -352,6 +352,7 @@ class settingsWindow(QWidget, Ui_Settings):
if color.isValid():
settings.textEditor["misspelled"] = color.name()
self.setButtonColor(self.btnEditorMisspelledColor, color.name())
self.updateEditorSettings()
####################################################################################################
# STATUS #

2
src/ui/editors/basicHighlighter.py
View file

@ -43,7 +43,7 @@ class basicHighlighter(QSyntaxHighlighter):
bf.setAlignment(QTextCursor(self.currentBlock()).blockFormat().alignment())
QTextCursor(self.currentBlock()).setBlockFormat(bf)
self.setFormat(0, len(text), self._defaultCharFormat)
#self.setFormat(0, len(text), self._defaultCharFormat)
def highlightBlockAfter(self, text):
"""Highlighting to do after everything else.

1
src/ui/editors/fullScreenEditor.py
View file

@ -32,7 +32,6 @@ class fullScreenEditor(QWidget):
self.editor.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.editor.installEventFilter(self)
self.editor.setMouseTracking(True)
self.editor.setVerticalScrollBar(myScrollBar())
self.scrollBar = self.editor.verticalScrollBar()
self.scrollBar.setParent(self)

41
src/ui/editors/themes.py
View file

@ -185,13 +185,13 @@ def setThemeEditorDatas(editor, themeDatas, pixmap, screenRect):
x, y, width, height = themeEditorGeometry(themeDatas, textRect)
editor.setGeometry(x, y, width, height)
p = editor.palette()
#p.setBrush(QPalette.Base, QBrush(pixmap.copy(x, y, width, height)))
p.setBrush(QPalette.Base, QColor(Qt.transparent))
p.setColor(QPalette.Text, QColor(themeDatas["Text/Color"]))
p.setColor(QPalette.Highlight, QColor(themeDatas["Text/Color"]))
p.setColor(QPalette.HighlightedText, Qt.black if qGray(QColor(themeDatas["Text/Color"]).rgb()) > 127 else Qt.white)
editor.setPalette(p)
#p = editor.palette()
##p.setBrush(QPalette.Base, QBrush(pixmap.copy(x, y, width, height)))
#p.setBrush(QPalette.Base, QColor(Qt.transparent))
#p.setColor(QPalette.Text, QColor(themeDatas["Text/Color"]))
#p.setColor(QPalette.Highlight, QColor(themeDatas["Text/Color"]))
#p.setColor(QPalette.HighlightedText, Qt.black if qGray(QColor(themeDatas["Text/Color"]).rgb()) > 127 else Qt.white)
#editor.setPalette(p)
editor.setAttribute(Qt.WA_NoSystemBackground, True)
@ -215,13 +215,30 @@ def setThemeEditorDatas(editor, themeDatas, pixmap, screenRect):
editor.highlighter.setMisspelledColor(QColor(themeDatas["Text/Misspelled"]))
cf = QTextCharFormat()
f = QFont()
f.fromString(themeDatas["Text/Font"])
cf.setFont(f)
editor.highlighter.setDefaultCharFormat(cf)
#f = QFont()
#f.fromString(themeDatas["Text/Font"])
editor.setFont(f)
#cf.setFont(f)
editor.highlighter.setDefaultCharFormat(cf)
f = QFont()
f.fromString(themeDatas["Text/Font"])
#editor.setFont(f)
editor.setStyleSheet("""
background: transparent;
color: {foreground};
font-family: {ff};
font-size: {fs};
selection-color: {sc};
selection-background-color: {sbc};
""".format(
foreground=themeDatas["Text/Color"],
ff=f.family(),
fs="{}pt".format(str(f.pointSize())),
sc="black" if qGray(QColor(themeDatas["Text/Color"]).rgb()) > 127 else "white",
sbc=themeDatas["Text/Color"],
)
)
editor._fromTheme = True

18
src/ui/views/textEditView.py
View file

@ -170,12 +170,19 @@ class textEditView(QTextEdit):
opt = settings.textEditor
f = QFont()
f.fromString(opt["font"])
self.setFont(f)
#self.setFont(f)
self.setStyleSheet("""
color: {foreground};
font-family: {ff};
font-size: {fs};
""".format(
foreground=opt["fontColor"],
ff=f.family(),
fs="{}pt".format(str(f.pointSize()))))
cf = QTextCharFormat()
cf.setFont(f)
cf.setForeground(QColor(opt["fontColor"]))
#cf.setFont(f)
#cf.setForeground(QColor(opt["fontColor"]))
bf = QTextBlockFormat()
bf.setLineHeight(opt["lineSpacing"], bf.ProportionalHeight)
@ -306,6 +313,7 @@ class textEditView(QTextEdit):
# We don't store font settings
html = re.sub(r"font-family:.*?;", "", html)
html = re.sub(r"font-size:.*?;", "", html)
#print("Submitting:", html)
self._model.setData(self._index, html)
self._updating = False
else:
@ -464,6 +472,8 @@ class textEditView(QTextEdit):
def applyFormat(self, _format):
print(_format)
if self._textFormat == "html":
if _format == "Clear":