diff --git a/TODO.t2t b/TODO.t2t
index 23eed498..c314ad56 100644
--- a/TODO.t2t
+++ b/TODO.t2t
@@ -1,8 +1,5 @@
-
-
-
Features
- Coach (entrer le nombre de mot viser, se fixer des objectifs quotidiens / hebdomadaires (en temps, ou en mots, min ou max), faire des statistiques)
- Différents modes: simple (que le outliner / rédacteur), snowflake strict (cache les éléments tant que le précédent n'a pas été accompli), snowflake souple (tout est affiché mais permet de naviger, avec conseils)
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/enums.py b/src/enums.py
index 65072c5a..f7119810 100644
--- a/src/enums.py
+++ b/src/enums.py
@@ -22,4 +22,5 @@ class Perso(Enum):
summarySentance = 7
summaryPara = 8
summaryFull = 9
+ notes = 10
diff --git a/src/main.py b/src/main.py
index 470796a4..cde7026a 100644
--- a/src/main.py
+++ b/src/main.py
@@ -5,8 +5,6 @@ from PyQt4.QtCore import *
from PyQt4.QtGui import *
-__version__ = "0.1"
-
if __name__ == "__main__":
app = QApplication(sys.argv)
app.setOrganizationName("Theologeek")
diff --git a/src/mainWindow.py b/src/mainWindow.py
index 613b485a..0a3aa384 100644
--- a/src/mainWindow.py
+++ b/src/mainWindow.py
@@ -10,6 +10,7 @@ from PyQt4.QtGui import *
from ui.mainWindow import *
from loadSave import *
from enums import *
+from models.outlineModel import *
class MainWindow(QMainWindow, Ui_MainWindow):
def __init__(self):
@@ -117,7 +118,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
(self.txtPersoEpiphany, Perso.epiphany.value),
(self.txtPersoSummarySentance, Perso.summarySentance.value),
(self.txtPersoSummaryPara, Perso.summaryPara.value),
- (self.txtPersoSummaryFull, Perso.summaryFull.value)
+ (self.txtPersoSummaryFull, Perso.summaryFull.value),
+ (self.txtPersoNotes, Perso.notes.value)
]
for w, i in mapping:
self.mprPersos.addMapping(w, i)
@@ -129,15 +131,43 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.lstPersos.selectionModel().currentChanged.connect(self.changeCurrentPerso)
self.tabPersos.currentChanged.connect(self.resizePersosInfos)
+ # Outline
+ self.mdlOutline = outlineModel()
+ #self.mdlOutline.setHorizontalHeaderLabels(
+ #[i.name for i in Outline])
+ self.treeRedacOutline.setModel(self.mdlOutline)
+ self.treePlanOutline.setModel(self.mdlOutline)
+ self.treeRedacOutline.setSelectionModel(self.treePlanOutline.selectionModel())
+ for c in range(1, self.mdlOutline.columnCount()):
+ self.treeRedacOutline.hideColumn(c)
+ self.treePlanOutline.hideColumn(c)
+ self.btnRedacAddFolder.clicked.connect(lambda: self.outlineAddItem("folder"))
+ self.btnRedacAddScene.clicked.connect(lambda: self.outlineAddItem("scene"))
+ self.btnRedacRemoveItem.clicked.connect(self.outlineRemoveItem)
#Debug
self.mdlFlatData.setVerticalHeaderLabels(["Infos générales", "Summary"])
self.tblDebugFlatData.setModel(self.mdlFlatData)
self.tblDebugPersos.setModel(self.mdlPersos)
self.tblDebugPersosInfos.setModel(self.mdlPersosInfos)
+ self.treeDebugOutline.setModel(self.mdlOutline)
self.loadProject("test_project")
+
+####################################################################################################
+# OUTLINE #
+####################################################################################################
+
+ def outlineAddItem(self, type="folder"):
+ currentIndex = self.treeRedacOutline.currentIndex()
+ item = outlineItem("Nouveau", type)
+ self.mdlOutline.appendRow(item, currentIndex)
+ def outlineRemoveItem(self):
+ currentIndex = self.treeRedacOutline.currentIndex()
+ self.mdlOutline.removeIndex(currentIndex)
+
+
####################################################################################################
# PERSOS #
####################################################################################################
diff --git a/src/models/__init__.py b/src/models/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/models/outlineModel.py b/src/models/outlineModel.py
new file mode 100644
index 00000000..0b637d8d
--- /dev/null
+++ b/src/models/outlineModel.py
@@ -0,0 +1,199 @@
+#!/usr/bin/env python
+#--!-- coding: utf8 --!--
+
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from enum import Enum
+
+class Outline(Enum):
+ title = 0
+ ID = 1
+ type = 2
+ summarySentance = 3
+ summaryFull = 4
+ POV = 5
+ notes = 6
+ status = 7
+ compile = 8
+
+
+class outlineModel(QAbstractItemModel):
+ def __init__(self):
+ QAbstractItemModel.__init__(self)
+
+ self.rootItem = outlineItem()
+
+ def index(self, row, column, parent):
+
+ if not self.hasIndex(row, column, parent):
+ return QModelIndex()
+
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ childItem = parentItem.child(row)
+ if childItem:
+ return self.createIndex(row, column, childItem)
+ else:
+ return QModelIndex()
+
+
+ def parent(self, index=QModelIndex()):
+ if not index.isValid():
+ return QModelIndex()
+
+ childItem = index.internalPointer()
+ parentItem = childItem.parent()
+
+ if parentItem == self.rootItem:
+ return QModelIndex()
+
+ return self.createIndex(parentItem.row(), 0, parentItem)
+
+ def rowCount(self, parent=QModelIndex()):
+ if parent.column() > 0:
+ return 0
+
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ return parentItem.childCount()
+
+ def columnCount(self, parent=QModelIndex()):
+ if parent.isValid():
+ return parent.internalPointer().columnCount()
+ else:
+ return self.rootItem.columnCount()
+
+ def data(self, index, role=Qt.DisplayRole):
+ if not index.isValid():
+ return QVariant()
+
+ item = index.internalPointer()
+ return item.data(index.column(), role)
+
+ def setData(self, index, value, role=Qt.EditRole):
+ item = index.internalPointer()
+ item.setData(index.column(), value)
+ self.dataChanged.emit(index, index)
+ return True
+
+ def flags(self, index):
+ flags = Qt.ItemIsEnabled | Qt.ItemIsEditable | Qt.ItemIsSelectable | Qt.ItemIsDragEnabled
+
+ if index.isValid() and index.internalPointer().isFolder():
+ flags |= Qt.ItemIsDropEnabled
+
+ return flags
+
+
+ def headerData(self, section, orientation, role=Qt.DisplayRole):
+ if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ return [i.name for i in Outline][section]
+ else:
+ return QVariant()
+
+ #def insertRow(self, row, item, parent=QModelIndex()):
+ #self.beginInsertRows(parent, row, row)
+
+ #if not parent.isValid():
+ #parentItem = self.rootItem
+ #else:
+ #parentItem = parent.internalPointer()
+
+ #parentItem.insertChild(row, item)
+
+ #self.endInsertRows()
+
+ def appendRow(self, item, parent=QModelIndex()):
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ if parentItem.isFolder():
+ self.beginInsertRows(parent, parentItem.childCount(), parentItem.childCount())
+ parentItem.appendChild(item)
+ self.endInsertRows()
+
+ def removeIndex(self, index):
+ item = index.internalPointer()
+ self.removeRow(item.row(), 1, index.parent())
+
+
+ def removeRow(self, row, count, parent=QModelIndex()):
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ self.beginRemoveRows(parent, row, row)
+ parentItem.removeChild(row)
+ self.endRemoveRows()
+ return True
+
+class outlineItem():
+ def __init__(self, title="", type="folder", parent=None):
+
+ self._parent = parent
+
+ self._data = {}
+ self.childItems = []
+
+ self._data[Outline.title] = title
+ self._data[Outline.type] = type
+
+
+ def child(self, row):
+ return self.childItems[row]
+
+ def childCount(self):
+ return len(self.childItems)
+
+ def columnCount(self):
+ return len(Outline)
+
+ def data(self, column, role=Qt.DisplayRole):
+ if role == Qt.DisplayRole or role == Qt.EditRole:
+ if Outline(column) in self._data:
+ return self._data[Outline(column)]
+ else:
+ return QVariant()
+ elif role == Qt.DecorationRole and column == Outline.title.value:
+ if self.isFolder():
+ return QIcon.fromTheme("folder")
+ elif self.isScene():
+ return QIcon.fromTheme("document-new")
+
+ def setData(self, column, data):
+ self._data[Outline(column)] = data
+
+ def row(self):
+ if self.parent:
+ return self.parent().childItems.index(self)
+
+ def appendChild(self, child):
+ self.childItems.append(child)
+ child._parent = self
+
+ def insertChild(self, row, child):
+ self.childItems.insert(row, child)
+
+ def removeChild(self, row):
+ self.childItems.pop(row)
+
+ def parent(self):
+ return self._parent
+
+ def isFolder(self):
+ return self._data[Outline.type] == "folder"
+
+ def isScene(self):
+ return self._data[Outline.type] == "scene"
\ No newline at end of file
diff --git a/src/ui/mainWindow.py b/src/ui/mainWindow.py
index 7b2a56fe..50baa280 100644
--- a/src/ui/mainWindow.py
+++ b/src/ui/mainWindow.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'src/ui/mainWindow.ui'
#
-# Created: Mon Jun 1 12:00:14 2015
-# by: PyQt4 UI code generator 4.10.4
+# Created: Mon Jun 1 23:58:06 2015
+# by: PyQt4 UI code generator 4.11.3
#
# WARNING! All changes made in this file will be lost!
@@ -390,6 +390,14 @@ class Ui_MainWindow(object):
self.horizontalLayout_22.addWidget(self.btnStepSix)
self.verticalLayout_17.addLayout(self.horizontalLayout_22)
self.tabPersos.addTab(self.tab_11, _fromUtf8(""))
+ self.tab_19 = QtGui.QWidget()
+ self.tab_19.setObjectName(_fromUtf8("tab_19"))
+ self.horizontalLayout_30 = QtGui.QHBoxLayout(self.tab_19)
+ self.horizontalLayout_30.setObjectName(_fromUtf8("horizontalLayout_30"))
+ self.txtPersoNotes = QtGui.QPlainTextEdit(self.tab_19)
+ self.txtPersoNotes.setObjectName(_fromUtf8("txtPersoNotes"))
+ self.horizontalLayout_30.addWidget(self.txtPersoNotes)
+ self.tabPersos.addTab(self.tab_19, _fromUtf8(""))
self.tab_12 = QtGui.QWidget()
self.tab_12.setObjectName(_fromUtf8("tab_12"))
self.verticalLayout_9 = QtGui.QVBoxLayout(self.tab_12)
@@ -686,7 +694,7 @@ class Ui_MainWindow(object):
self.splitterPlan.setObjectName(_fromUtf8("splitterPlan"))
self.treeWidget_2 = QtGui.QTreeWidget(self.splitterPlan)
self.treeWidget_2.setDragEnabled(True)
- self.treeWidget_2.setDragDropMode(QtGui.QAbstractItemView.InternalMove)
+ self.treeWidget_2.setDragDropMode(QtGui.QAbstractItemView.DragOnly)
self.treeWidget_2.setObjectName(_fromUtf8("treeWidget_2"))
item_0 = QtGui.QTreeWidgetItem(self.treeWidget_2)
item_1 = QtGui.QTreeWidgetItem(item_0)
@@ -699,18 +707,11 @@ class Ui_MainWindow(object):
self.verticalLayout_14 = QtGui.QVBoxLayout(self.layoutWidget)
self.verticalLayout_14.setMargin(0)
self.verticalLayout_14.setObjectName(_fromUtf8("verticalLayout_14"))
- self.treeWidget_3 = QtGui.QTreeWidget(self.layoutWidget)
- self.treeWidget_3.setDragEnabled(True)
- self.treeWidget_3.setDragDropMode(QtGui.QAbstractItemView.InternalMove)
- self.treeWidget_3.setObjectName(_fromUtf8("treeWidget_3"))
- item_0 = QtGui.QTreeWidgetItem(self.treeWidget_3)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_0 = QtGui.QTreeWidgetItem(self.treeWidget_3)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- self.verticalLayout_14.addWidget(self.treeWidget_3)
+ self.treePlanOutline = QtGui.QTreeView(self.layoutWidget)
+ self.treePlanOutline.setDragEnabled(True)
+ self.treePlanOutline.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
+ self.treePlanOutline.setObjectName(_fromUtf8("treePlanOutline"))
+ self.verticalLayout_14.addWidget(self.treePlanOutline)
self.groupbox = QtGui.QGroupBox(self.layoutWidget)
self.groupbox.setObjectName(_fromUtf8("groupbox"))
self.verticalLayout_13 = QtGui.QVBoxLayout(self.groupbox)
@@ -720,14 +721,17 @@ class Ui_MainWindow(object):
self.label_9 = QtGui.QLabel(self.groupbox)
self.label_9.setObjectName(_fromUtf8("label_9"))
self.horizontalLayout_11.addWidget(self.label_9)
- self.comboBox = QtGui.QComboBox(self.groupbox)
- self.comboBox.setFrame(False)
- self.comboBox.setObjectName(_fromUtf8("comboBox"))
- self.horizontalLayout_11.addWidget(self.comboBox)
+ self.cmbPlanPOV = QtGui.QComboBox(self.groupbox)
+ self.cmbPlanPOV.setFrame(False)
+ self.cmbPlanPOV.setObjectName(_fromUtf8("cmbPlanPOV"))
+ self.horizontalLayout_11.addWidget(self.cmbPlanPOV)
self.verticalLayout_13.addLayout(self.horizontalLayout_11)
- self.plainTextEdit_8 = QtGui.QPlainTextEdit(self.groupbox)
- self.plainTextEdit_8.setObjectName(_fromUtf8("plainTextEdit_8"))
- self.verticalLayout_13.addWidget(self.plainTextEdit_8)
+ self.txtPlanSummarySentance = QtGui.QLineEdit(self.groupbox)
+ self.txtPlanSummarySentance.setObjectName(_fromUtf8("txtPlanSummarySentance"))
+ self.verticalLayout_13.addWidget(self.txtPlanSummarySentance)
+ self.txtPlanSummaryFull = QtGui.QPlainTextEdit(self.groupbox)
+ self.txtPlanSummaryFull.setObjectName(_fromUtf8("txtPlanSummaryFull"))
+ self.verticalLayout_13.addWidget(self.txtPlanSummaryFull)
self.verticalLayout_14.addWidget(self.groupbox)
self.horizontalLayout_18 = QtGui.QHBoxLayout()
self.horizontalLayout_18.setObjectName(_fromUtf8("horizontalLayout_18"))
@@ -763,32 +767,49 @@ class Ui_MainWindow(object):
self.splitterRedac = QtGui.QSplitter(self.tab_7)
self.splitterRedac.setOrientation(QtCore.Qt.Horizontal)
self.splitterRedac.setObjectName(_fromUtf8("splitterRedac"))
- self.widget = QtGui.QWidget(self.splitterRedac)
- self.widget.setObjectName(_fromUtf8("widget"))
- self.verticalLayout_19 = QtGui.QVBoxLayout(self.widget)
- self.verticalLayout_19.setMargin(0)
- self.verticalLayout_19.setObjectName(_fromUtf8("verticalLayout_19"))
- self.treeWidget_4 = QtGui.QTreeWidget(self.widget)
- self.treeWidget_4.setObjectName(_fromUtf8("treeWidget_4"))
- item_0 = QtGui.QTreeWidgetItem(self.treeWidget_4)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_0 = QtGui.QTreeWidgetItem(self.treeWidget_4)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- item_1 = QtGui.QTreeWidgetItem(item_0)
- self.verticalLayout_19.addWidget(self.treeWidget_4)
self.layoutWidget1 = QtGui.QWidget(self.splitterRedac)
self.layoutWidget1.setObjectName(_fromUtf8("layoutWidget1"))
- self.verticalLayout_16 = QtGui.QVBoxLayout(self.layoutWidget1)
+ self.verticalLayout_19 = QtGui.QVBoxLayout(self.layoutWidget1)
+ self.verticalLayout_19.setMargin(0)
+ self.verticalLayout_19.setObjectName(_fromUtf8("verticalLayout_19"))
+ self.treeRedacOutline = QtGui.QTreeView(self.layoutWidget1)
+ self.treeRedacOutline.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
+ self.treeRedacOutline.setObjectName(_fromUtf8("treeRedacOutline"))
+ self.verticalLayout_19.addWidget(self.treeRedacOutline)
+ self.horizontalLayout_31 = QtGui.QHBoxLayout()
+ self.horizontalLayout_31.setObjectName(_fromUtf8("horizontalLayout_31"))
+ self.btnRedacAddFolder = QtGui.QPushButton(self.layoutWidget1)
+ self.btnRedacAddFolder.setText(_fromUtf8(""))
+ icon = QtGui.QIcon.fromTheme(_fromUtf8("folder-new"))
+ self.btnRedacAddFolder.setIcon(icon)
+ self.btnRedacAddFolder.setObjectName(_fromUtf8("btnRedacAddFolder"))
+ self.horizontalLayout_31.addWidget(self.btnRedacAddFolder)
+ self.btnRedacAddScene = QtGui.QPushButton(self.layoutWidget1)
+ self.btnRedacAddScene.setText(_fromUtf8(""))
+ icon = QtGui.QIcon.fromTheme(_fromUtf8("document-new"))
+ self.btnRedacAddScene.setIcon(icon)
+ self.btnRedacAddScene.setObjectName(_fromUtf8("btnRedacAddScene"))
+ self.horizontalLayout_31.addWidget(self.btnRedacAddScene)
+ self.btnRedacRemoveItem = QtGui.QPushButton(self.layoutWidget1)
+ self.btnRedacRemoveItem.setText(_fromUtf8(""))
+ icon = QtGui.QIcon.fromTheme(_fromUtf8("list-remove"))
+ self.btnRedacRemoveItem.setIcon(icon)
+ self.btnRedacRemoveItem.setObjectName(_fromUtf8("btnRedacRemoveItem"))
+ self.horizontalLayout_31.addWidget(self.btnRedacRemoveItem)
+ spacerItem9 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_31.addItem(spacerItem9)
+ self.verticalLayout_19.addLayout(self.horizontalLayout_31)
+ self.layoutWidget2 = QtGui.QWidget(self.splitterRedac)
+ self.layoutWidget2.setObjectName(_fromUtf8("layoutWidget2"))
+ self.verticalLayout_16 = QtGui.QVBoxLayout(self.layoutWidget2)
self.verticalLayout_16.setMargin(0)
self.verticalLayout_16.setObjectName(_fromUtf8("verticalLayout_16"))
- self.plainTextEdit_9 = QtGui.QPlainTextEdit(self.layoutWidget1)
+ self.plainTextEdit_9 = QtGui.QPlainTextEdit(self.layoutWidget2)
self.plainTextEdit_9.setObjectName(_fromUtf8("plainTextEdit_9"))
self.verticalLayout_16.addWidget(self.plainTextEdit_9)
self.horizontalLayout_19 = QtGui.QHBoxLayout()
self.horizontalLayout_19.setObjectName(_fromUtf8("horizontalLayout_19"))
- self.pushButton_20 = QtGui.QPushButton(self.layoutWidget1)
+ self.pushButton_20 = QtGui.QPushButton(self.layoutWidget2)
self.pushButton_20.setText(_fromUtf8(""))
icon = QtGui.QIcon.fromTheme(_fromUtf8("text-x-generic"))
self.pushButton_20.setIcon(icon)
@@ -796,9 +817,9 @@ class Ui_MainWindow(object):
self.pushButton_20.setChecked(True)
self.pushButton_20.setObjectName(_fromUtf8("pushButton_20"))
self.horizontalLayout_19.addWidget(self.pushButton_20)
- spacerItem9 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.horizontalLayout_19.addItem(spacerItem9)
- self.pushButton_19 = QtGui.QPushButton(self.layoutWidget1)
+ spacerItem10 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_19.addItem(spacerItem10)
+ self.pushButton_19 = QtGui.QPushButton(self.layoutWidget2)
self.pushButton_19.setText(_fromUtf8(""))
icon = QtGui.QIcon.fromTheme(_fromUtf8("edit-find"))
self.pushButton_19.setIcon(icon)
@@ -853,9 +874,12 @@ class Ui_MainWindow(object):
self.groupBox_5.setObjectName(_fromUtf8("groupBox_5"))
self.verticalLayout_22 = QtGui.QVBoxLayout(self.groupBox_5)
self.verticalLayout_22.setObjectName(_fromUtf8("verticalLayout_22"))
- self.plainTextEdit_3 = QtGui.QPlainTextEdit(self.groupBox_5)
- self.plainTextEdit_3.setObjectName(_fromUtf8("plainTextEdit_3"))
- self.verticalLayout_22.addWidget(self.plainTextEdit_3)
+ self.txtRedacSummarySentance = QtGui.QLineEdit(self.groupBox_5)
+ self.txtRedacSummarySentance.setObjectName(_fromUtf8("txtRedacSummarySentance"))
+ self.verticalLayout_22.addWidget(self.txtRedacSummarySentance)
+ self.txtRedacSummaryFull = QtGui.QPlainTextEdit(self.groupBox_5)
+ self.txtRedacSummaryFull.setObjectName(_fromUtf8("txtRedacSummaryFull"))
+ self.verticalLayout_22.addWidget(self.txtRedacSummaryFull)
self.verticalLayout_20.addWidget(self.groupBox_5)
self.groupBox_6 = collapsibleGroupBox(self.tab_17)
self.groupBox_6.setCheckable(True)
@@ -928,6 +952,14 @@ class Ui_MainWindow(object):
self.tblDebugPersosInfos.setObjectName(_fromUtf8("tblDebugPersosInfos"))
self.horizontalLayout_28.addWidget(self.tblDebugPersosInfos)
self.tabWidget.addTab(self.tab_16, _fromUtf8(""))
+ self.tab_20 = QtGui.QWidget()
+ self.tab_20.setObjectName(_fromUtf8("tab_20"))
+ self.horizontalLayout_32 = QtGui.QHBoxLayout(self.tab_20)
+ self.horizontalLayout_32.setObjectName(_fromUtf8("horizontalLayout_32"))
+ self.treeDebugOutline = QtGui.QTreeView(self.tab_20)
+ self.treeDebugOutline.setObjectName(_fromUtf8("treeDebugOutline"))
+ self.horizontalLayout_32.addWidget(self.treeDebugOutline)
+ self.tabWidget.addTab(self.tab_20, _fromUtf8(""))
self.horizontalLayout_23.addWidget(self.tabWidget)
self.tabMain.addTab(self.tab_8, _fromUtf8(""))
self.horizontalLayout_2.addWidget(self.tabMain)
@@ -983,17 +1015,16 @@ class Ui_MainWindow(object):
self.menubar.addAction(self.menuMode.menuAction())
self.retranslateUi(MainWindow)
- self.tabMain.setCurrentIndex(2)
+ self.tabMain.setCurrentIndex(6)
self.tabSummary.setCurrentIndex(0)
self.tabPersos.setCurrentIndex(0)
self.tabPlot.setCurrentIndex(0)
self.comboBox_2.setCurrentIndex(1)
self.stkPlotSummary.setCurrentIndex(1)
self.tabWidget_2.setCurrentIndex(0)
- self.tabWidget.setCurrentIndex(2)
+ self.tabWidget.setCurrentIndex(3)
QtCore.QObject.connect(self.pushButton_16, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.plainTextEdit_7.setShown)
QtCore.QObject.connect(self.pushButton_23, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupbox.setShown)
- QtCore.QObject.connect(self.pushButton_20, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.treeWidget_4.setShown)
QtCore.QObject.connect(self.btnPlotShowSummary, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.grpPlotSummary.setShown)
QtCore.QObject.connect(self.comboBox_2, QtCore.SIGNAL(_fromUtf8("currentIndexChanged(int)")), self.stkPlotSummary.setCurrentIndex)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
@@ -1041,6 +1072,7 @@ class Ui_MainWindow(object):
self.tabPersos.setTabText(self.tabPersos.indexOf(self.infos), _translate("MainWindow", "Informations générales", None))
self.btnStepSix.setText(_translate("MainWindow", "Suivant", None))
self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_11), _translate("MainWindow", "Résumé", None))
+ self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_19), _translate("MainWindow", "Notes", None))
self.lineEdit.setPlaceholderText(_translate("MainWindow", "Filter", None))
self.btnStepEight.setText(_translate("MainWindow", "Suivant", None))
self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_12), _translate("MainWindow", "Informations détaillées", None))
@@ -1097,36 +1129,16 @@ class Ui_MainWindow(object):
self.treeWidget_2.topLevelItem(1).child(0).setText(0, _translate("MainWindow", "Scène 1", None))
self.treeWidget_2.topLevelItem(1).child(1).setText(0, _translate("MainWindow", "Scène 2", None))
self.treeWidget_2.setSortingEnabled(__sortingEnabled)
- self.treeWidget_3.headerItem().setText(0, _translate("MainWindow", "Plan détaillé", None))
- __sortingEnabled = self.treeWidget_3.isSortingEnabled()
- self.treeWidget_3.setSortingEnabled(False)
- self.treeWidget_3.topLevelItem(0).setText(0, _translate("MainWindow", "Chapitre 1", None))
- self.treeWidget_3.topLevelItem(0).child(0).setText(0, _translate("MainWindow", "Scène 1", None))
- self.treeWidget_3.topLevelItem(0).child(1).setText(0, _translate("MainWindow", "Scène 2", None))
- self.treeWidget_3.topLevelItem(0).child(2).setText(0, _translate("MainWindow", "Scène 3", None))
- self.treeWidget_3.topLevelItem(1).setText(0, _translate("MainWindow", "Chapitre 2", None))
- self.treeWidget_3.topLevelItem(1).child(0).setText(0, _translate("MainWindow", "Scène 1", None))
- self.treeWidget_3.topLevelItem(1).child(1).setText(0, _translate("MainWindow", "Scène 2", None))
- self.treeWidget_3.setSortingEnabled(__sortingEnabled)
self.groupbox.setTitle(_translate("MainWindow", "Détails de la scène", None))
self.label_9.setText(_translate("MainWindow", "POV", None))
+ self.txtPlanSummarySentance.setPlaceholderText(_translate("MainWindow", "Résumé de la scène en une ligne", None))
self.tabMain.setTabText(self.tabMain.indexOf(self.tab_6), _translate("MainWindow", "Plan", None))
- self.treeWidget_4.headerItem().setText(0, _translate("MainWindow", "Plan détaillé", None))
- __sortingEnabled = self.treeWidget_4.isSortingEnabled()
- self.treeWidget_4.setSortingEnabled(False)
- self.treeWidget_4.topLevelItem(0).setText(0, _translate("MainWindow", "Chapitre 1", None))
- self.treeWidget_4.topLevelItem(0).child(0).setText(0, _translate("MainWindow", "Scène 1", None))
- self.treeWidget_4.topLevelItem(0).child(1).setText(0, _translate("MainWindow", "Scène 2", None))
- self.treeWidget_4.topLevelItem(0).child(2).setText(0, _translate("MainWindow", "Scène 3", None))
- self.treeWidget_4.topLevelItem(1).setText(0, _translate("MainWindow", "Chapitre 2", None))
- self.treeWidget_4.topLevelItem(1).child(0).setText(0, _translate("MainWindow", "Scène 1", None))
- self.treeWidget_4.topLevelItem(1).child(1).setText(0, _translate("MainWindow", "Scène 2", None))
- self.treeWidget_4.setSortingEnabled(__sortingEnabled)
self.groupBox_4.setTitle(_translate("MainWindow", "Propriétés de la scène", None))
self.label_29.setText(_translate("MainWindow", "Personnage", None))
self.label_30.setText(_translate("MainWindow", "Status", None))
self.label_32.setText(_translate("MainWindow", "Compile", None))
self.groupBox_5.setTitle(_translate("MainWindow", "Résumé de la scène", None))
+ self.txtRedacSummarySentance.setPlaceholderText(_translate("MainWindow", "Résumé de la scène en une ligne", None))
self.groupBox_6.setTitle(_translate("MainWindow", "Notes pour la scène", None))
self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_17), _translate("MainWindow", "Scène", None))
self.groupBox_3.setTitle(_translate("MainWindow", "Aide mémoire", None))
@@ -1147,6 +1159,7 @@ class Ui_MainWindow(object):
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_9), _translate("MainWindow", "FlatData", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_10), _translate("MainWindow", "Persos", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_16), _translate("MainWindow", "Perso Infos", None))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_20), _translate("MainWindow", "Outline", None))
self.tabMain.setTabText(self.tabMain.indexOf(self.tab_8), _translate("MainWindow", "Debug", None))
self.menu_Fichier.setTitle(_translate("MainWindow", "&Fichier", None))
self.menuMode.setTitle(_translate("MainWindow", "Mode", None))
diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui
index 6273194e..350951b8 100644
--- a/src/ui/mainWindow.ui
+++ b/src/ui/mainWindow.ui
@@ -18,7 +18,7 @@
-
- 2
+ 6
true
@@ -713,6 +713,16 @@
+
+
+ Notes
+
+
+ -
+
+
+
+
Informations détaillées
@@ -1273,7 +1283,7 @@
true
- QAbstractItemView::InternalMove
+ QAbstractItemView::DragOnly
@@ -1314,53 +1324,13 @@
-
-
+
true
- QAbstractItemView::InternalMove
+ QAbstractItemView::DragDrop
-
-
- Plan détaillé
-
-
-
-
-
- Chapitre 1
-
-
-
-
- Scène 1
-
-
- -
-
- Scène 2
-
-
- -
-
- Scène 3
-
-
-
- -
-
- Chapitre 2
-
-
-
-
- Scène 1
-
-
- -
-
- Scène 2
-
-
-
-
@@ -1379,7 +1349,7 @@
-
-
+
false
@@ -1388,7 +1358,14 @@
-
-
+
+
+ Résumé de la scène en une ligne
+
+
+
+ -
+
@@ -1468,52 +1445,68 @@
Qt::Horizontal
-
+
-
-
-
-
- Plan détaillé
-
-
-
-
-
- Chapitre 1
-
-
-
-
- Scène 1
-
-
- -
-
- Scène 2
-
-
- -
-
- Scène 3
-
-
-
- -
-
- Chapitre 2
-
-
-
-
- Scène 1
-
-
- -
-
- Scène 2
-
-
-
+
+
+ QAbstractItemView::DragDrop
+
+ -
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
@@ -1664,7 +1657,14 @@
-
-
+
+
+ Résumé de la scène en une ligne
+
+
+
+ -
+
@@ -1752,7 +1752,7 @@
QTabWidget::West
- 2
+ 3
@@ -1788,6 +1788,16 @@
+
+
+ Outline
+
+
+ -
+
+
+
+
@@ -1965,22 +1975,6 @@
-
- pushButton_20
- toggled(bool)
- treeWidget_4
- setShown(bool)
-
-
- 401
- 770
-
-
- 259
- 510
-
-
-
btnPlotShowSummary
toggled(bool)
diff --git a/test_project/perso.xml b/test_project/perso.xml
index 6c05736a..d01af350 100644
--- a/test_project/perso.xml
+++ b/test_project/perso.xml
@@ -16,6 +16,7 @@
+
@@ -30,6 +31,10 @@
+ Quelques notes
+
+
+Pour voir.
Ginette
@@ -42,6 +47,7 @@
+