diff --git a/manuskript/enums.py b/manuskript/enums.py index 8cc17e91..8fa68a58 100644 --- a/manuskript/enums.py +++ b/manuskript/enums.py @@ -51,7 +51,7 @@ class Outline(Enum): title = 0 ID = 1 type = 2 - summarySentance = 3 + summarySentence = 3 summaryFull = 4 POV = 5 notes = 6 diff --git a/manuskript/ui/compileDialog_ui.py b/manuskript/ui/compileDialog_ui.py index 6000e975..d302b5fc 100644 --- a/manuskript/ui/compileDialog_ui.py +++ b/manuskript/ui/compileDialog_ui.py @@ -2,11 +2,12 @@ # Form implementation generated from reading ui file 'manuskript/ui/compileDialog_ui.ui' # -# Created by: PyQt5 UI code generator 5.4.1 +# Created: Wed Mar 2 00:30:17 2016 +# by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! -from PyQt5 import QtCore, QtWidgets +from PyQt5 import QtCore, QtGui, QtWidgets class Ui_compileDialog(object): def setupUi(self, compileDialog): diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index fd4b7f94..793c2d8e 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui' # -# Created: Sun Feb 28 13:22:17 2016 +# Created: Wed Mar 2 00:30:17 2016 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -1303,18 +1303,18 @@ class Ui_MainWindow(object): self.actCompile.setShortcut(_translate("MainWindow", "F6")) self.actToolFrequency.setText(_translate("MainWindow", "&Frequency Analyzer")) -from manuskript.ui.views.lineEditView import lineEditView -from manuskript.ui.cheatSheet import cheatSheet -from manuskript.ui.editors.mainEditor import mainEditor -from manuskript.ui.views.outlineView import outlineView -from manuskript.ui.views.treeView import treeView -from manuskript.ui.views.textEditView import textEditView from manuskript.ui.views.storylineView import storylineView +from manuskript.ui.views.textEditView import textEditView +from manuskript.ui.views.lineEditView import lineEditView +from manuskript.ui.views.treeView import treeView +from manuskript.ui.editors.mainEditor import mainEditor +from manuskript.ui.views.basicItemView import basicItemView from manuskript.ui.views.persoTreeView import persoTreeView from manuskript.ui.views.plotTreeView import plotTreeView -from manuskript.ui.search import search -from manuskript.ui.views.basicItemView import basicItemView -from manuskript.ui.welcome import welcome +from manuskript.ui.views.outlineView import outlineView +from manuskript.ui.views.metadataView import metadataView +from manuskript.ui.cheatSheet import cheatSheet from manuskript.ui.views.textEditCompleter import textEditCompleter from manuskript.ui.sldImportance import sldImportance -from manuskript.ui.views.metadataView import metadataView +from manuskript.ui.welcome import welcome +from manuskript.ui.search import search diff --git a/manuskript/ui/revisions_ui.py b/manuskript/ui/revisions_ui.py index c6e26ea2..6052e8ef 100644 --- a/manuskript/ui/revisions_ui.py +++ b/manuskript/ui/revisions_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/revisions_ui.ui' # -# Created: Tue Jul 14 19:00:07 2015 +# Created: Wed Mar 2 00:30:17 2016 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! diff --git a/manuskript/ui/settings_ui.py b/manuskript/ui/settings_ui.py index 3a0fd0fb..19b1c2e6 100644 --- a/manuskript/ui/settings_ui.py +++ b/manuskript/ui/settings_ui.py @@ -2,7 +2,8 @@ # Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui' # -# Created by: PyQt5 UI code generator 5.4.2 +# Created: Wed Mar 2 00:30:17 2016 +# by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -1320,6 +1321,7 @@ class Ui_Settings(object): self.layoutWidget = QtWidgets.QWidget(self.splitter) self.layoutWidget.setObjectName("layoutWidget") self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.layoutWidget) + self.verticalLayout_14.setContentsMargins(0, 0, 0, 0) self.verticalLayout_14.setObjectName("verticalLayout_14") self.cmbThemeEdit = QtWidgets.QComboBox(self.layoutWidget) self.cmbThemeEdit.setObjectName("cmbThemeEdit") diff --git a/manuskript/ui/views/basicItemView.py b/manuskript/ui/views/basicItemView.py index 77a47b2a..2da5fe96 100644 --- a/manuskript/ui/views/basicItemView.py +++ b/manuskript/ui/views/basicItemView.py @@ -43,14 +43,14 @@ class basicItemView(QWidget, Ui_basicItemView): elif len(indexes) == 1: self.setEnabled(True) idx = indexes[0] - self.txtSummarySentance.setCurrentModelIndex(idx) + self.txtSummarySentence.setCurrentModelIndex(idx) self.txtSummaryFull.setCurrentModelIndex(idx) self.cmbPOV.setCurrentModelIndex(idx) self.txtGoal.setCurrentModelIndex(idx) else: self.setEnabled(True) - self.txtSummarySentance.setCurrentModelIndexes(indexes) + self.txtSummarySentence.setCurrentModelIndexes(indexes) self.txtSummaryFull.setCurrentModelIndexes(indexes) self.cmbPOV.setCurrentModelIndexes(indexes) self.txtGoal.setCurrentModelIndexes(indexes) diff --git a/manuskript/ui/views/basicItemView_ui.py b/manuskript/ui/views/basicItemView_ui.py index 94da0b0b..6be70e81 100644 --- a/manuskript/ui/views/basicItemView_ui.py +++ b/manuskript/ui/views/basicItemView_ui.py @@ -2,7 +2,8 @@ # Form implementation generated from reading ui file 'manuskript/ui/views/basicItemView_ui.ui' # -# Created by: PyQt5 UI code generator 5.4.2 +# Created: Wed Mar 2 00:33:34 2016 +# by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -67,5 +68,5 @@ class Ui_basicItemView(object): self.label_9.setText(_translate("basicItemView", "Few sentences summary:")) from manuskript.ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser -from manuskript.ui.views.lineEditView import lineEditView from manuskript.ui.views.textEditView import textEditView +from manuskript.ui.views.lineEditView import lineEditView diff --git a/manuskript/ui/views/basicItemView_ui.ui b/manuskript/ui/views/basicItemView_ui.ui index e632ec22..64552858 100644 --- a/manuskript/ui/views/basicItemView_ui.ui +++ b/manuskript/ui/views/basicItemView_ui.ui @@ -84,7 +84,7 @@ - + diff --git a/manuskript/ui/views/metadataView.py b/manuskript/ui/views/metadataView.py index 52affbac..4791f5b1 100644 --- a/manuskript/ui/views/metadataView.py +++ b/manuskript/ui/views/metadataView.py @@ -49,7 +49,7 @@ class metadataView(QWidget, Ui_metadataView): elif len(indexes) == 1: self.setEnabled(True) idx = indexes[0] - self.txtSummarySentance.setCurrentModelIndex(idx) + self.txtSummarySentence.setCurrentModelIndex(idx) self.txtSummaryFull.setCurrentModelIndex(idx) self.txtNotes.setCurrentModelIndex(idx) self.revisions.setEnabled(True) @@ -57,7 +57,7 @@ class metadataView(QWidget, Ui_metadataView): else: self.setEnabled(True) - self.txtSummarySentance.setCurrentModelIndexes(indexes) + self.txtSummarySentence.setCurrentModelIndexes(indexes) self.txtSummaryFull.setCurrentModelIndexes(indexes) self.txtNotes.setCurrentModelIndexes(indexes) self.revisions.setEnabled(False) diff --git a/manuskript/ui/views/metadataView_ui.py b/manuskript/ui/views/metadataView_ui.py index a5c759d7..a2034baf 100644 --- a/manuskript/ui/views/metadataView_ui.py +++ b/manuskript/ui/views/metadataView_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/views/metadataView_ui.ui' # -# Created: Mon Feb 8 09:48:05 2016 +# Created: Wed Mar 2 00:30:18 2016 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -101,9 +101,9 @@ class Ui_metadataView(object): self.txtNotes.setPlaceholderText(_translate("metadataView", "Notes / References")) self.grpRevisions.setTitle(_translate("metadataView", "Revisions")) -from manuskript.ui.revisions import revisions +from manuskript.ui.views.lineEditView import lineEditView from manuskript.ui.views.propertiesView import propertiesView from manuskript.ui.views.textEditCompleter import textEditCompleter from manuskript.ui.views.textEditView import textEditView -from manuskript.ui.views.lineEditView import lineEditView from manuskript.ui.collapsibleGroupBox2 import collapsibleGroupBox2 +from manuskript.ui.revisions import revisions diff --git a/manuskript/ui/views/propertiesView_ui.py b/manuskript/ui/views/propertiesView_ui.py index 43c7215d..0d9a56e2 100644 --- a/manuskript/ui/views/propertiesView_ui.py +++ b/manuskript/ui/views/propertiesView_ui.py @@ -2,7 +2,8 @@ # Form implementation generated from reading ui file 'manuskript/ui/views/propertiesView_ui.ui' # -# Created by: PyQt5 UI code generator 5.4.2 +# Created: Wed Mar 2 00:30:18 2016 +# by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -107,8 +108,8 @@ class Ui_propertiesView(object): self.page_2 = QtWidgets.QWidget() self.page_2.setObjectName("page_2") self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.page_2) - self.verticalLayout_3.setContentsMargins(0, 0, 0, 0) self.verticalLayout_3.setSpacing(0) + self.verticalLayout_3.setContentsMargins(0, 0, 0, 0) self.verticalLayout_3.setObjectName("verticalLayout_3") self.formLayout_2 = QtWidgets.QFormLayout() self.formLayout_2.setObjectName("formLayout_2") @@ -194,9 +195,9 @@ class Ui_propertiesView(object): self.label_36.setText(_translate("propertiesView", "Goal")) self.txtGoalMulti.setPlaceholderText(_translate("propertiesView", "Word count")) +from manuskript.ui.views.cmbOutlineStatusChoser import cmbOutlineStatusChoser +from manuskript.ui.views.lineEditView import lineEditView from manuskript.ui.views.chkOutlineCompile import chkOutlineCompile from manuskript.ui.views.cmbOutlineLabelChoser import cmbOutlineLabelChoser -from manuskript.ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser -from manuskript.ui.views.cmbOutlineStatusChoser import cmbOutlineStatusChoser from manuskript.ui.views.cmbOutlineTypeChoser import cmbOutlineTypeChoser -from manuskript.ui.views.lineEditView import lineEditView +from manuskript.ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser