CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-15 10:22:26 +12:00
Code Issues Projects Releases Wiki Activity

Trying to give parents to every QObject

Browse source
This commit is contained in:
Olivier Keshavjee 2015-06-24 20:32:50 +02:00
parent ce445500d3
commit 38b055081e
4 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mainWindow.py
View file

@ -90,7 +90,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.makeUIConnections()
#self.loadProject(os.path.join(appPath(), "test_project.zip"))
###############################################################################
@ -485,14 +484,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
def loadEmptyDatas(self):
self.mdlFlatData = QStandardItemModel()
self.mdlPersos = QStandardItemModel()
self.mdlFlatData = QStandardItemModel(self)
self.mdlPersos = QStandardItemModel(self)
self.mdlPersosProxy = persosProxyModel(self)
self.mdlPersosInfos = QStandardItemModel()
self.mdlLabels = QStandardItemModel()
self.mdlStatus = QStandardItemModel()
self.mdlPlots = plotModel()
self.mdlOutline = outlineModel()
self.mdlPersosInfos = QStandardItemModel(self)
self.mdlLabels = QStandardItemModel(self)
self.mdlStatus = QStandardItemModel(self)
self.mdlPlots = plotModel(self)
self.mdlOutline = outlineModel(self)
def loadDatas(self):
# Loading
@ -850,7 +849,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
]
for widget, text, pos in references:
label = helpLabel(text)
label = helpLabel(text, self)
self.actShowHelp.toggled.connect(label.setVisible, AUC)
widget.layout().insertWidget(pos, label)

4
src/models/outlineModel.py
View file

@ -11,8 +11,8 @@ from functions import *
class outlineModel(QAbstractItemModel):
def __init__(self):
QAbstractItemModel.__init__(self)
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
self.rootItem = outlineItem(self, title="root")
self._defaultTextType = "t2t"

4
src/models/plotModel.py
View file

@ -8,8 +8,8 @@ from models.plotsProxyModel import *
class plotModel(QStandardItemModel):
def __init__(self):
QStandardItemModel.__init__(self, 0, 3)
def __init__(self, parent):
QStandardItemModel.__init__(self, 0, 3, parent)
self.setHorizontalHeaderLabels([i.name for i in Plot])
self.mw = mainWindow()
#self._proxy = plotsProxyModel()

21
src/ui/welcome.py
View file

@ -17,6 +17,8 @@ class welcome(QWidget, Ui_welcome):
QWidget.__init__(self, parent)
self.setupUi(self)
self.template = []
self.mw = mainWindow()
self.btnOpen.clicked.connect(self.openFile)
self.btnCreate.clicked.connect(self.createFile)
@ -309,19 +311,19 @@ class welcome(QWidget, Ui_welcome):
def loadDefaultDatas(self):
# Données
self.mw.mdlFlatData = QStandardItemModel(2, 8)
self.mw.mdlFlatData = QStandardItemModel(2, 8, self.mw)
# Persos
self.mw.mdlPersos = QStandardItemModel(0, 0)
self.mw.mdlPersos = QStandardItemModel(0, 0, self.mw)
#self.mdlPersosProxy = None # persosProxyModel() # None
self.mw.mdlPersosProxy = persosProxyModel(self)
self.mw.mdlPersosProxy = persosProxyModel(self.mw)
self.mw.mdlPersosInfos = QStandardItemModel(1, 0)
self.mw.mdlPersosInfos = QStandardItemModel(1, 0, self.mw)
self.mw.mdlPersosInfos.insertColumn(0, [QStandardItem("ID")])
self.mw.mdlPersosInfos.setHorizontalHeaderLabels(["Description"])
# Labels
self.mw.mdlLabels = QStandardItemModel()
self.mw.mdlLabels = QStandardItemModel(self.mw)
for color, text in [
(Qt.transparent, ""),
(Qt.yellow, self.tr("Idea")),
@ -333,7 +335,7 @@ class welcome(QWidget, Ui_welcome):
self.mw.mdlLabels.appendRow(QStandardItem(iconFromColor(color), text))
# Status
self.mw.mdlStatus = QStandardItemModel()
self.mw.mdlStatus = QStandardItemModel(self.mw)
for text in [
"",
self.tr("TODO"),
@ -344,10 +346,10 @@ class welcome(QWidget, Ui_welcome):
self.mw.mdlStatus.appendRow(QStandardItem(text))
# Plot
self.mw.mdlPlots = plotModel()
self.mw.mdlPlots = plotModel(self.mw)
# Outline
self.mw.mdlOutline = outlineModel()
self.mw.mdlOutline = outlineModel(self.mw)
root = self.mw.mdlOutline.rootItem
_type = self.cmbDefaultType.currentData()
@ -378,5 +380,6 @@ class welcome(QWidget, Ui_welcome):
parent.appendChild(item)
addElement(item, datas[1:])
addElement(root, self.template)
if self.template:
addElement(root, self.template)