diff --git a/manuskript/mainWindow.py b/manuskript/mainWindow.py index 7054a94..dd771ff 100644 --- a/manuskript/mainWindow.py +++ b/manuskript/mainWindow.py @@ -94,22 +94,6 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.mprWordCount.setMapping(t, i) self.mprWordCount.mapped.connect(self.wordCount) - # Snowflake Method Cycle - self.mapperCycle = QSignalMapper(self) - for t, i in [ - (self.btnStepTwo, 0), - (self.btnStepThree, 1), - (self.btnStepFour, 2), - (self.btnStepFive, 3), - (self.btnStepSix, 4), - (self.btnStepSeven, 5), - (self.btnStepEight, 6) - ]: - t.clicked.connect(self.mapperCycle.map) - self.mapperCycle.setMapping(t, i) - - self.mapperCycle.mapped.connect(self.clickCycle) - self.cmbSummary.currentIndexChanged.connect(self.summaryPageChanged) self.cmbSummary.setCurrentIndex(0) self.cmbSummary.currentIndexChanged.emit(0) @@ -292,20 +276,6 @@ class MainWindow(QMainWindow, Ui_MainWindow): pName=pName[:-4] return pName - ############################################################################### - # SUMMARY - ############################################################################### - - def summaryPageChanged(self, index): - fractalButtons = [ - self.btnStepTwo, - self.btnStepThree, - self.btnStepFive, - self.btnStepSeven, - ] - for b in fractalButtons: - b.setVisible(fractalButtons.index(b) == index) - ############################################################################### # OUTLINE ############################################################################### @@ -1246,28 +1216,6 @@ class MainWindow(QMainWindow, Ui_MainWindow): # GENERAL AKA UNSORTED ############################################################################### - def clickCycle(self, i): - if i == 0: # step 2 - paragraph summary - self.tabMain.setCurrentIndex(self.TabSummary) - self.tabSummary.setCurrentIndex(1) - if i == 1: # step 3 - characters summary - self.tabMain.setCurrentIndex(self.TabPersos) - self.tabPersos.setCurrentIndex(0) - if i == 2: # step 4 - page summary - self.tabMain.setCurrentIndex(self.TabSummary) - self.tabSummary.setCurrentIndex(2) - if i == 3: # step 5 - characters description - self.tabMain.setCurrentIndex(self.TabPersos) - self.tabPersos.setCurrentIndex(1) - if i == 4: # step 6 - four page synopsis - self.tabMain.setCurrentIndex(self.TabSummary) - self.tabSummary.setCurrentIndex(3) - if i == 5: # step 7 - full character charts - self.tabMain.setCurrentIndex(self.TabPersos) - self.tabPersos.setCurrentIndex(2) - if i == 6: # step 8 - scene list - self.tabMain.setCurrentIndex(self.TabPlots) - def wordCount(self, i): src = { diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index 36c4277..f24b1e5 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'mainWindow.ui' +# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui' # -# Created by: PyQt5 UI code generator 5.15.6 +# Created by: PyQt5 UI code generator 5.15.7 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -137,14 +137,18 @@ class Ui_MainWindow(object): self.label_9 = QtWidgets.QLabel(self.lytTabSummary) font = QtGui.QFont() font.setBold(True) - font.setWeight(75) self.label_9.setFont(font) self.label_9.setObjectName("label_9") self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_9) + self.lytSituation = QtWidgets.QVBoxLayout() + self.lytSituation.setObjectName("lytSituation") + self.txtSummarySituation = lineEditView(self.lytTabSummary) + self.txtSummarySituation.setObjectName("txtSummarySituation") + self.lytSituation.addWidget(self.txtSummarySituation) + self.formLayout_5.setLayout(0, QtWidgets.QFormLayout.FieldRole, self.lytSituation) self.label_29 = QtWidgets.QLabel(self.lytTabSummary) font = QtGui.QFont() font.setBold(True) - font.setWeight(75) self.label_29.setFont(font) self.label_29.setObjectName("label_29") self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_29) @@ -293,37 +297,6 @@ class Ui_MainWindow(object): self.horizontalLayout_8.addLayout(self.verticalLayout_4) self.tabSummary.addWidget(self.tabSummaryPage4) self.formLayout_5.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.tabSummary) - self.horizontalLayout_5 = QtWidgets.QHBoxLayout() - self.horizontalLayout_5.setObjectName("horizontalLayout_5") - spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem9) - self.btnStepThree = QtWidgets.QPushButton(self.lytTabSummary) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepThree.setIcon(icon) - self.btnStepThree.setObjectName("btnStepThree") - self.horizontalLayout_5.addWidget(self.btnStepThree) - self.btnStepTwo = QtWidgets.QPushButton(self.lytTabSummary) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepTwo.setIcon(icon) - self.btnStepTwo.setObjectName("btnStepTwo") - self.horizontalLayout_5.addWidget(self.btnStepTwo) - self.btnStepFive = QtWidgets.QPushButton(self.lytTabSummary) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepFive.setIcon(icon) - self.btnStepFive.setObjectName("btnStepFive") - self.horizontalLayout_5.addWidget(self.btnStepFive) - self.btnStepSeven = QtWidgets.QPushButton(self.lytTabSummary) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepSeven.setIcon(icon) - self.btnStepSeven.setObjectName("btnStepSeven") - self.horizontalLayout_5.addWidget(self.btnStepSeven) - self.formLayout_5.setLayout(3, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_5) - self.lytSituation = QtWidgets.QVBoxLayout() - self.lytSituation.setObjectName("lytSituation") - self.txtSummarySituation = lineEditView(self.lytTabSummary) - self.txtSummarySituation.setObjectName("txtSummarySituation") - self.lytSituation.addWidget(self.txtSummarySituation) - self.formLayout_5.setLayout(0, QtWidgets.QFormLayout.FieldRole, self.lytSituation) self.verticalLayout_24.addLayout(self.formLayout_5) self.tabMain.addTab(self.lytTabSummary, "") self.lytTabPersos = QtWidgets.QWidget() @@ -381,7 +354,7 @@ class Ui_MainWindow(object): self.scrollAreaPersoInfos.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) self.scrollAreaPersoInfos.setObjectName("scrollAreaPersoInfos") self.scrollAreaPersoInfosWidget = QtWidgets.QWidget() - self.scrollAreaPersoInfosWidget.setGeometry(QtCore.QRect(0, 0, 429, 719)) + self.scrollAreaPersoInfosWidget.setGeometry(QtCore.QRect(0, 0, 453, 699)) self.scrollAreaPersoInfosWidget.setObjectName("scrollAreaPersoInfosWidget") self.formLayout_8 = QtWidgets.QFormLayout(self.scrollAreaPersoInfosWidget) self.formLayout_8.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) @@ -399,6 +372,9 @@ class Ui_MainWindow(object): self.btnPersoColor.setObjectName("btnPersoColor") self.horizontalLayout_3.addWidget(self.btnPersoColor) self.formLayout_8.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_3) + self.label_18 = QtWidgets.QLabel(self.scrollAreaPersoInfosWidget) + self.label_18.setObjectName("label_18") + self.formLayout_8.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_18) self.horizontalLayout_20 = QtWidgets.QHBoxLayout() self.horizontalLayout_20.setObjectName("horizontalLayout_20") self.sldPersoImportance = sldImportance(self.scrollAreaPersoInfosWidget) @@ -452,20 +428,6 @@ class Ui_MainWindow(object): self.txtPersoSummaryPara = MDEditCompleter(self.scrollAreaPersoInfosWidget) self.txtPersoSummaryPara.setObjectName("txtPersoSummaryPara") self.formLayout_8.setWidget(11, QtWidgets.QFormLayout.FieldRole, self.txtPersoSummaryPara) - self.horizontalLayout_21 = QtWidgets.QHBoxLayout() - self.horizontalLayout_21.setObjectName("horizontalLayout_21") - spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_21.addItem(spacerItem10) - self.btnStepFour = QtWidgets.QPushButton(self.scrollAreaPersoInfosWidget) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepFour.setIcon(icon) - self.btnStepFour.setFlat(True) - self.btnStepFour.setObjectName("btnStepFour") - self.horizontalLayout_21.addWidget(self.btnStepFour) - self.formLayout_8.setLayout(12, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_21) - self.label_18 = QtWidgets.QLabel(self.scrollAreaPersoInfosWidget) - self.label_18.setObjectName("label_18") - self.formLayout_8.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_18) self.scrollAreaPersoInfos.setWidget(self.scrollAreaPersoInfosWidget) self.verticalLayout_20.addWidget(self.scrollAreaPersoInfos) self.tabPersos.addTab(self.info, "") @@ -476,16 +438,6 @@ class Ui_MainWindow(object): self.txtPersoSummaryFull = MDEditCompleter(self.tab_11) self.txtPersoSummaryFull.setObjectName("txtPersoSummaryFull") self.verticalLayout_17.addWidget(self.txtPersoSummaryFull) - self.horizontalLayout_22 = QtWidgets.QHBoxLayout() - self.horizontalLayout_22.setObjectName("horizontalLayout_22") - spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_22.addItem(spacerItem11) - self.btnStepSix = QtWidgets.QPushButton(self.tab_11) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepSix.setIcon(icon) - self.btnStepSix.setObjectName("btnStepSix") - self.horizontalLayout_22.addWidget(self.btnStepSix) - self.verticalLayout_17.addLayout(self.horizontalLayout_22) self.tabPersos.addTab(self.tab_11, "") self.tab_19 = QtWidgets.QWidget() self.tab_19.setObjectName("tab_19") @@ -522,13 +474,8 @@ class Ui_MainWindow(object): self.lineEdit = QtWidgets.QLineEdit(self.tab_12) self.lineEdit.setObjectName("lineEdit") self.horizontalLayout_9.addWidget(self.lineEdit) - spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_9.addItem(spacerItem12) - self.btnStepEight = QtWidgets.QPushButton(self.tab_12) - icon = QtGui.QIcon.fromTheme("go-next") - self.btnStepEight.setIcon(icon) - self.btnStepEight.setObjectName("btnStepEight") - self.horizontalLayout_9.addWidget(self.btnStepEight) + spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_9.addItem(spacerItem9) self.verticalLayout_9.addLayout(self.horizontalLayout_9) self.tabPersos.addTab(self.tab_12, "") self.verticalLayout_25.addWidget(self.splitterPersos) @@ -611,8 +558,8 @@ class Ui_MainWindow(object): self.verticalLayout_12.addWidget(self.lstPlotPerso) self.horizontalLayout_16 = QtWidgets.QHBoxLayout() self.horizontalLayout_16.setObjectName("horizontalLayout_16") - spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_16.addItem(spacerItem13) + spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_16.addItem(spacerItem10) self.btnAddPlotPerso = QtWidgets.QPushButton(self.infos_2) self.btnAddPlotPerso.setText("") icon = QtGui.QIcon.fromTheme("list-add") @@ -680,8 +627,8 @@ class Ui_MainWindow(object): self.btnRmSubPlot.setFlat(True) self.btnRmSubPlot.setObjectName("btnRmSubPlot") self.horizontalLayout_17.addWidget(self.btnRmSubPlot) - spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_17.addItem(spacerItem14) + spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_17.addItem(spacerItem11) self.btnShowSubPlotSummary = QtWidgets.QPushButton(self.tab_15) self.btnShowSubPlotSummary.setText("") icon = QtGui.QIcon.fromTheme("text-x-generic") @@ -890,8 +837,8 @@ class Ui_MainWindow(object): self.btnOutlineRemoveItem.setFlat(True) self.btnOutlineRemoveItem.setObjectName("btnOutlineRemoveItem") self.horizontalLayout_18.addWidget(self.btnOutlineRemoveItem) - spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_18.addItem(spacerItem15) + spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_18.addItem(spacerItem12) self.btnPlanShowDetails = QtWidgets.QPushButton(self.layoutWidget) self.btnPlanShowDetails.setText("") icon = QtGui.QIcon.fromTheme("text-x-generic") @@ -952,8 +899,8 @@ class Ui_MainWindow(object): self.btnRedacRemoveItem.setFlat(True) self.btnRedacRemoveItem.setObjectName("btnRedacRemoveItem") self.horizontalLayout_31.addWidget(self.btnRedacRemoveItem) - spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_31.addItem(spacerItem16) + spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_31.addItem(spacerItem13) self.verticalLayout_30.addLayout(self.horizontalLayout_31) self.mainEditor = mainEditor(self.splitterRedacH) self.mainEditor.setObjectName("mainEditor") @@ -1042,7 +989,7 @@ class Ui_MainWindow(object): self.horizontalLayout_2.addWidget(self.stack) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1112, 21)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1112, 23)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -1082,7 +1029,6 @@ class Ui_MainWindow(object): self.cheatSheet = cheatSheet(self.dockWidgetContents_5) font = QtGui.QFont() font.setBold(False) - font.setWeight(50) self.cheatSheet.setFont(font) self.cheatSheet.setObjectName("cheatSheet") self.verticalLayout_39.addWidget(self.cheatSheet) @@ -1098,7 +1044,6 @@ class Ui_MainWindow(object): self.widget = search(self.dockWidgetContents_6) font = QtGui.QFont() font.setBold(False) - font.setWeight(50) self.widget.setFont(font) self.widget.setObjectName("widget") self.verticalLayout_40.addWidget(self.widget) @@ -1367,7 +1312,7 @@ class Ui_MainWindow(object): self.stack.setCurrentIndex(1) self.tabMain.setCurrentIndex(2) self.tabSummary.setCurrentIndex(0) - self.tabPersos.setCurrentIndex(0) + self.tabPersos.setCurrentIndex(3) self.tabPlot.setCurrentIndex(0) self.comboBox_2.setCurrentIndex(0) self.stkPlotSummary.setCurrentIndex(0) @@ -1395,11 +1340,7 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.txtSummaryPara_2, self.txtSummaryPage) MainWindow.setTabOrder(self.txtSummaryPage, self.txtSummaryPage_2) MainWindow.setTabOrder(self.txtSummaryPage_2, self.txtSummaryFull) - MainWindow.setTabOrder(self.txtSummaryFull, self.btnStepThree) - MainWindow.setTabOrder(self.btnStepThree, self.btnStepTwo) - MainWindow.setTabOrder(self.btnStepTwo, self.btnStepFive) - MainWindow.setTabOrder(self.btnStepFive, self.btnStepSeven) - MainWindow.setTabOrder(self.btnStepSeven, self.txtSummarySituation) + MainWindow.setTabOrder(self.txtSummaryFull, self.txtSummarySituation) MainWindow.setTabOrder(self.txtSummarySituation, self.lstCharacters) MainWindow.setTabOrder(self.lstCharacters, self.btnAddPerso) MainWindow.setTabOrder(self.btnAddPerso, self.btnRmPerso) @@ -1414,16 +1355,13 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.txtPersoConflict, self.txtPersoEpiphany) MainWindow.setTabOrder(self.txtPersoEpiphany, self.txtPersoSummarySentence) MainWindow.setTabOrder(self.txtPersoSummarySentence, self.txtPersoSummaryPara) - MainWindow.setTabOrder(self.txtPersoSummaryPara, self.btnStepFour) - MainWindow.setTabOrder(self.btnStepFour, self.txtPersoSummaryFull) - MainWindow.setTabOrder(self.txtPersoSummaryFull, self.btnStepSix) - MainWindow.setTabOrder(self.btnStepSix, self.txtPersoNotes) + MainWindow.setTabOrder(self.txtPersoSummaryPara, self.txtPersoSummaryFull) + MainWindow.setTabOrder(self.txtPersoSummaryFull, self.txtPersoNotes) MainWindow.setTabOrder(self.txtPersoNotes, self.tblPersoInfos) MainWindow.setTabOrder(self.tblPersoInfos, self.btnPersoAddInfo) MainWindow.setTabOrder(self.btnPersoAddInfo, self.btnPersoRmInfo) MainWindow.setTabOrder(self.btnPersoRmInfo, self.lineEdit) - MainWindow.setTabOrder(self.lineEdit, self.btnStepEight) - MainWindow.setTabOrder(self.btnStepEight, self.lstPlots) + MainWindow.setTabOrder(self.lineEdit, self.lstPlots) MainWindow.setTabOrder(self.lstPlots, self.btnAddPlot) MainWindow.setTabOrder(self.btnAddPlot, self.btnRmPlot) MainWindow.setTabOrder(self.btnRmPlot, self.txtPlotFilter) @@ -1490,6 +1428,7 @@ class Ui_MainWindow(object): self.label_19.setText(_translate("MainWindow", "Email")) self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabOverview), _translate("MainWindow", "General")) self.label_9.setText(_translate("MainWindow", "Situation:")) + self.txtSummarySituation.setPlaceholderText(_translate("MainWindow", "What if...?")) self.label_29.setText(_translate("MainWindow", "Summary:")) self.cmbSummary.setItemText(0, _translate("MainWindow", "One sentence")) self.cmbSummary.setItemText(1, _translate("MainWindow", "One paragraph")) @@ -1502,15 +1441,11 @@ class Ui_MainWindow(object): self.label_17.setText(_translate("MainWindow", "Expand each sentence of your one paragraph summary to a paragraph")) self.label_23.setText(_translate("MainWindow", "One page summary")) self.label_20.setText(_translate("MainWindow", "Full summary")) - self.btnStepThree.setText(_translate("MainWindow", "Next")) - self.btnStepTwo.setText(_translate("MainWindow", "Next")) - self.btnStepFive.setText(_translate("MainWindow", "Next")) - self.btnStepSeven.setText(_translate("MainWindow", "Next")) - self.txtSummarySituation.setPlaceholderText(_translate("MainWindow", "What if...?")) self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabSummary), _translate("MainWindow", "Summary")) self.groupBox.setTitle(_translate("MainWindow", "Names")) self.txtPersosFilter.setPlaceholderText(_translate("MainWindow", "Filter")) self.label_3.setText(_translate("MainWindow", "Name")) + self.label_18.setText(_translate("MainWindow", "Importance")) self.chkPersoPOV.setText(_translate("MainWindow", "Allow POV")) self.label_4.setText(_translate("MainWindow", "Motivation")) self.label_5.setText(_translate("MainWindow", "Goal")) @@ -1518,14 +1453,10 @@ class Ui_MainWindow(object): self.label_7.setText(_translate("MainWindow", "Epiphany")) self.label_24.setText(_translate("MainWindow", "

One sentence
summary

")) self.label_8.setText(_translate("MainWindow", "

One paragraph
summary

")) - self.btnStepFour.setText(_translate("MainWindow", "Next")) - self.label_18.setText(_translate("MainWindow", "Importance")) self.tabPersos.setTabText(self.tabPersos.indexOf(self.info), _translate("MainWindow", "Basic info")) - self.btnStepSix.setText(_translate("MainWindow", "Next")) self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_11), _translate("MainWindow", "Summary")) self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_19), _translate("MainWindow", "Notes")) self.lineEdit.setPlaceholderText(_translate("MainWindow", "Filter")) - self.btnStepEight.setText(_translate("MainWindow", "Next")) self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_12), _translate("MainWindow", "Detailed info")) self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabPersos), _translate("MainWindow", "Characters")) self.groupBox_2.setTitle(_translate("MainWindow", "Plots")) diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui index 8f8258f..a715165 100644 --- a/manuskript/ui/mainWindow.ui +++ b/manuskript/ui/mainWindow.ui @@ -326,7 +326,6 @@ - 75 true @@ -335,11 +334,21 @@ + + + + + + What if...? + + + + + - 75 true @@ -619,78 +628,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Next - - - - .. - - - - - - - Next - - - - .. - - - - - - - Next - - - - .. - - - - - - - Next - - - - .. - - - - - - - - - - - What if...? - - - - - @@ -786,7 +723,7 @@ - 0 + 3 @@ -827,8 +764,8 @@ 0 0 - 429 - 719 + 453 + 699 @@ -856,6 +793,13 @@ + + + + Importance + + + @@ -946,44 +890,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Next - - - - .. - - - true - - - - - - - - - Importance - - - @@ -998,34 +904,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Next - - - - .. - - - - - @@ -1100,17 +978,6 @@ - - - - Next - - - - .. - - - @@ -2127,7 +1994,7 @@ 0 0 1112 - 21 + 23 @@ -2286,7 +2153,6 @@ - 50 false @@ -2320,7 +2186,6 @@ - 50 false @@ -2991,10 +2856,6 @@ txtSummaryPage txtSummaryPage_2 txtSummaryFull - btnStepThree - btnStepTwo - btnStepFive - btnStepSeven txtSummarySituation lstCharacters btnAddPerso @@ -3010,15 +2871,12 @@ txtPersoEpiphany txtPersoSummarySentence txtPersoSummaryPara - btnStepFour txtPersoSummaryFull - btnStepSix txtPersoNotes tblPersoInfos btnPersoAddInfo btnPersoRmInfo lineEdit - btnStepEight lstPlots btnAddPlot btnRmPlot diff --git a/manuskript/ui/settings_ui.py b/manuskript/ui/settings_ui.py index b34d982..90ec80d 100644 --- a/manuskript/ui/settings_ui.py +++ b/manuskript/ui/settings_ui.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'settings_ui.ui' +# Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui' # -# Created by: PyQt5 UI code generator 5.15.0 +# Created by: PyQt5 UI code generator 5.15.7 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -1888,8 +1888,8 @@ class Ui_Settings(object): self.tabViews.setCurrentIndex(0) self.themeStack.setCurrentIndex(0) self.themeEditStack.setCurrentIndex(3) - self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex) - self.chkRevisionsKeep.toggled['bool'].connect(self.chkRevisionRemove.setEnabled) + self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex) # type: ignore + self.chkRevisionsKeep.toggled['bool'].connect(self.chkRevisionRemove.setEnabled) # type: ignore QtCore.QMetaObject.connectSlotsByName(Settings) def retranslateUi(self, Settings): diff --git a/manuskript/ui/views/propertiesView_ui.py b/manuskript/ui/views/propertiesView_ui.py index 2901467..c003e15 100644 --- a/manuskript/ui/views/propertiesView_ui.py +++ b/manuskript/ui/views/propertiesView_ui.py @@ -2,12 +2,15 @@ # Form implementation generated from reading ui file 'manuskript/ui/views/propertiesView_ui.ui' # -# Created by: PyQt5 UI code generator 5.9 +# Created by: PyQt5 UI code generator 5.15.7 # -# WARNING! All changes made in this file will be lost! +# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# run again. Do not edit this file unless you know what you are doing. + from PyQt5 import QtCore, QtGui, QtWidgets + class Ui_propertiesView(object): def setupUi(self, propertiesView): propertiesView.setObjectName("propertiesView") @@ -180,7 +183,6 @@ class Ui_propertiesView(object): self.label_35.setText(_translate("propertiesView", "Compile")) self.label_36.setText(_translate("propertiesView", "Goal")) self.txtGoalMulti.setPlaceholderText(_translate("propertiesView", "Word count")) - from manuskript.ui.views.chkOutlineCompile import chkOutlineCompile from manuskript.ui.views.cmbOutlineCharacterChoser import cmbOutlineCharacterChoser from manuskript.ui.views.cmbOutlineLabelChoser import cmbOutlineLabelChoser