Mercurial Repositories > eric / file comparison
comparison: QScintilla/Shell.py
QScintilla/Shell.py
- changeset 3656
- 441956d8fce5
- parent 3631
- 2f5169646a4a
- child 3693
- 983904b9568f
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import sys | 12 import sys |
| 13 import re | 13 import re |
| 14 | 14 |
| 15 from PyQt4.QtCore import pyqtSignal, QFileInfo, Qt, QEvent | 15 from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent |
| 16 from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QClipboard, \ | 16 from PyQt5.QtGui import QClipboard, QPalette, QFont |
| 17 QMenu, QPalette, QFont, QWidget, QHBoxLayout, QVBoxLayout, QShortcut | 17 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \ |
| 18 from PyQt4.Qsci import QsciScintilla | 18 QWidget, QHBoxLayout, QVBoxLayout, QShortcut |
| 19 from PyQt5.Qsci import QsciScintilla | |
| 19 | 20 |
| 20 from E5Gui.E5Application import e5App | 21 from E5Gui.E5Application import e5App |
| 21 from E5Gui import E5MessageBox | 22 from E5Gui import E5MessageBox |
| 22 | 23 |
| 23 from .QsciScintillaCompat import QsciScintillaCompat | 24 from .QsciScintillaCompat import QsciScintillaCompat |
| 854 Protected method to handle wheel events. | 855 Protected method to handle wheel events. |
| 855 | 856 |
| 856 @param evt reference to the wheel event (QWheelEvent) | 857 @param evt reference to the wheel event (QWheelEvent) |
| 857 """ | 858 """ |
| 858 if evt.modifiers() & Qt.ControlModifier: | 859 if evt.modifiers() & Qt.ControlModifier: |
| 859 if evt.delta() < 0: | 860 if evt.angleDelta().y() < 0: |
| 860 self.zoomOut() | 861 self.zoomOut() |
| 861 else: | 862 else: |
| 862 self.zoomIn() | 863 self.zoomIn() |
| 863 evt.accept() | 864 evt.accept() |
| 864 return | 865 return |
