eric: comparison ViewManager/ViewManager.py

-:0a74c1efab70
+:0daf79d65080
 # Open up the new files.
 self.openSourceFile(prog)
 def checkDirty(self, editor, autosave=False):
 """
-Public method to check dirty status and open a message window.
+Public method to check the dirty status and open a message window.
 @param editor editor window to check
+@type Editor
 @param autosave flag indicating that the file should be saved
-automatically (boolean)
+automatically
-@return flag indicating successful reset of the dirty flag (boolean)
+@type bool
+@return flag indicating successful reset of the dirty flag
+@rtype bool
 """
 if editor.isModified():
 fn = editor.getFileName()
 # ignore the dirty status, if there is more than one open editor
 # for the same file
 def checkAllDirty(self):
 """
 Public method to check the dirty status of all editors.
-@return flag indicating successful reset of all dirty flags (boolean)
+@return flag indicating successful reset of all dirty flags
+@rtype bool
 """
 for editor in self.editors:
 if not self.checkDirty(editor):
 return False
 return True
-def closeEditor(self, editor):
+def checkFileDirty(self, fn):
 """
-Public method to close an editor window.
+Public method to check the dirty status of an editor given its file
+name and open a message window.
-@param editor editor window to be closed
-@return flag indicating success (boolean)
+@param fn file name of editor to be checked
-"""
+@type str
-# save file if necessary
+@return flag indicating successful reset of the dirty flag
-if not self.checkDirty(editor):
+@rtype bool
-return False
-# get the filename of the editor for later use
-fn = editor.getFileName()
-# remove the window
-editor.parent().shutdownTimer()
-self._removeView(editor)
-self.editors.remove(editor)
-# send a signal, if it was the last editor for this filename
-if fn and self.getOpenEditor(fn) is None:
-self.editorClosed.emit(fn)
-self.editorClosedEd.emit(editor)
-# send a signal, if it was the very last editor
-if not len(self.editors):
-self.__lastEditorClosed()
-self.lastEditorClosed.emit()
-editor.deleteLater()
-return True
-def closeCurrentWindow(self):
-"""
-Public method to close the current window.
-@return flag indicating success (boolean)
-"""
-aw = self.activeWindow()
-if aw is None:
-return False
-res = self.closeEditor(aw)
-if res and aw == self.currentEditor:
-self.currentEditor = None
-return res
-def closeAllWindows(self):
-"""
-Public method to close all editor windows via file menu.
-"""
-savedEditors = self.editors[:]
-for editor in savedEditors:
-self.closeEditor(editor)
-def closeWindow(self, fn):
-"""
-Public method to close an arbitrary source editor.
-@param fn filename of editor to be closed
-@return flag indicating success (boolean)
 """
 for editor in self.editors:
 if Utilities.samepath(fn, editor.getFileName()):
 break
 else:
 return True
-res = self.closeEditor(editor)
+res = self.checkDirty(editor)
+return res
+def closeEditor(self, editor, ignoreDirty=False):
+"""
+Public method to close an editor window.
+@param editor editor window to be closed
+@type Editor
+@param ignoreDirty flag indicating to ignore the 'dirty' status
+@type bool
+@return flag indicating success
+@rtype bool
+"""
+# save file if necessary
+if not ignoreDirty and not self.checkDirty(editor):
+return False
+# get the filename of the editor for later use
+fn = editor.getFileName()
+# remove the window
+editor.parent().shutdownTimer()
+self._removeView(editor)
+self.editors.remove(editor)
+# send a signal, if it was the last editor for this filename
+if fn and self.getOpenEditor(fn) is None:
+self.editorClosed.emit(fn)
+self.editorClosedEd.emit(editor)
+# send a signal, if it was the very last editor
+if not len(self.editors):
+self.__lastEditorClosed()
+self.lastEditorClosed.emit()
+editor.deleteLater()
+return True
+def closeCurrentWindow(self):
+"""
+Public method to close the current window.
+@return flag indicating success (boolean)
+"""
+aw = self.activeWindow()
+if aw is None:
+return False
+res = self.closeEditor(aw)
+if res and aw == self.currentEditor:
+self.currentEditor = None
+return res
+def closeAllWindows(self):
+"""
+Public method to close all editor windows via file menu.
+"""
+savedEditors = self.editors[:]
+for editor in savedEditors:
+self.closeEditor(editor)
+def closeWindow(self, fn, ignoreDirty=False):
+"""
+Public method to close an arbitrary source editor.
+@param fn file name of the editor to be closed
+@type str
+@param ignoreDirty flag indicating to ignore the 'dirty' status
+@type bool
+@return flag indicating success
+@rtype bool
+"""
+for editor in self.editors:
+if Utilities.samepath(fn, editor.getFileName()):
+break
+else:
+return True
+res = self.closeEditor(editor, ignoreDirty=ignoreDirty)
 if res and editor == self.currentEditor:
 self.currentEditor = None
 return res
 if encoding is None:
 encoding = ''
 self.sbEnc.setText(encoding)
 if language is None:
-language = ''
+pixmap = QPixmap()
-import QScintilla.Lexers
+elif language == "":
-pixmap = QScintilla.Lexers.getLanguageIcon(language, True)
+pixmap = UI.PixmapCache.getPixmap("fileText.png")
+else:
+import QScintilla.Lexers
+pixmap = QScintilla.Lexers.getLanguageIcon(language, True)
 self.sbLang.setPixmap(pixmap)
 if pixmap.isNull():
 self.sbLang.setText(language)
 self.sbLang.setToolTip("")
 else:
 return
 line, index = aw.getCursorPosition()
 text = aw.text(line)
-reg = QRegExp('[^\w_]')
+reg = QRegExp(r'[^\w_]')
 end = reg.indexIn(text, index)
 if end > index:
 ext = text[index:end]
 txt += ext
 self.quickFindtextCombo.lineEdit().setText(txt)
 @return name of the filename filter (string) or None
 """
 if self.activeWindow() is not None and \
 self.activeWindow().getFileName():
 ext = os.path.splitext(self.activeWindow().getFileName())[1]
-rx = QRegExp(".*\*\.{0}[ )].*".format(ext[1:]))
+rx = QRegExp(r".*\*\.{0}[ )].*".format(ext[1:]))
 import QScintilla.Lexers
 filters = QScintilla.Lexers.getOpenFileFiltersList()
 index = -1
 for i in range(len(filters)):
 if rx.exactMatch(filters[i]):

Mercurial Repositories > eric / file comparison

comparison: ViewManager/ViewManager.py

ViewManager/ViewManager.py