eric: comparison eric6/ViewManager/ViewManager.py

-:10554f5fac78
+:096b3ebc1409
 # Copyright (c) 2002 - 2020 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 """
-Module implementing the viewmanager base class.
+Module implementing the view manager base class.
 """
+import re
 import os
 from PyQt5.QtCore import (
-pyqtSignal, pyqtSlot, QSignalMapper, QTimer, QFileInfo, QRegExp, Qt,
+pyqtSignal, pyqtSlot, Qt, QSignalMapper, QTimer, QFileInfo, QPoint,
-QCoreApplication, QPoint
+QCoreApplication
 )
 from PyQt5.QtGui import QColor, QKeySequence, QPalette, QPixmap
 from PyQt5.QtWidgets import (
 QLineEdit, QToolBar, QWidgetAction, QDialog, QApplication, QMenu,
 QComboBox, QWidget
 from Globals import recentNameFiles, isMacPlatform
 import Preferences
 from QScintilla.Editor import Editor
-from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
 import Utilities
 import UI.PixmapCache
 import UI.Config
 super(QuickSearchLineEdit, self).focusInEvent(evt)   # pass it on
 class ViewManager(QWidget):
 """
-Base class inherited by all specific viewmanager classes.
+Base class inherited by all specific view manager classes.
 It defines the interface to be implemented by specific
-viewmanager classes and all common methods.
+view manager classes and all common methods.
 @signal changeCaption(str) emitted if a change of the caption is necessary
 @signal editorChanged(str) emitted when the current editor has changed
 @signal editorChangedEd(Editor) emitted when the current editor has changed
 @signal lastEditorClosed() emitted after the last editor window was closed
 """
 aw = self.activeWindow()
 if aw is not None:
 menu = aw.getMenu("Languages")
 if menu is not None:
-menu.exec_(pos)
+menu.exec(pos)
 def __showEolMenu(self, pos):
 """
 Private slot to show the EOL menu of the current editor.
 """
 aw = self.activeWindow()
 if aw is not None:
 menu = aw.getMenu("Eol")
 if menu is not None:
-menu.exec_(pos)
+menu.exec(pos)
 def __showEncodingsMenu(self, pos):
 """
 Private slot to show the Encodings menu of the current editor.
 """
 aw = self.activeWindow()
 if aw is not None:
 menu = aw.getMenu("Encodings")
 if menu is not None:
-menu.exec_(pos)
+menu.exec(pos)
 ###########################################################################
 ## methods below need to be implemented by a subclass
 ###########################################################################
 0, self.editorActGrp, 'vm_edit_swap_current_previous_line')
 self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE)
 act.triggered.connect(self.esm.map)
 self.editActions.append(act)
-if QSCINTILLA_VERSION() >= 0x020B00:
+act = E5Action(
-act = E5Action(
+QCoreApplication.translate('ViewManager',
-QCoreApplication.translate('ViewManager',
+'Reverse selected lines'),
-'Reverse selected lines'),
+QCoreApplication.translate('ViewManager',
-QCoreApplication.translate('ViewManager',
+'Reverse selected lines'),
-'Reverse selected lines'),
+QKeySequence(QCoreApplication.translate('ViewManager',
-QKeySequence(QCoreApplication.translate('ViewManager',
+'Meta+Alt+R')),
-'Meta+Alt+R')),
+0, self.editorActGrp, 'vm_edit_reverse selected_lines')
-0, self.editorActGrp, 'vm_edit_reverse selected_lines')
+self.esm.setMapping(act, QsciScintilla.SCI_LINEREVERSE)
-self.esm.setMapping(act, QsciScintilla.SCI_LINEREVERSE)
+act.triggered.connect(self.esm.map)
-act.triggered.connect(self.esm.map)
+self.editActions.append(act)
-self.editActions.append(act)
 act = E5Action(
 QCoreApplication.translate('ViewManager', 'Cut current line'),
 QCoreApplication.translate('ViewManager', 'Cut current line'),
 QKeySequence(QCoreApplication.translate('ViewManager',
 """
 Private method to edit the list of bookmarked files.
 """
 from .BookmarkedFilesDialog import BookmarkedFilesDialog
 dlg = BookmarkedFilesDialog(self.bookmarked, self.ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 self.bookmarked = dlg.getBookmarkedFiles()
 def __clearBookmarked(self):
 """
 Private method to clear the bookmarked files menu.
 return
 line, index = aw.getCursorPosition()
 text = aw.text(line)
-reg = QRegExp(r'[^\w_]')
+rx = re.compile(r'[^\w_]')
-end = reg.indexIn(text, index)
+match = rx.search(text, index)
-if end > index:
+if match:
-ext = text[index:end]
+end = match.start()
-txt += ext
+if end > index:
-self.quickFindtextCombo.lineEdit().setText(txt)
+ext = text[index:end]
+txt += ext
+self.quickFindtextCombo.lineEdit().setText(txt)
 def showSearchWidget(self):
 """
 Public method to show the search widget.
 """
 aw = self.activeWindow()
 lines = aw.lines()
 curLine = aw.getCursorPosition()[0] + 1
 dlg = GotoDialog(lines, curLine, self.ui, None, True)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 aw.gotoLine(dlg.getLinenumber(), expand=True)
 def __gotoBrace(self):
 """
 Private method to handle the goto brace action.
 else:
 aw = self.activeWindow()
 if aw:
 aw.zoomOut()
 self.sbZoom.setValue(aw.getZoom())
 def __zoomReset(self):
 """
 Private method to reset the zoom factor.
 """
-if QApplication.focusWidget() == e5App().getObject("Shell"):
+self.__zoomTo(0)
-e5App().getObject("Shell").zoomTo(0)
-else:
-aw = self.activeWindow()
-if aw:
-aw.zoomTo(0)
-self.sbZoom.setValue(aw.getZoom())
 def __zoom(self):
 """
 Private method to handle the zoom action.
 """
 if QApplication.focusWidget() == e5App().getObject("Shell"):
 else:
 aw = self.activeWindow()
 if aw:
 from QScintilla.ZoomDialog import ZoomDialog
 dlg = ZoomDialog(aw.getZoom(), self.ui, None, True)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 value = dlg.getZoomSize()
 self.__zoomTo(value)
 def __zoomTo(self, value):
 """
 @param dictionaryFile file name of the dictionary to edit (string)
 """
 if os.path.exists(dictionaryFile):
 try:
-f = open(dictionaryFile, "r", encoding="utf-8")
+with open(dictionaryFile, "r", encoding="utf-8") as f:
 data = f.read()
-f.close()
 except (IOError, OSError) as err:
 E5MessageBox.critical(
 self.ui,
 QCoreApplication.translate(
 'ViewManager', "Edit Spelling Dictionary"),
 dlg = SpellingDictionaryEditDialog(
 data,
 QCoreApplication.translate('ViewManager', "Editing {0}")
 .format(fileInfo),
 self.ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 data = dlg.getData()
 try:
-f = open(dictionaryFile, "w", encoding="utf-8")
+with open(dictionaryFile, "w", encoding="utf-8") as f:
 f.write(data)
-f.close()
 except (IOError, OSError) as err:
 E5MessageBox.critical(
 self.ui,
 QCoreApplication.translate(
 'ViewManager', "Edit Spelling Dictionary"),
 if (
 self.activeWindow() is not None and
 self.activeWindow().getFileName()
 ):
 ext = os.path.splitext(self.activeWindow().getFileName())[1]
-rx = QRegExp(r".*\*\.{0}[ )].*".format(ext[1:]))
+rx = re.compile(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]):
+if rx.fullmatch(filters[i]):
 index = i
 break
 if index == -1:
 return Preferences.getEditor("DefaultOpenFilter")
 else:

Mercurial Repositories > eric / file comparison

comparison: eric6/ViewManager/ViewManager.py

eric6/ViewManager/ViewManager.py