src/eric7/ViewManager/ViewManager.py

branch
eric7
changeset 10849
78d338b6d89f
parent 10806
2f6df822e3b9
child 10876
ec224611090e
equal deleted inserted replaced
10848:328c9a177c64 10849:78d338b6d89f
5649 5649
5650 # get the filename of the editor for later use 5650 # get the filename of the editor for later use
5651 fn = editor.getFileName() 5651 fn = editor.getFileName()
5652 5652
5653 # remove the window 5653 # remove the window
5654 editor.parent().aboutToBeClosed() 5654 editor.getAssembly().aboutToBeClosed()
5655 self._removeView(editor) 5655 self._removeView(editor)
5656 self.editors.remove(editor) 5656 self.editors.remove(editor)
5657 5657
5658 # remove the file from the monitor list 5658 # remove the file from the monitor list
5659 self.removeWatchedFilePath(fn) 5659 self.removeWatchedFilePath(fn)
5925 @rtype Editor 5925 @rtype Editor
5926 """ 5926 """
5927 editor, assembly = self.cloneEditor(caller, filetype, fn) 5927 editor, assembly = self.cloneEditor(caller, filetype, fn)
5928 5928
5929 self._addView(assembly, fn, caller.getNoName(), indexes=indexes) 5929 self._addView(assembly, fn, caller.getNoName(), indexes=indexes)
5930 assembly.finishSetup()
5930 self._modificationStatusChanged(editor.isModified(), editor) 5931 self._modificationStatusChanged(editor.isModified(), editor)
5931 self._checkActions(editor) 5932 self._checkActions(editor)
5932 5933
5933 return editor 5934 return editor
5934 5935
6232 6233
6233 newWin = True 6234 newWin = True
6234 6235
6235 if newWin: 6236 if newWin:
6236 self._addView(assembly, fn, addNext=addNext, indexes=indexes) 6237 self._addView(assembly, fn, addNext=addNext, indexes=indexes)
6238 assembly.finishSetup()
6237 else: 6239 else:
6238 self._showView(editor.parent(), fn) 6240 self._showView(editor.getAssembly(), fn)
6239 6241
6240 return (newWin, editor) 6242 return (newWin, editor)
6241 6243
6242 def getOpenEditors(self): 6244 def getOpenEditors(self):
6243 """ 6245 """
6482 ) 6484 )
6483 editor = assembly.getEditor() 6485 editor = assembly.getEditor()
6484 self.editors.append(editor) 6486 self.editors.append(editor)
6485 self.__connectEditor(editor) 6487 self.__connectEditor(editor)
6486 self._addView(assembly, None) 6488 self._addView(assembly, None)
6489 assembly.finishSetup()
6487 self.__editorOpened() 6490 self.__editorOpened()
6488 self._checkActions(editor) 6491 self._checkActions(editor)
6489 self.editorOpened.emit("") 6492 self.editorOpened.emit("")
6490 self.editorOpenedEd.emit(editor) 6493 self.editorOpenedEd.emit(editor)
6491 self.editorCountChanged.emit(len(self.editors)) 6494 self.editorCountChanged.emit(len(self.editors))
6515 ) 6518 )
6516 editor = assembly.getEditor() 6519 editor = assembly.getEditor()
6517 self.editors.append(editor) 6520 self.editors.append(editor)
6518 self.__connectEditor(editor) 6521 self.__connectEditor(editor)
6519 self._addView(assembly, fileName) 6522 self._addView(assembly, fileName)
6523 assembly.finishSetup()
6520 self.__editorOpened() 6524 self.__editorOpened()
6521 self._checkActions(editor) 6525 self._checkActions(editor)
6522 self.editorOpened.emit(fileName) 6526 self.editorOpened.emit(fileName)
6523 self.editorOpenedEd.emit(editor) 6527 self.editorOpenedEd.emit(editor)
6524 self.editorCountChanged.emit(len(self.editors)) 6528 self.editorCountChanged.emit(len(self.editors))

eric ide

mercurial