eric: comparison eric6/ViewManager/ViewManager.py

-:fb0ef164f536
+:698ae46f40a4
 Module implementing the view manager base class.
 """
 import re
 import os
+import contextlib
 from PyQt5.QtCore import (
 pyqtSignal, pyqtSlot, Qt, QSignalMapper, QTimer, QFileInfo, QPoint,
 QCoreApplication
 )
 def __init__(self):
 """
 Constructor
 """
-super(ViewManager, self).__init__()
+super().__init__()
 # initialize the instance variables
 self.editors = []
 self.currentEditor = None
 self.untitledCount = 0
 Public method to check the dirty status of all editors.
 @return flag indicating successful reset of all dirty flags
 @rtype bool
 """
-for editor in self.editors:
+return all(self.checkDirty(editor) for editor in self.editors)
-if not self.checkDirty(editor):
-return False
-return True
 def checkFileDirty(self, fn):
 """
 Public method to check the dirty status of an editor given its file
 name and open a message window.
 """
 self.__loadRecent()
 self.recentMenu.clear()
-idx = 1
+for idx, rs in enumerate(self.recent, start=1):
-for rs in self.recent:
+formatStr = '&{0:d}. {1}' if idx < 10 else '{0:d}. {1}'
-if idx < 10:
-formatStr = '&{0:d}. {1}'
-else:
-formatStr = '{0:d}. {1}'
 act = self.recentMenu.addAction(
 formatStr.format(
 idx,
 Utilities.compactPath(rs, self.ui.maxMenuFilePathLen)))
 act.setData(rs)
 act.setEnabled(QFileInfo(rs).exists())
-idx += 1
 self.recentMenu.addSeparator()
 self.recentMenu.addAction(
 QCoreApplication.translate('ViewManager', '&Clear'),
 self.clearRecent)
 def __zoom(self):
 """
 Private method to handle the zoom action.
 """
-if QApplication.focusWidget() == e5App().getObject("Shell"):
+aw = (
-aw = e5App().getObject("Shell")
+e5App().getObject("Shell")
-else:
+if QApplication.focusWidget() == e5App().getObject("Shell") else
-aw = self.activeWindow()
+self.activeWindow()
+)
 if aw:
 from QScintilla.ZoomDialog import ZoomDialog
 dlg = ZoomDialog(aw.getZoom(), self.ui, None, True)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 value = dlg.getZoomSize()
 """
 Private slot to zoom to a given value.
 @param value zoom value to be set (integer)
 """
-if QApplication.focusWidget() == e5App().getObject("Shell"):
+aw = (
-aw = e5App().getObject("Shell")
+e5App().getObject("Shell")
-else:
+if QApplication.focusWidget() == e5App().getObject("Shell") else
-aw = self.activeWindow()
+self.activeWindow()
+)
 if aw:
 aw.zoomTo(value)
 self.sbZoom.setValue(aw.getZoom())
 def zoomValueChanged(self, value, zoomingWidget):
 @param value new zoom value
 @type int
 @param zoomingWidget reference to the widget triggering the slot
 @type Editor or Shell
 """
-if QApplication.focusWidget() == e5App().getObject("Shell"):
+aw = (
-aw = e5App().getObject("Shell")
+e5App().getObject("Shell")
-else:
+if QApplication.focusWidget() == e5App().getObject("Shell") else
-aw = self.activeWindow()
+self.activeWindow()
+)
 if aw and aw == zoomingWidget:
 self.sbZoom.setValue(value)
 def __clearAllFolds(self):
 """
 If it cannot close all editor windows, it aborts the shutdown process.
 @return flag indicating success (boolean)
 """
-try:
+with contextlib.suppress(TypeError):
 e5App().focusChanged.disconnect(self.appFocusChanged)
-except TypeError:
-pass
 self.closeAllWindows()
 self.currentEditor = None
 # save the list of recently opened projects
 # save the list of recently opened projects
 Preferences.Prefs.settings.setValue(
 'Bookmarked/Sources', self.bookmarked)
-if len(self.editors):
+res = len(self.editors) == 0
-res = False
-else:
-res = True
 if not res:
 e5App().focusChanged.connect(self.appFocusChanged)
 return res
 aw = e5App().getObject("Shell")
 if aw.hasSelectedText():
 txt = aw.selectedText()
 else:
 aw = self.activeWindow()
-if aw is not None:
+if aw is not None and aw.hasSelectedText():
-if aw.hasSelectedText():
+txt = aw.selectedText()
-txt = aw.selectedText()
 return txt

Mercurial Repositories > eric / file comparison

comparison: eric6/ViewManager/ViewManager.py

eric6/ViewManager/ViewManager.py