CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-06-18 19:04:33 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tdannecy-master' into develop

Browse source
This commit is contained in:
Olivier Keshavjee 2016-03-02 00:44:51 +01:00
parent ba25abe6a5 ca3d9691ee
commit 6d0d3bcf9b
20 changed files with 116 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -1,5 +1,13 @@
# Change Log
## [0.2.0](https://github.com/olivierkes/manuskript/tree/0.2.0) (2016-02-28)
[Full Changelog](https://github.com/olivierkes/manuskript/compare/0.1.1...0.2.0)
**Closed issues:**
- Fullscreen editor error when text is empty \(wordcount = 0\) [\#3](https://github.com/olivierkes/manuskript/issues/3)
- Save file doesn't automatically add .msk [\#2](https://github.com/olivierkes/manuskript/issues/2)
## [0.1.1](https://github.com/olivierkes/manuskript/tree/0.1.1) (2016-02-08)
[Full Changelog](https://github.com/olivierkes/manuskript/compare/0.1.0...0.1.1)

8
i18n/manuskript_fr.ts
View file

@ -65,12 +65,12 @@
</message>
<message>
<location filename="../manuskript/ui/mainWindow.ui" line="306"/>
<source>One sentance</source>
<source>One sentence</source>
<translation>Une phrase</translation>
</message>
<message>
<location filename="../manuskript/ui/mainWindow.ui" line="381"/>
<source>One sentance summary</source>
<source>One sentence summary</source>
<translation>Résumé en une phrase</translation>
</message>
<message>
@ -160,7 +160,7 @@
</message>
<message>
<location filename="../manuskript/ui/mainWindow.ui" line="775"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;One sentance&lt;br/&gt;summary&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;One sentence&lt;br/&gt;summary&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;Résumé&lt;br/&gt;en une phrase&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
@ -515,7 +515,7 @@
</message>
<message>
<location filename="../manuskript/mainWindow.py" line="828"/>
<source>Take time to think about a one sentance (~50 words) summary of your book. Then expand it to a paragraph, then to a page, then to a full summary.</source>
<source>Take time to think about a one sentence (~50 words) summary of your book. Then expand it to a paragraph, then to a page, then to a full summary.</source>
<translation>Prenez le temps de réfléchir à un résumé de votre livre, en une phrase (~50 mots). Puis augmentez cette phrase en un paragraphe, puis en une page, puis en un résumé complet.</translation>
</message>
<message>

4
manuskript/enums.py
View file

@ -17,7 +17,7 @@ class Perso(Enum):
goal = 4
conflict = 5
epiphany = 6
summarySentance = 7
summarySentence = 7
summaryPara = 8
summaryFull = 9
notes = 10
@ -51,7 +51,7 @@ class Outline(Enum):
title = 0
ID = 1
type = 2
summarySentance = 3
summarySentence = 3
summaryFull = 4
POV = 5
notes = 6

16
manuskript/mainWindow.py
View file

@ -66,7 +66,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# Word count
self.mprWordCount = QSignalMapper(self)
for t, i in [
(self.txtSummarySentance, 0),
(self.txtSummarySentence, 0),
(self.txtSummaryPara, 1),
(self.txtSummaryPage, 2),
(self.txtSummaryFull, 3)
@ -161,7 +161,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.txtPersoGoal,
self.txtPersoConflict,
self.txtPersoEpiphany,
self.txtPersoSummarySentance,
self.txtPersoSummarySentence,
self.txtPersoSummaryPara,
self.txtPersoSummaryFull,
self.txtPersoNotes,
@ -592,8 +592,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# Flat datas (Summary and general infos)
for widget, col in [
(self.txtSummarySituation, 0),
(self.txtSummarySentance, 1),
(self.txtSummarySentance_2, 1),
(self.txtSummarySentence, 1),
(self.txtSummarySentence_2, 1),
(self.txtSummaryPara, 2),
(self.txtSummaryPara_2, 2),
(self.txtPlotSummaryPara, 2),
@ -639,7 +639,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
(self.txtPersoGoal, Perso.goal.value),
(self.txtPersoConflict, Perso.conflict.value),
(self.txtPersoEpiphany, Perso.epiphany.value),
(self.txtPersoSummarySentance, Perso.summarySentance.value),
(self.txtPersoSummarySentence, Perso.summarySentence.value),
(self.txtPersoSummaryPara, Perso.summaryPara.value),
(self.txtPersoSummaryFull, Perso.summaryFull.value),
(self.txtPersoNotes, Perso.notes.value)
@ -787,14 +787,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
def wordCount(self, i):
src = {
0: self.txtSummarySentance,
0: self.txtSummarySentence,
1: self.txtSummaryPara,
2: self.txtSummaryPage,
3: self.txtSummaryFull
}[i]
lbl = {
0: self.lblSummaryWCSentance,
0: self.lblSummaryWCSentence,
1: self.lblSummaryWCPara,
2: self.lblSummaryWCPage,
3: self.lblSummaryWCFull
@ -881,7 +881,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
1),
(self.lytSummary,
self.tr(
"""Take time to think about a one sentance (~50 words) summary of your book. Then expand it to
"""Take time to think about a one sentence (~50 words) summary of your book. Then expand it to
a paragraph, then to a page, then to a full summary."""),
1),
(self.lytTabPersos,

4
manuskript/models/references.py
View file

@ -130,7 +130,7 @@ def infos(ref):
path = " > ".join(pathStr)
# Summaries and notes
ss = item.data(Outline.summarySentance.value)
ss = item.data(Outline.summarySentence.value)
ls = item.data(Outline.summaryFull.value)
notes = item.data(Outline.notes.value)
@ -195,7 +195,7 @@ def infos(ref):
(Perso.goal, qApp.translate("references", "Goal"), False),
(Perso.conflict, qApp.translate("references", "Conflict"), False),
(Perso.epiphany, qApp.translate("references", "Epiphany"), False),
(Perso.summarySentance, qApp.translate("references", "Short summary"), True),
(Perso.summarySentence, qApp.translate("references", "Short summary"), True),
(Perso.summaryPara, qApp.translate("references", "Longer summary"), True),
]:
val = m.data(index.sibling(index.row(), i[0].value))

5
manuskript/ui/compileDialog_ui.py
View file

@ -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):

66
manuskript/ui/mainWindow.py
View file

@ -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!
@ -165,18 +165,18 @@ class Ui_MainWindow(object):
self.label = QtWidgets.QLabel(self.tabSummaryPage1)
self.label.setObjectName("label")
self.verticalLayout_5.addWidget(self.label)
self.txtSummarySentance = textEditView(self.tabSummaryPage1)
self.txtSummarySentence = textEditView(self.tabSummaryPage1)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.txtSummarySentance.sizePolicy().hasHeightForWidth())
self.txtSummarySentance.setSizePolicy(sizePolicy)
self.txtSummarySentance.setObjectName("txtSummarySentance")
self.verticalLayout_5.addWidget(self.txtSummarySentance)
self.lblSummaryWCSentance = QtWidgets.QLabel(self.tabSummaryPage1)
self.lblSummaryWCSentance.setText("")
self.lblSummaryWCSentance.setObjectName("lblSummaryWCSentance")
self.verticalLayout_5.addWidget(self.lblSummaryWCSentance)
sizePolicy.setHeightForWidth(self.txtSummarySentence.sizePolicy().hasHeightForWidth())
self.txtSummarySentence.setSizePolicy(sizePolicy)
self.txtSummarySentence.setObjectName("txtSummarySentence")
self.verticalLayout_5.addWidget(self.txtSummarySentence)
self.lblSummaryWCSentence = QtWidgets.QLabel(self.tabSummaryPage1)
self.lblSummaryWCSentence.setText("")
self.lblSummaryWCSentence.setObjectName("lblSummaryWCSentence")
self.verticalLayout_5.addWidget(self.lblSummaryWCSentence)
spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout_5.addItem(spacerItem5)
self.tabSummary.addWidget(self.tabSummaryPage1)
@ -189,15 +189,15 @@ class Ui_MainWindow(object):
self.label_21 = QtWidgets.QLabel(self.tabSummaryPage2)
self.label_21.setObjectName("label_21")
self.verticalLayout.addWidget(self.label_21)
self.txtSummarySentance_2 = textEditView(self.tabSummaryPage2)
self.txtSummarySentence_2 = textEditView(self.tabSummaryPage2)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.txtSummarySentance_2.sizePolicy().hasHeightForWidth())
self.txtSummarySentance_2.setSizePolicy(sizePolicy)
self.txtSummarySentance_2.setReadOnly(True)
self.txtSummarySentance_2.setObjectName("txtSummarySentance_2")
self.verticalLayout.addWidget(self.txtSummarySentance_2)
sizePolicy.setHeightForWidth(self.txtSummarySentence_2.sizePolicy().hasHeightForWidth())
self.txtSummarySentence_2.setSizePolicy(sizePolicy)
self.txtSummarySentence_2.setReadOnly(True)
self.txtSummarySentence_2.setObjectName("txtSummarySentence_2")
self.verticalLayout.addWidget(self.txtSummarySentence_2)
spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem6)
self.horizontalLayout_4.addLayout(self.verticalLayout)
@ -433,9 +433,9 @@ class Ui_MainWindow(object):
self.txtPersoEpiphany = textEditView(self.infos)
self.txtPersoEpiphany.setObjectName("txtPersoEpiphany")
self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.txtPersoEpiphany)
self.txtPersoSummarySentance = textEditView(self.infos)
self.txtPersoSummarySentance.setObjectName("txtPersoSummarySentance")
self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.txtPersoSummarySentance)
self.txtPersoSummarySentence = textEditView(self.infos)
self.txtPersoSummarySentence.setObjectName("txtPersoSummarySentence")
self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.txtPersoSummarySentence)
self.txtPersoSummaryPara = textEditView(self.infos)
self.txtPersoSummaryPara.setObjectName("txtPersoSummaryPara")
self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.txtPersoSummaryPara)
@ -1196,12 +1196,12 @@ class Ui_MainWindow(object):
self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabOverview), _translate("MainWindow", "General"))
self.label_9.setText(_translate("MainWindow", "Situation:"))
self.label_29.setText(_translate("MainWindow", "Summary:"))
self.cmbSummary.setItemText(0, _translate("MainWindow", "One sentance"))
self.cmbSummary.setItemText(0, _translate("MainWindow", "One sentence"))
self.cmbSummary.setItemText(1, _translate("MainWindow", "One paragraph"))
self.cmbSummary.setItemText(2, _translate("MainWindow", "One page"))
self.cmbSummary.setItemText(3, _translate("MainWindow", "Full"))
self.label.setText(_translate("MainWindow", "One sentance summary"))
self.label_21.setText(_translate("MainWindow", "One sentance summary"))
self.label.setText(_translate("MainWindow", "One sentence summary"))
self.label_21.setText(_translate("MainWindow", "One sentence summary"))
self.label_2.setText(_translate("MainWindow", "One paragraph summary"))
self.label_22.setText(_translate("MainWindow", "One paragraph summary"))
self.label_17.setText(_translate("MainWindow", "Expand each sentence of your one paragraph summary to a paragraph"))
@ -1221,7 +1221,7 @@ class Ui_MainWindow(object):
self.label_5.setText(_translate("MainWindow", "Goal"))
self.label_6.setText(_translate("MainWindow", "Conflict"))
self.label_7.setText(_translate("MainWindow", "Epiphany"))
self.label_24.setText(_translate("MainWindow", "<html><head/><body><p align=\"right\">One sentance<br/>summary</p></body></html>"))
self.label_24.setText(_translate("MainWindow", "<html><head/><body><p align=\"right\">One sentence<br/>summary</p></body></html>"))
self.label_8.setText(_translate("MainWindow", "<html><head/><body><p align=\"right\">One paragraph<br/>summary</p></body></html>"))
self.btnStepFour.setText(_translate("MainWindow", "Next"))
self.tabPersos.setTabText(self.tabPersos.indexOf(self.infos), _translate("MainWindow", "Basic infos"))
@ -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

16
manuskript/ui/mainWindow.ui
View file

@ -342,7 +342,7 @@
<widget class="QComboBox" name="cmbSummary">
<item>
<property name="text">
<string>One sentance</string>
<string>One sentence</string>
</property>
</item>
<item>
@ -374,12 +374,12 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>One sentance summary</string>
<string>One sentence summary</string>
</property>
</widget>
</item>
<item>
<widget class="textEditView" name="txtSummarySentance">
<widget class="textEditView" name="txtSummarySentence">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -389,7 +389,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="lblSummaryWCSentance">
<widget class="QLabel" name="lblSummaryWCSentence">
<property name="text">
<string/>
</property>
@ -417,12 +417,12 @@
<item>
<widget class="QLabel" name="label_21">
<property name="text">
<string>One sentance summary</string>
<string>One sentence summary</string>
</property>
</widget>
</item>
<item>
<widget class="textEditView" name="txtSummarySentance_2">
<widget class="textEditView" name="txtSummarySentence_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -823,7 +823,7 @@
<item row="6" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;One sentance&lt;br/&gt;summary&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;One sentence&lt;br/&gt;summary&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -899,7 +899,7 @@
<widget class="textEditView" name="txtPersoEpiphany"/>
</item>
<item row="6" column="1">
<widget class="textEditView" name="txtPersoSummarySentance"/>
<widget class="textEditView" name="txtPersoSummarySentence"/>
</item>
<item row="7" column="1">
<widget class="textEditView" name="txtPersoSummaryPara"/>

2
manuskript/ui/revisions_ui.py
View file

@ -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!

2
manuskript/ui/search.py
View file

@ -84,7 +84,7 @@ class search(QWidget, Ui_search):
lstColumns = [
("Title", Outline.title.value),
("Text", Outline.text.value),
("Summary", Outline.summarySentance.value),
("Summary", Outline.summarySentence.value),
("Summary", Outline.summaryFull.value),
("Notes", Outline.notes.value),
("POV", Outline.POV.value),

4
manuskript/ui/settings_ui.py
View file

@ -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")

8
manuskript/ui/views/basicItemView.py
View file

@ -10,13 +10,13 @@ class basicItemView(QWidget, Ui_basicItemView):
def __init__(self, parent=None):
QWidget.__init__(self)
self.setupUi(self)
self.txtSummarySentance.setColumn(Outline.summarySentance.value)
self.txtSummarySentence.setColumn(Outline.summarySentence.value)
self.txtSummaryFull.setColumn(Outline.summaryFull.value)
self.txtGoal.setColumn(Outline.setGoal.value)
def setModels(self, mdlOutline, mdlPersos, mdlLabels, mdlStatus):
self.cmbPOV.setModels(mdlPersos, mdlOutline)
self.txtSummarySentance.setModel(mdlOutline)
self.txtSummarySentence.setModel(mdlOutline)
self.txtSummaryFull.setModel(mdlOutline)
self.txtGoal.setModel(mdlOutline)
@ -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)

15
manuskript/ui/views/basicItemView_ui.py
View file

@ -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!
@ -43,10 +44,10 @@ class Ui_basicItemView(object):
self.txtGoal.setObjectName("txtGoal")
self.horizontalLayout_11.addWidget(self.txtGoal)
self.verticalLayout.addLayout(self.horizontalLayout_11)
self.txtSummarySentance = lineEditView(basicItemView)
self.txtSummarySentance.setText("")
self.txtSummarySentance.setObjectName("txtSummarySentance")
self.verticalLayout.addWidget(self.txtSummarySentance)
self.txtSummarySentence = lineEditView(basicItemView)
self.txtSummarySentence.setText("")
self.txtSummarySentence.setObjectName("txtSummarySentence")
self.verticalLayout.addWidget(self.txtSummarySentence)
self.label_9 = QtWidgets.QLabel(basicItemView)
self.label_9.setObjectName("label_9")
self.verticalLayout.addWidget(self.label_9)
@ -63,9 +64,9 @@ class Ui_basicItemView(object):
self.lblPlanPOV.setText(_translate("basicItemView", "POV:"))
self.lblGoal.setText(_translate("basicItemView", "Goal:"))
self.txtGoal.setPlaceholderText(_translate("basicItemView", "Word count"))
self.txtSummarySentance.setPlaceholderText(_translate("basicItemView", "One line summary"))
self.txtSummarySentence.setPlaceholderText(_translate("basicItemView", "One line summary"))
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

2
manuskript/ui/views/basicItemView_ui.ui
View file

@ -84,7 +84,7 @@
</layout>
</item>
<item>
<widget class="lineEditView" name="txtSummarySentance">
<widget class="lineEditView" name="txtSummarySentence">
<property name="text">
<string/>
</property>

16
manuskript/ui/views/corkDelegate.py
View file

@ -38,7 +38,7 @@ class corkDelegate(QStyledItemDelegate):
if self.mainLineRect.contains(self.lastPos):
# One line summary
self.editing = Outline.summarySentance
self.editing = Outline.summarySentence
edt = QLineEdit(parent)
edt.setFocusPolicy(Qt.StrongFocus)
edt.setFrame(False)
@ -74,7 +74,7 @@ class corkDelegate(QStyledItemDelegate):
def updateEditorGeometry(self, editor, option, index):
if self.editing == Outline.summarySentance:
if self.editing == Outline.summarySentence:
# One line summary
editor.setGeometry(self.mainLineRect)
@ -89,9 +89,9 @@ class corkDelegate(QStyledItemDelegate):
def setEditorData(self, editor, index):
item = index.internalPointer()
if self.editing == Outline.summarySentance:
if self.editing == Outline.summarySentence:
# One line summary
editor.setText(item.data(Outline.summarySentance.value))
editor.setText(item.data(Outline.summarySentence.value))
elif self.editing == Outline.title:
# Title
@ -103,9 +103,9 @@ class corkDelegate(QStyledItemDelegate):
def setModelData(self, editor, model, index):
if self.editing == Outline.summarySentance:
if self.editing == Outline.summarySentence:
# One line summary
model.setData(index.sibling(index.row(), Outline.summarySentance.value), editor.text())
model.setData(index.sibling(index.row(), Outline.summarySentence.value), editor.text())
elif self.editing == Outline.title:
# Title
@ -133,7 +133,7 @@ class corkDelegate(QStyledItemDelegate):
self.mainRect.topRight() + QPoint(0, iconSize))
self.mainTextRect = QRect(self.mainLineRect.bottomLeft() + QPoint(0, margin),
self.mainRect.bottomRight())
if not item.data(Outline.summarySentance.value):
if not item.data(Outline.summarySentence.value):
self.mainTextRect.setTopLeft(self.mainLineRect.topLeft())
if item.data(Outline.label.value) in ["", "0"]:
self.titleRect.setBottomRight(self.labelRect.bottomRight() - QPoint(self.margin, self.margin))
@ -218,7 +218,7 @@ class corkDelegate(QStyledItemDelegate):
p.drawLine(self.labelRect.topLeft(), self.labelRect.bottomLeft())
# One line summary background
lineSummary = item.data(Outline.summarySentance.value)
lineSummary = item.data(Outline.summarySentence.value)
fullSummary = item.data(Outline.summaryFull.value)
if lineSummary or not fullSummary:
m = self.margin

8
manuskript/ui/views/metadataView.py
View file

@ -11,14 +11,14 @@ class metadataView(QWidget, Ui_metadataView):
QWidget.__init__(self, parent)
self.setupUi(self)
self._lastIndexes = None
self.txtSummarySentance.setColumn(Outline.summarySentance.value)
self.txtSummarySentence.setColumn(Outline.summarySentence.value)
self.txtSummaryFull.setColumn(Outline.summaryFull.value)
self.txtNotes.setColumn(Outline.notes.value)
self.revisions.setEnabled(False)
def setModels(self, mdlOutline, mdlPersos, mdlLabels, mdlStatus):
self.properties.setModels(mdlOutline, mdlPersos, mdlLabels, mdlStatus)
self.txtSummarySentance.setModel(mdlOutline)
self.txtSummarySentence.setModel(mdlOutline)
self.txtSummaryFull.setModel(mdlOutline)
self.txtNotes.setModel(mdlOutline)
self.revisions.setModel(mdlOutline)
@ -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)

18
manuskript/ui/views/metadataView_ui.py
View file

@ -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!
@ -43,11 +43,11 @@ class Ui_metadataView(object):
self.verticalLayout_22.setSpacing(0)
self.verticalLayout_22.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_22.setObjectName("verticalLayout_22")
self.txtSummarySentance = lineEditView(self.grpSummary)
self.txtSummarySentance.setInputMask("")
self.txtSummarySentance.setFrame(False)
self.txtSummarySentance.setObjectName("txtSummarySentance")
self.verticalLayout_22.addWidget(self.txtSummarySentance)
self.txtSummarySentence = lineEditView(self.grpSummary)
self.txtSummarySentence.setInputMask("")
self.txtSummarySentence.setFrame(False)
self.txtSummarySentence.setObjectName("txtSummarySentence")
self.verticalLayout_22.addWidget(self.txtSummarySentence)
self.line = QtWidgets.QFrame(self.grpSummary)
self.line.setFrameShadow(QtWidgets.QFrame.Plain)
self.line.setLineWidth(0)
@ -95,15 +95,15 @@ class Ui_metadataView(object):
metadataView.setWindowTitle(_translate("metadataView", "Form"))
self.grpProperties.setTitle(_translate("metadataView", "Properties"))
self.grpSummary.setTitle(_translate("metadataView", "Summary"))
self.txtSummarySentance.setPlaceholderText(_translate("metadataView", "One line summary"))
self.txtSummarySentence.setPlaceholderText(_translate("metadataView", "One line summary"))
self.txtSummaryFull.setPlaceholderText(_translate("metadataView", "Full summary"))
self.grpNotes.setTitle(_translate("metadataView", "Notes / References"))
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

2
manuskript/ui/views/metadataView_ui.ui
View file

@ -103,7 +103,7 @@
<number>0</number>
</property>
<item>
<widget class="lineEditView" name="txtSummarySentance">
<widget class="lineEditView" name="txtSummarySentence">
<property name="inputMask">
<string/>
</property>

11
manuskript/ui/views/propertiesView_ui.py
View file

@ -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

4
manuskript/ui/views/treeDelegates.py
View file

@ -105,7 +105,7 @@ class treeTitleDelegate(QStyledItemDelegate):
if extraText:
extraText = " ({}%)".format(extraText)
elif settings.viewSettings["Tree"]["InfoFolder"] == "Summary":
extraText = item.data(Outline.summarySentance.value)
extraText = item.data(Outline.summarySentence.value)
if extraText:
extraText = " - {}".format(extraText)
@ -118,7 +118,7 @@ class treeTitleDelegate(QStyledItemDelegate):
if extraText:
extraText = " ({}%)".format(extraText)
elif settings.viewSettings["Tree"]["InfoText"] == "Summary":
extraText = item.data(Outline.summarySentance.value)
extraText = item.data(Outline.summarySentence.value)
if extraText:
extraText = " - {}".format(extraText)