mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-15 10:22:26 +12:00
Purging types from settings
This commit is contained in:
Olivier Keshavjee
parent
a5b0b6cd95
commit
8e7e953a37
|
|
@ -79,15 +79,6 @@ class settingsWindow(QWidget, Ui_Settings):
|
|||
self.chkAutoLoad.setChecked(autoLoad)
|
||||
self.chkAutoLoad.stateChanged.connect(self.saveSettingsChanged)
|
||||
|
||||
dtt = welcome.defaultTextType()
|
||||
self.cmbDefaultTextType.clear()
|
||||
for t in dtt:
|
||||
self.cmbDefaultTextType.addItem(QIcon.fromTheme(t[2]), t[1], t[0])
|
||||
i = self.cmbDefaultTextType.findData(settings.defaultTextType)
|
||||
if i != -1:
|
||||
self.cmbDefaultTextType.setCurrentIndex(i)
|
||||
self.cmbDefaultTextType.currentIndexChanged.connect(self.saveSettingsChanged)
|
||||
|
||||
# Revisions
|
||||
opt = settings.revisions
|
||||
self.chkRevisionsKeep.setChecked(opt["keep"])
|
||||
|
|
@ -253,7 +244,6 @@ class settingsWindow(QWidget, Ui_Settings):
|
|||
settings.autoSaveNoChangesDelay = int(self.txtAutoSaveNoChanges.text())
|
||||
self.mw.saveTimer.setInterval(settings.autoSaveDelay * 60 * 1000)
|
||||
self.mw.saveTimerNoChanges.setInterval(settings.autoSaveNoChangesDelay * 1000)
|
||||
settings.defaultTextType = self.cmbDefaultTextType.currentData()
|
||||
|
||||
####################################################################################################
|
||||
# REVISION #
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
|
|||
class Ui_Settings(object):
|
||||
def setupUi(self, Settings):
|
||||
Settings.setObjectName("Settings")
|
||||
Settings.resize(658, 585)
|
||||
Settings.resize(658, 507)
|
||||
self.horizontalLayout_8 = QtWidgets.QHBoxLayout(Settings)
|
||||
self.horizontalLayout_8.setObjectName("horizontalLayout_8")
|
||||
self.lstMenu = QtWidgets.QListWidget(Settings)
|
||||
|
|
@ -215,30 +215,6 @@ class Ui_Settings(object):
|
|||
self.chkSaveToZip.setObjectName("chkSaveToZip")
|
||||
self.verticalLayout_6.addWidget(self.chkSaveToZip)
|
||||
self.verticalLayout_7.addWidget(self.groupBox)
|
||||
self.groupBox_11 = QtWidgets.QGroupBox(self.stackedWidgetPage1)
|
||||
font = QtGui.QFont()
|
||||
font.setBold(True)
|
||||
font.setWeight(75)
|
||||
self.groupBox_11.setFont(font)
|
||||
self.groupBox_11.setObjectName("groupBox_11")
|
||||
self.verticalLayout_19 = QtWidgets.QVBoxLayout(self.groupBox_11)
|
||||
self.verticalLayout_19.setObjectName("verticalLayout_19")
|
||||
self.label_35 = QtWidgets.QLabel(self.groupBox_11)
|
||||
font = QtGui.QFont()
|
||||
font.setBold(False)
|
||||
font.setWeight(50)
|
||||
self.label_35.setFont(font)
|
||||
self.label_35.setWordWrap(True)
|
||||
self.label_35.setObjectName("label_35")
|
||||
self.verticalLayout_19.addWidget(self.label_35)
|
||||
self.cmbDefaultTextType = QtWidgets.QComboBox(self.groupBox_11)
|
||||
font = QtGui.QFont()
|
||||
font.setBold(False)
|
||||
font.setWeight(50)
|
||||
self.cmbDefaultTextType.setFont(font)
|
||||
self.cmbDefaultTextType.setObjectName("cmbDefaultTextType")
|
||||
self.verticalLayout_19.addWidget(self.cmbDefaultTextType)
|
||||
self.verticalLayout_7.addWidget(self.groupBox_11)
|
||||
spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
||||
self.verticalLayout_7.addItem(spacerItem2)
|
||||
self.stack.addWidget(self.stackedWidgetPage1)
|
||||
|
|
@ -1673,8 +1649,6 @@ class Ui_Settings(object):
|
|||
self.chkSaveOnQuit.setText(_translate("Settings", "Save on quit"))
|
||||
self.chkSaveToZip.setToolTip(_translate("Settings", "<html><head/><body><p>If you check this option, your project will be save as one single file. Easier to copy or backup, but does not allow collaborative editing, or versionning.<br/>If this is unchecked, your project will be save as a folder containing many small files.</p></body></html>"))
|
||||
self.chkSaveToZip.setText(_translate("Settings", "Save to one single file"))
|
||||
self.groupBox_11.setTitle(_translate("Settings", "Default text format"))
|
||||
self.label_35.setText(_translate("Settings", "The format set by default when you create a new text item. You can change this on a per item basis."))
|
||||
self.lblTitleGeneral_2.setText(_translate("Settings", "Revisions"))
|
||||
self.label_44.setText(_translate("Settings", "Revisions are a way to keep track of modifications. For each text item, it stores any changes you make to the main text, allowing you to see and restoring previous versions."))
|
||||
self.chkRevisionsKeep.setText(_translate("Settings", "Keep revisions"))
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>658</width>
|
||||
<height>585</height>
|
||||
<height>507</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -424,47 +424,6 @@ text-align:center;</string>
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_11">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Default text format</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_19">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_35">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>The format set by default when you create a new text item. You can change this on a per item basis.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="cmbDefaultTextType">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
|
|
|
|||
Loading…
Reference in a new issue