From 59073fa9dd828cc34157afdf7824e2d689a68605 Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Mon, 15 Jun 2015 15:46:31 +0200 Subject: [PATCH] Changes outline type scene to text. --- src/mainWindow.py | 4 +- src/models/outlineModel.py | 6 +-- src/ui/editors/editorWidget.py | 8 +-- src/ui/editors/editorWidget_ui.py | 12 ++--- src/ui/editors/editorWidget_ui.ui | 2 +- src/ui/mainWindow.py | 24 ++++----- src/ui/mainWindow.ui | 4 +- src/ui/views/basicItemView_ui.py | 4 +- src/ui/views/basicItemView_ui.ui | 2 +- src/ui/views/metadataView_ui.py | 4 +- src/ui/views/metadataView_ui.ui | 2 +- src/ui/views/outlineBasics.py | 12 ++--- test_project/outline.xml | 84 +++++++++++++++---------------- 13 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/mainWindow.py b/src/mainWindow.py index 1df65403..32ad1273 100644 --- a/src/mainWindow.py +++ b/src/mainWindow.py @@ -178,8 +178,8 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.btnRedacAddFolder.clicked.connect(self.treeRedacOutline.addFolder) self.btnPlanAddFolder.clicked.connect(self.treePlanOutline.addFolder) - self.btnRedacAddScene.clicked.connect(self.treeRedacOutline.addScene) - self.btnPlanAddScene.clicked.connect(self.treePlanOutline.addScene) + self.btnRedacAddText.clicked.connect(self.treeRedacOutline.addText) + self.btnPlanAddText.clicked.connect(self.treePlanOutline.addText) self.btnRedacRemoveItem.clicked.connect(self.outlineRemoveItems) self.btnPlanRemoveItem.clicked.connect(self.outlineRemoveItems) diff --git a/src/models/outlineModel.py b/src/models/outlineModel.py index e0a426e0..7db1a5fd 100644 --- a/src/models/outlineModel.py +++ b/src/models/outlineModel.py @@ -354,7 +354,7 @@ class outlineItem(): elif role == Qt.DecorationRole and column == Outline.title.value: if self.isFolder(): return QIcon.fromTheme("folder") - elif self.isScene(): + elif self.isText(): return QIcon.fromTheme("document-new") elif role == Qt.ForegroundRole: @@ -489,8 +489,8 @@ class outlineItem(): else: return self.title() - def isScene(self): - return self._data[Outline.type] == "scene" + def isText(self): + return self._data[Outline.type] == "text" def level(self): if self.parent(): diff --git a/src/ui/editors/editorWidget.py b/src/ui/editors/editorWidget.py index 23cc7e26..e04d585d 100644 --- a/src/ui/editors/editorWidget.py +++ b/src/ui/editors/editorWidget.py @@ -76,12 +76,12 @@ class editorWidget(QWidget, Ui_editorWidget_ui): l.addWidget(edt) def addLine(): - line = QFrame(self.scene) + line = QFrame(self.text) line.setFrameShape(QFrame.HLine) line.setFrameShadow(QFrame.Sunken) l.addWidget(line) - def addScene(itm): + def addText(itm): edt = customTextEdit(self, index=itm.index(), spellcheck=self.spellcheck, dict=self.currentDict, autoResize=True) edt.setFrameShape(QFrame.NoFrame) edt.setStatusTip(itm.path()) @@ -100,7 +100,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui): addChildren(child) else: - addScene(child) + addText(child) addLine() def addSpacer(): @@ -118,7 +118,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui): if sItem.isFolder(): addChildren(sItem) else: - addScene(sItem) + addText(sItem) addLine() addSpacer() self.scroll.setWidget(w) diff --git a/src/ui/editors/editorWidget_ui.py b/src/ui/editors/editorWidget_ui.py index 3ae3cc3a..aa93eddd 100644 --- a/src/ui/editors/editorWidget_ui.py +++ b/src/ui/editors/editorWidget_ui.py @@ -17,15 +17,15 @@ class Ui_editorWidget_ui(object): self.verticalLayout_2.setObjectName("verticalLayout_2") self.stack = QtWidgets.QStackedWidget(editorWidget_ui) self.stack.setObjectName("stack") - self.scene = QtWidgets.QWidget() - self.scene.setObjectName("scene") - self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.scene) + self.text = QtWidgets.QWidget() + self.text.setObjectName("text") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.text) self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.txtRedacText = textEditView(self.scene) + self.txtRedacText = textEditView(self.text) self.txtRedacText.setObjectName("txtRedacText") self.horizontalLayout_2.addWidget(self.txtRedacText) - self.stack.addWidget(self.scene) + self.stack.addWidget(self.text) self.folder = QtWidgets.QWidget() self.folder.setObjectName("folder") self.verticalLayout = QtWidgets.QVBoxLayout(self.folder) @@ -71,5 +71,5 @@ class Ui_editorWidget_ui(object): editorWidget_ui.setWindowTitle(_translate("editorWidget_ui", "Form")) from ui.views.textEditView import textEditView -from ui.views.outlineView import outlineView from ui.views.corkView import corkView +from ui.views.outlineView import outlineView diff --git a/src/ui/editors/editorWidget_ui.ui b/src/ui/editors/editorWidget_ui.ui index 3ccda8c9..142df9ba 100644 --- a/src/ui/editors/editorWidget_ui.ui +++ b/src/ui/editors/editorWidget_ui.ui @@ -22,7 +22,7 @@ 0 - + 0 diff --git a/src/ui/mainWindow.py b/src/ui/mainWindow.py index d4eff75a..1c33d2e4 100644 --- a/src/ui/mainWindow.py +++ b/src/ui/mainWindow.py @@ -724,12 +724,12 @@ class Ui_MainWindow(object): self.btnPlanAddFolder.setIcon(icon) self.btnPlanAddFolder.setObjectName("btnPlanAddFolder") self.horizontalLayout_18.addWidget(self.btnPlanAddFolder) - self.btnPlanAddScene = QtWidgets.QPushButton(self.layoutWidget) - self.btnPlanAddScene.setText("") + self.btnPlanAddText = QtWidgets.QPushButton(self.layoutWidget) + self.btnPlanAddText.setText("") icon = QtGui.QIcon.fromTheme("document-new") - self.btnPlanAddScene.setIcon(icon) - self.btnPlanAddScene.setObjectName("btnPlanAddScene") - self.horizontalLayout_18.addWidget(self.btnPlanAddScene) + self.btnPlanAddText.setIcon(icon) + self.btnPlanAddText.setObjectName("btnPlanAddText") + self.horizontalLayout_18.addWidget(self.btnPlanAddText) self.btnPlanRemoveItem = QtWidgets.QPushButton(self.layoutWidget) self.btnPlanRemoveItem.setText("") icon = QtGui.QIcon.fromTheme("list-remove") @@ -772,12 +772,12 @@ class Ui_MainWindow(object): self.btnRedacAddFolder.setIcon(icon) self.btnRedacAddFolder.setObjectName("btnRedacAddFolder") self.horizontalLayout_31.addWidget(self.btnRedacAddFolder) - self.btnRedacAddScene = QtWidgets.QPushButton(self.widget) - self.btnRedacAddScene.setText("") + self.btnRedacAddText = QtWidgets.QPushButton(self.widget) + self.btnRedacAddText.setText("") icon = QtGui.QIcon.fromTheme("document-new") - self.btnRedacAddScene.setIcon(icon) - self.btnRedacAddScene.setObjectName("btnRedacAddScene") - self.horizontalLayout_31.addWidget(self.btnRedacAddScene) + self.btnRedacAddText.setIcon(icon) + self.btnRedacAddText.setObjectName("btnRedacAddText") + self.horizontalLayout_31.addWidget(self.btnRedacAddText) self.btnRedacRemoveItem = QtWidgets.QPushButton(self.widget) self.btnRedacRemoveItem.setText("") icon = QtGui.QIcon.fromTheme("list-remove") @@ -1211,11 +1211,11 @@ class Ui_MainWindow(object): self.actLabels.setText(_translate("MainWindow", "Labels...")) self.actStatus.setText(_translate("MainWindow", "Status...")) -from ui.views.textEditView import textEditView -from ui.views.basicItemView import basicItemView from ui.views.outlineView import outlineView +from ui.views.textEditView import textEditView from ui.views.metadataView import metadataView from ui.views.lineEditView import lineEditView from ui.sldImportance import sldImportance +from ui.views.basicItemView import basicItemView from ui.editors.editorWidget import editorWidget from ui.views.treeView import treeView diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui index 083c0e08..1284ac68 100644 --- a/src/ui/mainWindow.ui +++ b/src/ui/mainWindow.ui @@ -1373,7 +1373,7 @@ - + @@ -1468,7 +1468,7 @@ - + diff --git a/src/ui/views/basicItemView_ui.py b/src/ui/views/basicItemView_ui.py index 4bdc31da..6ce8977c 100644 --- a/src/ui/views/basicItemView_ui.py +++ b/src/ui/views/basicItemView_ui.py @@ -63,9 +63,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 scene summary")) + self.txtSummarySentance.setPlaceholderText(_translate("basicItemView", "One line summary")) self.label_9.setText(_translate("basicItemView", "Few sentences summary:")) -from ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser from ui.views.textEditView import textEditView from ui.views.lineEditView import lineEditView +from ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser diff --git a/src/ui/views/basicItemView_ui.ui b/src/ui/views/basicItemView_ui.ui index 0b5b2c1e..2103ece8 100644 --- a/src/ui/views/basicItemView_ui.ui +++ b/src/ui/views/basicItemView_ui.ui @@ -89,7 +89,7 @@ - One line scene summary + One line summary diff --git a/src/ui/views/metadataView_ui.py b/src/ui/views/metadataView_ui.py index de807686..ace0eb31 100644 --- a/src/ui/views/metadataView_ui.py +++ b/src/ui/views/metadataView_ui.py @@ -67,10 +67,10 @@ class Ui_metadataView(object): metadataView.setWindowTitle(_translate("metadataView", "Form")) self.groupBox_4.setTitle(_translate("metadataView", "Properties")) self.groupBox_5.setTitle(_translate("metadataView", "Summary")) - self.txtSummarySentance.setPlaceholderText(_translate("metadataView", "One line scene summary")) + self.txtSummarySentance.setPlaceholderText(_translate("metadataView", "One line summary")) self.groupBox_6.setTitle(_translate("metadataView", "Notes")) from ui.views.lineEditView import lineEditView -from ui.collapsibleGroupBox2 import collapsibleGroupBox2 from ui.views.textEditView import textEditView +from ui.collapsibleGroupBox2 import collapsibleGroupBox2 from ui.views.propertiesView import propertiesView diff --git a/src/ui/views/metadataView_ui.ui b/src/ui/views/metadataView_ui.ui index 97a8d6fb..02d89b88 100644 --- a/src/ui/views/metadataView_ui.ui +++ b/src/ui/views/metadataView_ui.ui @@ -72,7 +72,7 @@ - One line scene summary + One line summary diff --git a/src/ui/views/outlineBasics.py b/src/ui/views/outlineBasics.py index 9f40e9f5..bc9e425d 100644 --- a/src/ui/views/outlineBasics.py +++ b/src/ui/views/outlineBasics.py @@ -33,9 +33,9 @@ class outlineBasics(QAbstractItemView): self.actAddFolder.triggered.connect(self.addFolder) self.menu.addAction(self.actAddFolder) - self.actAddScene = QAction(QIcon.fromTheme("document-new"), qApp.translate("outlineBasics", "New Scene"), self.menu) - self.actAddScene.triggered.connect(self.addScene) - self.menu.addAction(self.actAddScene) + self.actAddText = QAction(QIcon.fromTheme("document-new"), qApp.translate("outlineBasics", "New Text"), self.menu) + self.actAddText.triggered.connect(self.addText) + self.menu.addAction(self.actAddText) self.actDelete = QAction(QIcon.fromTheme("edit-delete"), qApp.translate("outlineBasics", "Delete"), self.menu) self.actDelete.triggered.connect(self.delete) @@ -126,7 +126,7 @@ class outlineBasics(QAbstractItemView): if len(sel) > 0 and index.isValid() and not index.internalPointer().isFolder(): self.actAddFolder.setEnabled(False) - self.actAddScene.setEnabled(False) + self.actAddText.setEnabled(False) if len(sel) == 0: self.actCopy.setEnabled(False) @@ -139,8 +139,8 @@ class outlineBasics(QAbstractItemView): def addFolder(self): self.addItem("folder") - def addScene(self): - self.addItem("scene") + def addText(self): + self.addItem("text") def addItem(self, type="folder"): if len(self.selectedIndexes()) == 0: diff --git a/test_project/outline.xml b/test_project/outline.xml index d67cc688..23b138b0 100644 --- a/test_project/outline.xml +++ b/test_project/outline.xml @@ -1,63 +1,63 @@ - + - - - + + + - - + + - + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - + + + + + - +