From 961bac7e16c0c3bd66562e11bd1952738352bb55 Mon Sep 17 00:00:00 2001 From: Jan Wester Date: Sun, 22 Sep 2019 18:54:47 +0200 Subject: [PATCH] UI enforces >=1 revision kept per timespan --- manuskript/ui/settings_ui.py | 16 +++++++++------- manuskript/ui/settings_ui.ui | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/manuskript/ui/settings_ui.py b/manuskript/ui/settings_ui.py index c535675..0e7cd90 100644 --- a/manuskript/ui/settings_ui.py +++ b/manuskript/ui/settings_ui.py @@ -2,12 +2,14 @@ # Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui' # -# Created by: PyQt5 UI code generator 5.9 +# Created by: PyQt5 UI code generator 5.13.0 # # WARNING! All changes made in this file will be lost! + from PyQt5 import QtCore, QtGui, QtWidgets + class Ui_Settings(object): def setupUi(self, Settings): Settings.setObjectName("Settings") @@ -288,6 +290,7 @@ class Ui_Settings(object): font.setWeight(50) self.spnRevisions10Mn.setFont(font) self.spnRevisions10Mn.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spnRevisions10Mn.setMinimum(1) self.spnRevisions10Mn.setMaximum(999) self.spnRevisions10Mn.setProperty("value", 1) self.spnRevisions10Mn.setObjectName("spnRevisions10Mn") @@ -324,6 +327,7 @@ class Ui_Settings(object): font.setWeight(50) self.spnRevisionsDay.setFont(font) self.spnRevisionsDay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spnRevisionsDay.setMinimum(1) self.spnRevisionsDay.setMaximum(999) self.spnRevisionsDay.setProperty("value", 1) self.spnRevisionsDay.setObjectName("spnRevisionsDay") @@ -339,6 +343,7 @@ class Ui_Settings(object): font.setWeight(50) self.spnRevisionsHour.setFont(font) self.spnRevisionsHour.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spnRevisionsHour.setMinimum(1) self.spnRevisionsHour.setMaximum(999) self.spnRevisionsHour.setProperty("value", 1) self.spnRevisionsHour.setObjectName("spnRevisionsHour") @@ -354,6 +359,7 @@ class Ui_Settings(object): font.setWeight(50) self.spnRevisionsMonth.setFont(font) self.spnRevisionsMonth.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spnRevisionsMonth.setMinimum(1) self.spnRevisionsMonth.setMaximum(999) self.spnRevisionsMonth.setProperty("value", 1) self.spnRevisionsMonth.setObjectName("spnRevisionsMonth") @@ -369,6 +375,7 @@ class Ui_Settings(object): font.setWeight(50) self.spnRevisionsEternity.setFont(font) self.spnRevisionsEternity.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spnRevisionsEternity.setMinimum(1) self.spnRevisionsEternity.setMaximum(999) self.spnRevisionsEternity.setProperty("value", 1) self.spnRevisionsEternity.setObjectName("spnRevisionsEternity") @@ -1532,7 +1539,6 @@ class Ui_Settings(object): self.stackedWidgetPage1_2.setObjectName("stackedWidgetPage1_2") self.formLayout_4 = QtWidgets.QFormLayout(self.stackedWidgetPage1_2) self.formLayout_4.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) - self.formLayout_4.setContentsMargins(0, 0, 0, 0) self.formLayout_4.setObjectName("formLayout_4") self.label_17 = QtWidgets.QLabel(self.stackedWidgetPage1_2) self.label_17.setObjectName("label_17") @@ -1564,7 +1570,6 @@ class Ui_Settings(object): self.stackedWidgetPage2_2.setObjectName("stackedWidgetPage2_2") self.formLayout_5 = QtWidgets.QFormLayout(self.stackedWidgetPage2_2) self.formLayout_5.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) - self.formLayout_5.setContentsMargins(0, 0, 0, 0) self.formLayout_5.setObjectName("formLayout_5") self.label_20 = QtWidgets.QLabel(self.stackedWidgetPage2_2) self.label_20.setObjectName("label_20") @@ -1662,7 +1667,6 @@ class Ui_Settings(object): self.page_2.setObjectName("page_2") self.formLayout_7 = QtWidgets.QFormLayout(self.page_2) self.formLayout_7.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) - self.formLayout_7.setContentsMargins(0, 0, 0, 0) self.formLayout_7.setObjectName("formLayout_7") self.label_29 = QtWidgets.QLabel(self.page_2) self.label_29.setObjectName("label_29") @@ -1712,7 +1716,6 @@ class Ui_Settings(object): self.stackedWidgetPage3_2.setObjectName("stackedWidgetPage3_2") self.formLayout_6 = QtWidgets.QFormLayout(self.stackedWidgetPage3_2) self.formLayout_6.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) - self.formLayout_6.setContentsMargins(0, 0, 0, 0) self.formLayout_6.setObjectName("formLayout_6") self.label_26 = QtWidgets.QLabel(self.stackedWidgetPage3_2) self.label_26.setObjectName("label_26") @@ -1846,7 +1849,7 @@ class Ui_Settings(object): self.label_56.setText(_translate("Settings", "Style:")) self.label_57.setText(_translate("Settings", "Language:")) self.label_58.setText(_translate("Settings", "Font size:")) - self.label_2.setText(_translate("Settings", "You might need to restart manuskript in order for those settings to take effect properly and entirely.")) + self.label_2.setText(_translate("Settings", "Restarting Manuskript ensures all settings take effect.")) self.groupBox_10.setTitle(_translate("Settings", "Loading")) self.chkAutoLoad.setText(_translate("Settings", "Automatically load last project on startup")) self.groupBox.setTitle(_translate("Settings", "Saving")) @@ -2075,4 +2078,3 @@ class Ui_Settings(object): self.cmbThemeAlignment.setItemText(2, _translate("Settings", "Right")) self.cmbThemeAlignment.setItemText(3, _translate("Settings", "Justify")) self.label_53.setText(_translate("Settings", "Alignment")) - diff --git a/manuskript/ui/settings_ui.ui b/manuskript/ui/settings_ui.ui index 239869e..f883c9e 100644 --- a/manuskript/ui/settings_ui.ui +++ b/manuskript/ui/settings_ui.ui @@ -578,6 +578,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + 999 @@ -642,6 +645,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + 999 @@ -667,6 +673,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + 999 @@ -692,6 +701,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + 999 @@ -717,6 +729,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + 999