Mercurial Repositories > eric / file comparison
comparison: IconEditor/IconEditorWindow.py
IconEditor/IconEditorWindow.py
- changeset 3656
- 441956d8fce5
- parent 3591
- 2f2a4a76dd22
- child 3670
- f0cb7579c0b4
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import os | 12 import os |
| 13 | 13 |
| 14 from PyQt4.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, \ | 14 from PyQt5.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, \ |
| 15 QFile, QEvent | 15 QFile, QEvent |
| 16 from PyQt4.QtGui import QScrollArea, QPalette, QImage, QImageReader, \ | 16 from PyQt5.QtGui import QPalette, QImage, QImageReader, QImageWriter, \ |
| 17 QImageWriter, QKeySequence, QLabel, QDockWidget, QWhatsThis | 17 QKeySequence |
| 18 from PyQt5.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis | |
| 18 | 19 |
| 19 from E5Gui.E5Action import E5Action, createActionGroup | 20 from E5Gui.E5Action import E5Action, createActionGroup |
| 20 from E5Gui import E5FileDialog, E5MessageBox | 21 from E5Gui import E5FileDialog, E5MessageBox |
| 21 from E5Gui.E5MainWindow import E5MainWindow | 22 from E5Gui.E5MainWindow import E5MainWindow |
| 22 from E5Gui.E5ZoomWidget import E5ZoomWidget | 23 from E5Gui.E5ZoomWidget import E5ZoomWidget |
| 1324 Protected method to handle wheel events. | 1325 Protected method to handle wheel events. |
| 1325 | 1326 |
| 1326 @param evt reference to the wheel event (QWheelEvent) | 1327 @param evt reference to the wheel event (QWheelEvent) |
| 1327 """ | 1328 """ |
| 1328 if evt.modifiers() & Qt.ControlModifier: | 1329 if evt.modifiers() & Qt.ControlModifier: |
| 1329 if evt.delta() < 0: | 1330 if evt.angleDelta().y() < 0: |
| 1330 self.__zoomOut() | 1331 self.__zoomOut() |
| 1331 else: | 1332 else: |
| 1332 self.__zoomIn() | 1333 self.__zoomIn() |
| 1333 evt.accept() | 1334 evt.accept() |
| 1334 return | 1335 return |
