mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-13 17:32:24 +12:00
Several tiny things squashed into one
All Models should have only one object managing them, and it is not the class responsible for doing the welcome-related tasks. Small .gitignore update
This commit is contained in:
parent
2545f9c7a3
commit
b41fb00b0d
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -12,12 +12,14 @@
|
|||
.project
|
||||
.pydevproject
|
||||
.settings/org.eclipse.core.resources.prefs
|
||||
.vscode
|
||||
ExportTest
|
||||
Notes.t2t
|
||||
dist
|
||||
build
|
||||
icons/Numix
|
||||
manuskript/pycallgraph.txt
|
||||
manuskript.log
|
||||
snowflake*
|
||||
test-projects
|
||||
main.pyproject.user
|
||||
|
|
|
@ -639,7 +639,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
self.mdlCharacter.dataChanged.connect(self.startTimerNoChanges)
|
||||
self.mdlPlots.dataChanged.connect(self.startTimerNoChanges)
|
||||
self.mdlWorld.dataChanged.connect(self.startTimerNoChanges)
|
||||
# self.mdlPersosInfos.dataChanged.connect(self.startTimerNoChanges)
|
||||
self.mdlStatus.dataChanged.connect(self.startTimerNoChanges)
|
||||
self.mdlLabels.dataChanged.connect(self.startTimerNoChanges)
|
||||
|
||||
|
@ -665,9 +664,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
# Add project name to Window's name
|
||||
self.setWindowTitle(self.projectName() + " - " + self.tr("Manuskript"))
|
||||
|
||||
# Stuff
|
||||
# self.checkPersosID() # Shouldn't be necessary any longer
|
||||
|
||||
# Show main Window
|
||||
self.switchToProject()
|
||||
|
||||
|
@ -875,8 +871,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
def loadEmptyDatas(self):
|
||||
self.mdlFlatData = QStandardItemModel(self)
|
||||
self.mdlCharacter = characterModel(self)
|
||||
# self.mdlPersosProxy = persosProxyModel(self)
|
||||
# self.mdlPersosInfos = QStandardItemModel(self)
|
||||
self.mdlLabels = QStandardItemModel(self)
|
||||
self.mdlStatus = QStandardItemModel(self)
|
||||
self.mdlPlots = plotModel(self)
|
||||
|
|
|
@ -422,10 +422,12 @@ class welcome(QWidget, Ui_welcome):
|
|||
self.tree.expandAll()
|
||||
|
||||
def loadDefaultDatas(self):
|
||||
"""Initialize a basic Manuskript project."""
|
||||
|
||||
# Empty settings
|
||||
imp.reload(settings)
|
||||
settings.initDefaultValues()
|
||||
self.mw.loadEmptyDatas()
|
||||
|
||||
if self.template:
|
||||
t = [i for i in self._templates if i[0] == self.template[0]]
|
||||
|
@ -433,20 +435,10 @@ class welcome(QWidget, Ui_welcome):
|
|||
settings.viewMode = "simple"
|
||||
|
||||
# Tasks
|
||||
self.mw.mdlFlatData = QStandardItemModel(2, 8, self.mw)
|
||||
|
||||
# Persos
|
||||
# self.mw.mdlPersos = QStandardItemModel(0, 0, self.mw)
|
||||
self.mw.mdlCharacter = characterModel(self.mw)
|
||||
# self.mdlPersosProxy = None # persosProxyModel() # None
|
||||
# self.mw.mdlPersosProxy = persosProxyModel(self.mw)
|
||||
|
||||
# self.mw.mdlPersosInfos = QStandardItemModel(1, 0, self.mw)
|
||||
# self.mw.mdlPersosInfos.insertColumn(0, [QStandardItem("ID")])
|
||||
# self.mw.mdlPersosInfos.setHorizontalHeaderLabels(["Description"])
|
||||
self.mw.mdlFlatData.setRowCount(2) # data from: infos.txt, summary.txt
|
||||
self.mw.mdlFlatData.setColumnCount(8) # version_1.py: len(infos.txt) == 8
|
||||
|
||||
# Labels
|
||||
self.mw.mdlLabels = QStandardItemModel(self.mw)
|
||||
for color, text in [
|
||||
(Qt.transparent, ""),
|
||||
(Qt.yellow, self.tr("Idea")),
|
||||
|
@ -458,7 +450,6 @@ class welcome(QWidget, Ui_welcome):
|
|||
self.mw.mdlLabels.appendRow(QStandardItem(iconFromColor(color), text))
|
||||
|
||||
# Status
|
||||
self.mw.mdlStatus = QStandardItemModel(self.mw)
|
||||
for text in [
|
||||
"",
|
||||
self.tr("TODO"),
|
||||
|
@ -468,14 +459,9 @@ class welcome(QWidget, Ui_welcome):
|
|||
]:
|
||||
self.mw.mdlStatus.appendRow(QStandardItem(text))
|
||||
|
||||
# Plot
|
||||
self.mw.mdlPlots = plotModel(self.mw)
|
||||
# Plot (nothing special needed)
|
||||
|
||||
# Outline
|
||||
self.mw.mdlOutline = outlineModel(self.mw)
|
||||
|
||||
# World
|
||||
self.mw.mdlWorld = worldModel(self.mw)
|
||||
|
||||
root = self.mw.mdlOutline.rootItem
|
||||
_type = "md"
|
||||
|
@ -509,3 +495,5 @@ class welcome(QWidget, Ui_welcome):
|
|||
|
||||
if self.template and self.template[1]:
|
||||
addElement(root, self.template[1])
|
||||
|
||||
# World (nothing special needed)
|
||||
|
|
Loading…
Reference in a new issue