CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-06-16 01:44:34 +12:00
Code Issues Projects Releases Wiki Activity

Optimization

Browse source
This commit is contained in:
Olivier Keshavjee 2015-06-15 12:38:38 +02:00
parent cfa6c72328
commit 2c9b7b637a
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ui/editors/editorWidget.py
View file

@ -123,7 +123,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui):
addSpacer() addSpacer()
self.scroll.setWidget(w) self.scroll.setWidget(w)
elif item.isFolder() and self.folderView == "text": elif item and item.isFolder() and self.folderView == "text":
self.stack.setCurrentIndex(1) self.stack.setCurrentIndex(1)
w = QWidget() w = QWidget()
@ -139,7 +139,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui):
addSpacer() addSpacer()
self.scroll.setWidget(w) self.scroll.setWidget(w)
elif item.isFolder() and self.folderView == "cork": elif item and item.isFolder() and self.folderView == "cork":
self.stack.setCurrentIndex(2) self.stack.setCurrentIndex(2)
self.corkView.setModel(self._model) self.corkView.setModel(self._model)
self.corkView.setRootIndex(index) self.corkView.setRootIndex(index)
@ -149,7 +149,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui):
lambda: mainWindow().redacMetadata.selectionChanged(self.corkView)) lambda: mainWindow().redacMetadata.selectionChanged(self.corkView))
elif item.isFolder() and self.folderView == "outline": elif item and item.isFolder() and self.folderView == "outline":
self.stack.setCurrentIndex(3) self.stack.setCurrentIndex(3)
self.outlineView.setModelPersos(mainWindow().mdlPersos) self.outlineView.setModelPersos(mainWindow().mdlPersos)
self.outlineView.setModelLabels(mainWindow().mdlLabels) self.outlineView.setModelLabels(mainWindow().mdlLabels)

11
src/ui/views/textEditView.py
View file

@ -22,7 +22,6 @@ class textEditView(QTextEdit):
self._placeholderText = None self._placeholderText = None
self._updating = False self._updating = False
self._item = None self._item = None
self._update = False
self._highlighting = True self._highlighting = True
self.spellcheck = spellcheck self.spellcheck = spellcheck
@ -91,7 +90,7 @@ class textEditView(QTextEdit):
self.updateText() self.updateText()
def update(self, topLeft, bottomRight): def update(self, topLeft, bottomRight):
if self._update: if self._updating:
return return
elif self._index: elif self._index:
@ -107,6 +106,7 @@ class textEditView(QTextEdit):
self.updateText() self.updateText()
def updateText(self): def updateText(self):
self._updating = True
if self._index: if self._index:
if self.toPlainText() != toString(self._model.data(self._index)): if self.toPlainText() != toString(self._model.data(self._index)):
self.document().setPlainText(toString(self._model.data(self._index))) self.document().setPlainText(toString(self._model.data(self._index)))
@ -132,12 +132,19 @@ class textEditView(QTextEdit):
self._placeholderText = self.placeholderText() self._placeholderText = self.placeholderText()
self.setPlaceholderText(self.tr("Various")) self.setPlaceholderText(self.tr("Various"))
self._updating = False
def submit(self): def submit(self):
if self._updating:
return
if self._index: if self._index:
#item = self._index.internalPointer() #item = self._index.internalPointer()
if self.toPlainText() != self._model.data(self._index): if self.toPlainText() != self._model.data(self._index):
self._updating = True
self._model.setData(self._index, self.toPlainText()) self._model.setData(self._index, self.toPlainText())
self._updating = False
elif self._indexes: elif self._indexes:
self._updating = True self._updating = True