Adds default system style to text editor

This commit is contained in:
Olivier Keshavjee 2017-11-14 10:50:32 +01:00
parent 2109f88816
commit b0af99eddc
6 changed files with 620 additions and 530 deletions

View file

@ -498,6 +498,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if loadFromFile:
# Load empty settings
imp.reload(settings)
settings.initDefaultValues()
# Load data
self.loadEmptyDatas()

View file

@ -58,8 +58,8 @@ defaultTextType = "md"
fullScreenTheme = "spacedreams"
textEditor = {
"background": "#fff",
"fontColor": "#000",
"background": "",
"fontColor": "",
"font": qApp.font().toString(),
"misspelled": "#F00",
"lineSpacing": 100,
@ -73,6 +73,7 @@ textEditor = {
"maxWidth": 0,
"marginsLR": 0,
"marginsTB": 0,
"backgroundTransparent": False,
}
revisions = {
@ -98,6 +99,19 @@ viewMode = "fiction" # simple, fiction
saveToZip = True
dontShowDeleteWarning = False
def initDefaultValues():
"""
Load some default values based on system's settings.
Is called anytime we open/create a project.
"""
global textEditor
if not textEditor["background"]:
from manuskript.ui import style as S
textEditor["background"] = S.base
if not textEditor["fontColor"]:
from manuskript.ui import style as S
textEditor["fontColor"] = S.text
def save(filename=None, protocol=None):
global spellcheck, dict, corkSliderFactor, viewSettings, corkSizeFactor, folderView, lastTab, openIndexes, \
@ -256,6 +270,7 @@ def load(string, fromString=False, protocol=None):
"maxWidth": 0,
"marginsLR": 0,
"marginsTB": 0,
"backgroundTransparent": False, # Added in 0.6.0
}
for k in added:

View file

@ -23,6 +23,7 @@ from manuskript.ui.settings_ui import Ui_Settings
from manuskript.ui.views.outlineView import outlineView
from manuskript.ui.views.textEditView import textEditView
from manuskript.ui.welcome import welcome
from manuskript.ui import style as S
try:
import enchant
@ -164,6 +165,9 @@ class settingsWindow(QWidget, Ui_Settings):
self.btnEditorMisspelledColor.clicked.connect(self.choseEditorMisspelledColor)
self.setButtonColor(self.btnEditorBackgroundColor, opt["background"])
self.btnEditorBackgroundColor.clicked.connect(self.choseEditorBackgroundColor)
self.chkEditorBackgroundTransparent.setChecked(opt["backgroundTransparent"])
self.chkEditorBackgroundTransparent.stateChanged.connect(self.updateEditorSettings)
self.btnEditorColorDefault.clicked.connect(self.restoreEditorColors)
f = QFont()
f.fromString(opt["font"])
self.cmbEditorFontFamily.setCurrentFont(f)
@ -442,7 +446,13 @@ class settingsWindow(QWidget, Ui_Settings):
####################################################################################################
def updateEditorSettings(self):
# Store settings
"""
Stores settings for editor appareance.
"""
# Background
settings.textEditor["backgroundTransparent"] = True if self.chkEditorBackgroundTransparent.checkState() else False
# Font
f = self.cmbEditorFontFamily.currentFont()
f.setPointSize(self.spnEditorFontSize.value())
@ -526,6 +536,13 @@ class settingsWindow(QWidget, Ui_Settings):
self.setButtonColor(self.btnEditorBackgroundColor, color.name())
self.updateEditorSettings()
def restoreEditorColors(self):
settings.textEditor["background"] = S.base
self.setButtonColor(self.btnEditorBackgroundColor, S.base)
settings.textEditor["fontColor"] = S.text
self.setButtonColor(self.btnEditorFontColor, S.text)
self.updateEditorSettings()
####################################################################################################
# STATUS #
####################################################################################################

View file

@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_Settings(object):
def setupUi(self, Settings):
Settings.setObjectName("Settings")
Settings.resize(658, 530)
Settings.resize(658, 632)
self.horizontalLayout_8 = QtWidgets.QHBoxLayout(Settings)
self.horizontalLayout_8.setObjectName("horizontalLayout_8")
self.lstMenu = QtWidgets.QListWidget(Settings)
@ -953,28 +953,53 @@ class Ui_Settings(object):
self.tabViews.addTab(self.tab_3, icon, "")
self.tab_4 = QtWidgets.QWidget()
self.tab_4.setObjectName("tab_4")
self.verticalLayout_22 = QtWidgets.QVBoxLayout(self.tab_4)
self.verticalLayout_22.setObjectName("verticalLayout_22")
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.tab_4)
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
self.verticalLayout_21 = QtWidgets.QVBoxLayout()
self.verticalLayout_21.setObjectName("verticalLayout_21")
self.groupBox_12 = QtWidgets.QGroupBox(self.tab_4)
self.groupBox_17 = QtWidgets.QGroupBox(self.tab_4)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.groupBox_12.setFont(font)
self.groupBox_12.setObjectName("groupBox_12")
self.formLayout_8 = QtWidgets.QFormLayout(self.groupBox_12)
self.formLayout_8.setObjectName("formLayout_8")
self.label_37 = QtWidgets.QLabel(self.groupBox_12)
self.groupBox_17.setFont(font)
self.groupBox_17.setObjectName("groupBox_17")
self.formLayout_12 = QtWidgets.QFormLayout(self.groupBox_17)
self.formLayout_12.setObjectName("formLayout_12")
self.label_43 = QtWidgets.QLabel(self.groupBox_17)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_43.setFont(font)
self.label_43.setObjectName("label_43")
self.formLayout_12.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_43)
self.btnEditorBackgroundColor = QtWidgets.QPushButton(self.groupBox_17)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.btnEditorBackgroundColor.sizePolicy().hasHeightForWidth())
self.btnEditorBackgroundColor.setSizePolicy(sizePolicy)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.btnEditorBackgroundColor.setFont(font)
self.btnEditorBackgroundColor.setText("")
self.btnEditorBackgroundColor.setObjectName("btnEditorBackgroundColor")
self.formLayout_12.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.btnEditorBackgroundColor)
self.chkEditorBackgroundTransparent = QtWidgets.QCheckBox(self.groupBox_17)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.chkEditorBackgroundTransparent.setFont(font)
self.chkEditorBackgroundTransparent.setObjectName("chkEditorBackgroundTransparent")
self.formLayout_12.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.chkEditorBackgroundTransparent)
self.label_37 = QtWidgets.QLabel(self.groupBox_17)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_37.setFont(font)
self.label_37.setObjectName("label_37")
self.formLayout_8.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_37)
self.btnEditorFontColor = QtWidgets.QPushButton(self.groupBox_12)
self.formLayout_12.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_37)
self.btnEditorFontColor = QtWidgets.QPushButton(self.groupBox_17)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@ -986,14 +1011,30 @@ class Ui_Settings(object):
self.btnEditorFontColor.setFont(font)
self.btnEditorFontColor.setText("")
self.btnEditorFontColor.setObjectName("btnEditorFontColor")
self.formLayout_8.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.btnEditorFontColor)
self.formLayout_12.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.btnEditorFontColor)
self.btnEditorColorDefault = QtWidgets.QPushButton(self.groupBox_17)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.btnEditorColorDefault.setFont(font)
self.btnEditorColorDefault.setObjectName("btnEditorColorDefault")
self.formLayout_12.setWidget(3, QtWidgets.QFormLayout.SpanningRole, self.btnEditorColorDefault)
self.verticalLayout_21.addWidget(self.groupBox_17)
self.groupBox_12 = QtWidgets.QGroupBox(self.tab_4)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.groupBox_12.setFont(font)
self.groupBox_12.setObjectName("groupBox_12")
self.formLayout_8 = QtWidgets.QFormLayout(self.groupBox_12)
self.formLayout_8.setObjectName("formLayout_8")
self.label_39 = QtWidgets.QLabel(self.groupBox_12)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_39.setFont(font)
self.label_39.setObjectName("label_39")
self.formLayout_8.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_39)
self.formLayout_8.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_39)
self.cmbEditorFontFamily = QtWidgets.QFontComboBox(self.groupBox_12)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
@ -1006,21 +1047,21 @@ class Ui_Settings(object):
font.setWeight(50)
self.cmbEditorFontFamily.setFont(font)
self.cmbEditorFontFamily.setObjectName("cmbEditorFontFamily")
self.formLayout_8.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.cmbEditorFontFamily)
self.formLayout_8.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.cmbEditorFontFamily)
self.label_38 = QtWidgets.QLabel(self.groupBox_12)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_38.setFont(font)
self.label_38.setObjectName("label_38")
self.formLayout_8.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_38)
self.formLayout_8.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_38)
self.label_36 = QtWidgets.QLabel(self.groupBox_12)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_36.setFont(font)
self.label_36.setObjectName("label_36")
self.formLayout_8.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_36)
self.formLayout_8.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_36)
self.btnEditorMisspelledColor = QtWidgets.QPushButton(self.groupBox_12)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
@ -1033,7 +1074,7 @@ class Ui_Settings(object):
self.btnEditorMisspelledColor.setFont(font)
self.btnEditorMisspelledColor.setText("")
self.btnEditorMisspelledColor.setObjectName("btnEditorMisspelledColor")
self.formLayout_8.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.btnEditorMisspelledColor)
self.formLayout_8.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.btnEditorMisspelledColor)
self.spnEditorFontSize = QtWidgets.QSpinBox(self.groupBox_12)
font = QtGui.QFont()
font.setBold(False)
@ -1043,61 +1084,8 @@ class Ui_Settings(object):
self.spnEditorFontSize.setMaximum(299)
self.spnEditorFontSize.setProperty("value", 10)
self.spnEditorFontSize.setObjectName("spnEditorFontSize")
self.formLayout_8.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.spnEditorFontSize)
self.label_43 = QtWidgets.QLabel(self.groupBox_12)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_43.setFont(font)
self.label_43.setObjectName("label_43")
self.formLayout_8.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_43)
self.btnEditorBackgroundColor = QtWidgets.QPushButton(self.groupBox_12)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.btnEditorBackgroundColor.sizePolicy().hasHeightForWidth())
self.btnEditorBackgroundColor.setSizePolicy(sizePolicy)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.btnEditorBackgroundColor.setFont(font)
self.btnEditorBackgroundColor.setText("")
self.btnEditorBackgroundColor.setObjectName("btnEditorBackgroundColor")
self.formLayout_8.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.btnEditorBackgroundColor)
self.formLayout_8.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.spnEditorFontSize)
self.verticalLayout_21.addWidget(self.groupBox_12)
self.groupBox_15 = QtWidgets.QGroupBox(self.tab_4)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.groupBox_15.setFont(font)
self.groupBox_15.setObjectName("groupBox_15")
self.formLayout_10 = QtWidgets.QFormLayout(self.groupBox_15)
self.formLayout_10.setObjectName("formLayout_10")
self.chkEditorCursorWidth = QtWidgets.QCheckBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.chkEditorCursorWidth.setFont(font)
self.chkEditorCursorWidth.setObjectName("chkEditorCursorWidth")
self.formLayout_10.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.chkEditorCursorWidth)
self.spnEditorCursorWidth = QtWidgets.QSpinBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.spnEditorCursorWidth.setFont(font)
self.spnEditorCursorWidth.setMinimum(0)
self.spnEditorCursorWidth.setMaximum(99)
self.spnEditorCursorWidth.setProperty("value", 9)
self.spnEditorCursorWidth.setObjectName("spnEditorCursorWidth")
self.formLayout_10.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.spnEditorCursorWidth)
self.chkEditorNoBlinking = QtWidgets.QCheckBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.chkEditorNoBlinking.setFont(font)
self.chkEditorNoBlinking.setObjectName("chkEditorNoBlinking")
self.formLayout_10.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.chkEditorNoBlinking)
self.verticalLayout_21.addWidget(self.groupBox_15)
self.groupBox_161 = QtWidgets.QGroupBox(self.tab_4)
font = QtGui.QFont()
font.setBold(True)
@ -1154,6 +1142,8 @@ class Ui_Settings(object):
self.formLayout_11.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.spnEditorMarginsTB)
self.verticalLayout_21.addWidget(self.groupBox_161)
self.horizontalLayout_4.addLayout(self.verticalLayout_21)
self.verticalLayout_22 = QtWidgets.QVBoxLayout()
self.verticalLayout_22.setObjectName("verticalLayout_22")
self.groupBox_13 = QtWidgets.QGroupBox(self.tab_4)
font = QtGui.QFont()
font.setBold(True)
@ -1162,6 +1152,28 @@ class Ui_Settings(object):
self.groupBox_13.setObjectName("groupBox_13")
self.formLayout_9 = QtWidgets.QFormLayout(self.groupBox_13)
self.formLayout_9.setObjectName("formLayout_9")
self.label_35 = QtWidgets.QLabel(self.groupBox_13)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_35.setFont(font)
self.label_35.setObjectName("label_35")
self.formLayout_9.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_35)
self.cmbEditorAlignment = QtWidgets.QComboBox(self.groupBox_13)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.cmbEditorAlignment.setFont(font)
self.cmbEditorAlignment.setObjectName("cmbEditorAlignment")
icon = QtGui.QIcon.fromTheme("format-justify-left")
self.cmbEditorAlignment.addItem(icon, "")
icon = QtGui.QIcon.fromTheme("format-justify-center")
self.cmbEditorAlignment.addItem(icon, "")
icon = QtGui.QIcon.fromTheme("format-justify-right")
self.cmbEditorAlignment.addItem(icon, "")
icon = QtGui.QIcon.fromTheme("format-justify-fill")
self.cmbEditorAlignment.addItem(icon, "")
self.formLayout_9.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbEditorAlignment)
self.label_40 = QtWidgets.QLabel(self.groupBox_13)
font = QtGui.QFont()
font.setBold(False)
@ -1267,30 +1279,41 @@ class Ui_Settings(object):
self.spnEditorParaBelow.setProperty("value", 5)
self.spnEditorParaBelow.setObjectName("spnEditorParaBelow")
self.formLayout_9.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.spnEditorParaBelow)
self.label_35 = QtWidgets.QLabel(self.groupBox_13)
self.verticalLayout_22.addWidget(self.groupBox_13)
self.groupBox_15 = QtWidgets.QGroupBox(self.tab_4)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.groupBox_15.setFont(font)
self.groupBox_15.setObjectName("groupBox_15")
self.formLayout_10 = QtWidgets.QFormLayout(self.groupBox_15)
self.formLayout_10.setObjectName("formLayout_10")
self.chkEditorCursorWidth = QtWidgets.QCheckBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_35.setFont(font)
self.label_35.setObjectName("label_35")
self.formLayout_9.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_35)
self.cmbEditorAlignment = QtWidgets.QComboBox(self.groupBox_13)
self.chkEditorCursorWidth.setFont(font)
self.chkEditorCursorWidth.setObjectName("chkEditorCursorWidth")
self.formLayout_10.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.chkEditorCursorWidth)
self.spnEditorCursorWidth = QtWidgets.QSpinBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.cmbEditorAlignment.setFont(font)
self.cmbEditorAlignment.setObjectName("cmbEditorAlignment")
icon = QtGui.QIcon.fromTheme("format-justify-left")
self.cmbEditorAlignment.addItem(icon, "")
icon = QtGui.QIcon.fromTheme("format-justify-center")
self.cmbEditorAlignment.addItem(icon, "")
icon = QtGui.QIcon.fromTheme("format-justify-right")
self.cmbEditorAlignment.addItem(icon, "")
icon = QtGui.QIcon.fromTheme("format-justify-fill")
self.cmbEditorAlignment.addItem(icon, "")
self.formLayout_9.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cmbEditorAlignment)
self.horizontalLayout_4.addWidget(self.groupBox_13)
self.verticalLayout_22.addLayout(self.horizontalLayout_4)
self.spnEditorCursorWidth.setFont(font)
self.spnEditorCursorWidth.setMinimum(0)
self.spnEditorCursorWidth.setMaximum(99)
self.spnEditorCursorWidth.setProperty("value", 9)
self.spnEditorCursorWidth.setObjectName("spnEditorCursorWidth")
self.formLayout_10.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.spnEditorCursorWidth)
self.chkEditorNoBlinking = QtWidgets.QCheckBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.chkEditorNoBlinking.setFont(font)
self.chkEditorNoBlinking.setObjectName("chkEditorNoBlinking")
self.formLayout_10.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.chkEditorNoBlinking)
self.verticalLayout_22.addWidget(self.groupBox_15)
self.horizontalLayout_4.addLayout(self.verticalLayout_22)
icon = QtGui.QIcon.fromTheme("view-text")
self.tabViews.addTab(self.tab_4, icon, "")
self.verticalLayout_9.addWidget(self.tabViews)
@ -1798,7 +1821,7 @@ class Ui_Settings(object):
self.retranslateUi(Settings)
self.stack.setCurrentIndex(2)
self.tabViews.setCurrentIndex(0)
self.tabViews.setCurrentIndex(3)
self.themeStack.setCurrentIndex(1)
self.themeEditStack.setCurrentIndex(3)
self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex)
@ -1873,13 +1896,13 @@ class Ui_Settings(object):
self.lblTreeIconSize.setText(_translate("Settings", "TextLabel"))
self.groupBox_8.setTitle(_translate("Settings", "Folders"))
self.rdoTreeItemCount.setText(_translate("Settings", "Show ite&m count"))
self.rdoTreeWC.setText(_translate("Settings", "Show wordcount"))
self.rdoTreeProgress.setText(_translate("Settings", "Show progress"))
self.rdoTreeSummary.setText(_translate("Settings", "Show summary"))
self.rdoTreeWC.setText(_translate("Settings", "Show &wordcount"))
self.rdoTreeProgress.setText(_translate("Settings", "S&how progress"))
self.rdoTreeSummary.setText(_translate("Settings", "Show summar&y"))
self.rdoTreeNothing.setText(_translate("Settings", "&Nothing"))
self.groupBox_9.setTitle(_translate("Settings", "Text"))
self.rdoTreeTextWC.setText(_translate("Settings", "Show wordcount"))
self.rdoTreeTextProgress.setText(_translate("Settings", "Show progress"))
self.rdoTreeTextWC.setText(_translate("Settings", "&Show wordcount"))
self.rdoTreeTextProgress.setText(_translate("Settings", "Show p&rogress"))
self.rdoTreeTextSummary.setText(_translate("Settings", "Show summary"))
self.rdoTreeTextNothing.setText(_translate("Settings", "Nothing"))
self.tabViews.setTabText(self.tabViews.indexOf(self.tab), _translate("Settings", "Tree"))
@ -1917,8 +1940,8 @@ class Ui_Settings(object):
self.btnCorkColor.setShortcut(_translate("Settings", "Ctrl+S"))
self.label_16.setText(_translate("Settings", "Image:"))
self.groupBox_11.setTitle(_translate("Settings", "Style"))
self.rdoCorkOldStyle.setText(_translate("Settings", "Old style"))
self.rdoCorkNewStyle.setText(_translate("Settings", "New style"))
self.rdoCorkOldStyle.setText(_translate("Settings", "Old st&yle"))
self.rdoCorkNewStyle.setText(_translate("Settings", "Ne&w style"))
self.groupBox_5.setTitle(_translate("Settings", "Item colors"))
self.label_9.setText(_translate("Settings", "Icon color:"))
self.cmbCorkIcon.setItemText(0, _translate("Settings", "Nothing"))
@ -1951,16 +1974,15 @@ class Ui_Settings(object):
self.cmbCorkCorner.setItemText(3, _translate("Settings", "Progress"))
self.cmbCorkCorner.setItemText(4, _translate("Settings", "Compile"))
self.tabViews.setTabText(self.tabViews.indexOf(self.tab_3), _translate("Settings", "Index cards"))
self.groupBox_12.setTitle(_translate("Settings", "Font"))
self.groupBox_17.setTitle(_translate("Settings", "Colors"))
self.label_43.setText(_translate("Settings", "Background:"))
self.chkEditorBackgroundTransparent.setText(_translate("Settings", "Transparent"))
self.label_37.setText(_translate("Settings", "Color:"))
self.btnEditorColorDefault.setText(_translate("Settings", "Restore defaults"))
self.groupBox_12.setTitle(_translate("Settings", "Font"))
self.label_39.setText(_translate("Settings", "Family:"))
self.label_38.setText(_translate("Settings", "Size:"))
self.label_36.setText(_translate("Settings", "Misspelled:"))
self.label_43.setText(_translate("Settings", "Background:"))
self.groupBox_15.setTitle(_translate("Settings", "Cursor"))
self.chkEditorCursorWidth.setText(_translate("Settings", "Use block insertion of"))
self.spnEditorCursorWidth.setSuffix(_translate("Settings", " px"))
self.chkEditorNoBlinking.setText(_translate("Settings", "Disable blinking"))
self.groupBox_161.setTitle(_translate("Settings", "Text area"))
self.chkEditorMaxWidth.setText(_translate("Settings", "Max width"))
self.spnEditorMaxWidth.setSuffix(_translate("Settings", " px"))
@ -1969,6 +1991,11 @@ class Ui_Settings(object):
self.label_55.setText(_translate("Settings", "Top/Bottom margins:"))
self.spnEditorMarginsTB.setSuffix(_translate("Settings", " px"))
self.groupBox_13.setTitle(_translate("Settings", "Paragraphs"))
self.label_35.setText(_translate("Settings", "Alignment:"))
self.cmbEditorAlignment.setItemText(0, _translate("Settings", "Left"))
self.cmbEditorAlignment.setItemText(1, _translate("Settings", "Center"))
self.cmbEditorAlignment.setItemText(2, _translate("Settings", "Right"))
self.cmbEditorAlignment.setItemText(3, _translate("Settings", "Justify"))
self.label_40.setText(_translate("Settings", "Line spacing:"))
self.cmbEditorLineSpacing.setItemText(0, _translate("Settings", "Single"))
self.cmbEditorLineSpacing.setItemText(1, _translate("Settings", "1.5 lines"))
@ -1981,11 +2008,10 @@ class Ui_Settings(object):
self.label_41.setText(_translate("Settings", "Spacing:"))
self.spnEditorParaAbove.setSuffix(_translate("Settings", " px"))
self.spnEditorParaBelow.setSuffix(_translate("Settings", " px"))
self.label_35.setText(_translate("Settings", "Alignment:"))
self.cmbEditorAlignment.setItemText(0, _translate("Settings", "Left"))
self.cmbEditorAlignment.setItemText(1, _translate("Settings", "Center"))
self.cmbEditorAlignment.setItemText(2, _translate("Settings", "Right"))
self.cmbEditorAlignment.setItemText(3, _translate("Settings", "Justify"))
self.groupBox_15.setTitle(_translate("Settings", "Cursor"))
self.chkEditorCursorWidth.setText(_translate("Settings", "Use block insertion of"))
self.spnEditorCursorWidth.setSuffix(_translate("Settings", " px"))
self.chkEditorNoBlinking.setText(_translate("Settings", "Disable blinking"))
self.tabViews.setTabText(self.tabViews.indexOf(self.tab_4), _translate("Settings", "Text editor"))
self.lblTitleLabels.setText(_translate("Settings", "Labels"))
self.btnLabelColor.setShortcut(_translate("Settings", "Ctrl+S"))

File diff suppressed because it is too large Load diff

View file

@ -374,6 +374,8 @@ class welcome(QWidget, Ui_welcome):
# Empty settings
imp.reload(settings)
settings.initDefaultValues()
if self.template:
t = [i for i in self.templates() if i[0] == self.template[0]]
if t and t[0][2] == "Non-fiction":