mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-29 09:09:40 +12:00
Fixes: Indent not saved in custom full screen theme #133
This commit is contained in:
parent
d2762f2819
commit
7ad2e93a3b
|
@ -600,7 +600,7 @@ class settingsWindow(QWidget, Ui_Settings):
|
||||||
self.btnThemeMisspelledColor.clicked.connect(lambda: self.getThemeColor("Text/Misspelled"))
|
self.btnThemeMisspelledColor.clicked.connect(lambda: self.getThemeColor("Text/Misspelled"))
|
||||||
|
|
||||||
# Paragraph Options
|
# Paragraph Options
|
||||||
self.chkThemeIndent.stateChanged.connect(lambda v: self.setSetting("Spacings/IndendFirstLine", v != 0))
|
self.chkThemeIndent.stateChanged.connect(lambda v: self.setSetting("Spacings/IndentFirstLine", v != 0))
|
||||||
self.cmbThemeLineSpacing.currentIndexChanged.connect(self.updateLineSpacing)
|
self.cmbThemeLineSpacing.currentIndexChanged.connect(self.updateLineSpacing)
|
||||||
self.cmbThemeLineSpacing.currentIndexChanged.connect(self.updateLineSpacing)
|
self.cmbThemeLineSpacing.currentIndexChanged.connect(self.updateLineSpacing)
|
||||||
self.spnThemeLineSpacing.valueChanged.connect(lambda v: self.setSetting("Spacings/LineSpacing", v))
|
self.spnThemeLineSpacing.valueChanged.connect(lambda v: self.setSetting("Spacings/LineSpacing", v))
|
||||||
|
@ -652,7 +652,7 @@ class settingsWindow(QWidget, Ui_Settings):
|
||||||
self.setButtonColor(self.btnThemeMisspelledColor, self._themeData["Text/Misspelled"])
|
self.setButtonColor(self.btnThemeMisspelledColor, self._themeData["Text/Misspelled"])
|
||||||
|
|
||||||
# Paragraph Options
|
# Paragraph Options
|
||||||
self.chkThemeIndent.setCheckState(Qt.Checked if self._themeData["Spacings/IndendFirstLine"] else Qt.Unchecked)
|
self.chkThemeIndent.setCheckState(Qt.Checked if self._themeData["Spacings/IndentFirstLine"] else Qt.Unchecked)
|
||||||
self.spnThemeLineSpacing.setEnabled(False)
|
self.spnThemeLineSpacing.setEnabled(False)
|
||||||
if self._themeData["Spacings/LineSpacing"] == 100:
|
if self._themeData["Spacings/LineSpacing"] == 100:
|
||||||
self.cmbThemeLineSpacing.setCurrentIndex(0)
|
self.cmbThemeLineSpacing.setCurrentIndex(0)
|
||||||
|
|
|
@ -40,7 +40,7 @@ def loadThemeDatas(themeFile):
|
||||||
loadThemeSetting(_themeData, settings, "Text/Misspelled", "#ff0000")
|
loadThemeSetting(_themeData, settings, "Text/Misspelled", "#ff0000")
|
||||||
|
|
||||||
# Paragraph Options
|
# Paragraph Options
|
||||||
loadThemeSetting(_themeData, settings, "Spacings/IndendFirstLine", False)
|
loadThemeSetting(_themeData, settings, "Spacings/IndentFirstLine", False)
|
||||||
loadThemeSetting(_themeData, settings, "Spacings/LineSpacing", 100)
|
loadThemeSetting(_themeData, settings, "Spacings/LineSpacing", 100)
|
||||||
loadThemeSetting(_themeData, settings, "Spacings/ParagraphAbove", 0)
|
loadThemeSetting(_themeData, settings, "Spacings/ParagraphAbove", 0)
|
||||||
loadThemeSetting(_themeData, settings, "Spacings/ParagraphBelow", 0)
|
loadThemeSetting(_themeData, settings, "Spacings/ParagraphBelow", 0)
|
||||||
|
@ -51,7 +51,14 @@ def loadThemeDatas(themeFile):
|
||||||
|
|
||||||
def loadThemeSetting(datas, settings, key, default):
|
def loadThemeSetting(datas, settings, key, default):
|
||||||
if settings.contains(key):
|
if settings.contains(key):
|
||||||
datas[key] = type(default)(settings.value(key))
|
|
||||||
|
if type(default) != type(True):
|
||||||
|
datas[key] = type(default)(settings.value(key))
|
||||||
|
else:
|
||||||
|
# Bools are stored as "true"/"false", but both are read as True
|
||||||
|
# since they are non-empty string.
|
||||||
|
datas[key] = True if settings.value(key) == "true" else False
|
||||||
|
|
||||||
else:
|
else:
|
||||||
datas[key] = default
|
datas[key] = default
|
||||||
|
|
||||||
|
@ -172,7 +179,7 @@ def themeEditorGeometry(themeDatas, textRect):
|
||||||
def getThemeBlockFormat(themeDatas):
|
def getThemeBlockFormat(themeDatas):
|
||||||
bf = QTextBlockFormat()
|
bf = QTextBlockFormat()
|
||||||
bf.setLineHeight(themeDatas["Spacings/LineSpacing"], QTextBlockFormat.ProportionalHeight)
|
bf.setLineHeight(themeDatas["Spacings/LineSpacing"], QTextBlockFormat.ProportionalHeight)
|
||||||
bf.setTextIndent(themeDatas["Spacings/TabWidth"] * 1 if themeDatas["Spacings/IndendFirstLine"] else 0)
|
bf.setTextIndent(themeDatas["Spacings/TabWidth"] * 1 if themeDatas["Spacings/IndentFirstLine"] else 0)
|
||||||
bf.setTopMargin(themeDatas["Spacings/ParagraphAbove"])
|
bf.setTopMargin(themeDatas["Spacings/ParagraphAbove"])
|
||||||
bf.setBottomMargin(themeDatas["Spacings/ParagraphBelow"])
|
bf.setBottomMargin(themeDatas["Spacings/ParagraphBelow"])
|
||||||
return bf
|
return bf
|
||||||
|
@ -269,7 +276,7 @@ def addThemePreviewText(pixmap, themeDatas, screenRect):
|
||||||
# themeDatas["Text/Misspelled"]
|
# themeDatas["Text/Misspelled"]
|
||||||
|
|
||||||
## Paragraph Options
|
## Paragraph Options
|
||||||
##themeDatas["Spacings/IndendFirstLine"]
|
##themeDatas["Spacings/IndentFirstLine"]
|
||||||
##themeDatas["Spacings/LineSpacing"]
|
##themeDatas["Spacings/LineSpacing"]
|
||||||
##themeDatas["Spacings/ParagraphAbove"]
|
##themeDatas["Spacings/ParagraphAbove"]
|
||||||
##themeDatas["Spacings/ParagraphBelow"]
|
##themeDatas["Spacings/ParagraphBelow"]
|
||||||
|
|
Loading…
Reference in a new issue