Mercurial Repositories > eric / file comparison
comparison: eric6/IconEditor/IconEditorWindow.py
eric6/IconEditor/IconEditorWindow.py
- branch
- maintenance
- changeset 8176
- 31965986ecd1
- parent 8043
- 0acf98cd089a
- parent 8150
- fc1ae39af8c9
- child 8273
- 698ae46f40a4
equal
deleted
inserted
replaced
| 8153:e01ae92db699 | 8176:31965986ecd1 |
|---|---|
| 67 self.setStyle(Preferences.getUI("Style"), | 67 self.setStyle(Preferences.getUI("Style"), |
| 68 Preferences.getUI("StyleSheet")) | 68 Preferences.getUI("StyleSheet")) |
| 69 self.__editor = IconEditorGrid() | 69 self.__editor = IconEditorGrid() |
| 70 self.__scrollArea = QScrollArea() | 70 self.__scrollArea = QScrollArea() |
| 71 self.__scrollArea.setWidget(self.__editor) | 71 self.__scrollArea.setWidget(self.__editor) |
| 72 self.__scrollArea.viewport().setBackgroundRole(QPalette.Dark) | 72 self.__scrollArea.viewport().setBackgroundRole( |
| 73 QPalette.ColorRole.Dark) | |
| 73 self.__scrollArea.viewport().setAutoFillBackground(True) | 74 self.__scrollArea.viewport().setAutoFillBackground(True) |
| 74 self.setCentralWidget(self.__scrollArea) | 75 self.setCentralWidget(self.__scrollArea) |
| 75 | 76 |
| 76 g = Preferences.getGeometry("IconEditorGeometry") | 77 g = Preferences.getGeometry("IconEditorGeometry") |
| 77 if g.isEmpty(): | 78 if g.isEmpty(): |
| 113 | 114 |
| 114 self.__project = project | 115 self.__project = project |
| 115 self.__lastOpenPath = "" | 116 self.__lastOpenPath = "" |
| 116 self.__lastSavePath = "" | 117 self.__lastSavePath = "" |
| 117 | 118 |
| 118 self.grabGesture(Qt.PinchGesture) | 119 self.grabGesture(Qt.GestureType.PinchGesture) |
| 119 | 120 |
| 120 def __initFileFilters(self): | 121 def __initFileFilters(self): |
| 121 """ | 122 """ |
| 122 Private method to define the supported image file filters. | 123 Private method to define the supported image file filters. |
| 123 """ | 124 """ |
| 555 def __initToolsActions(self): | 556 def __initToolsActions(self): |
| 556 """ | 557 """ |
| 557 Private method to create the View actions. | 558 Private method to create the View actions. |
| 558 """ | 559 """ |
| 559 self.esm = QSignalMapper(self) | 560 self.esm = QSignalMapper(self) |
| 560 self.esm.mapped[int].connect(self.__editor.setTool) | 561 try: |
| 562 self.esm.mappedInt.connect(self.__editor.setTool) | |
| 563 except AttributeError: | |
| 564 # pre Qt 5.15 | |
| 565 self.esm.mapped[int].connect(self.__editor.setTool) | |
| 561 | 566 |
| 562 self.drawingActGrp = createActionGroup(self) | 567 self.drawingActGrp = createActionGroup(self) |
| 563 self.drawingActGrp.setExclusive(True) | 568 self.drawingActGrp.setExclusive(True) |
| 564 | 569 |
| 565 self.drawPencilAct = E5Action( | 570 self.drawPencilAct = E5Action( |
| 992 from .IconEditorPalette import IconEditorPalette | 997 from .IconEditorPalette import IconEditorPalette |
| 993 | 998 |
| 994 self.__paletteDock = QDockWidget(self) | 999 self.__paletteDock = QDockWidget(self) |
| 995 self.__paletteDock.setObjectName("paletteDock") | 1000 self.__paletteDock.setObjectName("paletteDock") |
| 996 self.__paletteDock.setFeatures( | 1001 self.__paletteDock.setFeatures( |
| 997 QDockWidget.DockWidgetFeatures(QDockWidget.AllDockWidgetFeatures)) | 1002 QDockWidget.DockWidgetFeatures( |
| 1003 QDockWidget.DockWidgetFeature.DockWidgetClosable | | |
| 1004 QDockWidget.DockWidgetFeature.DockWidgetMovable | | |
| 1005 QDockWidget.DockWidgetFeature.DockWidgetFloatable | |
| 1006 ) | |
| 1007 ) | |
| 998 self.__paletteDock.setWindowTitle("Palette") | 1008 self.__paletteDock.setWindowTitle("Palette") |
| 999 self.__palette = IconEditorPalette() | 1009 self.__palette = IconEditorPalette() |
| 1000 self.__paletteDock.setWidget(self.__palette) | 1010 self.__paletteDock.setWidget(self.__palette) |
| 1001 self.addDockWidget(Qt.RightDockWidgetArea, self.__paletteDock) | 1011 self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, |
| 1012 self.__paletteDock) | |
| 1002 | 1013 |
| 1003 def closeEvent(self, evt): | 1014 def closeEvent(self, evt): |
| 1004 """ | 1015 """ |
| 1005 Protected event handler for the close event. | 1016 Protected event handler for the close event. |
| 1006 | 1017 |
| 1349 """ | 1360 """ |
| 1350 Protected method to handle wheel events. | 1361 Protected method to handle wheel events. |
| 1351 | 1362 |
| 1352 @param evt reference to the wheel event (QWheelEvent) | 1363 @param evt reference to the wheel event (QWheelEvent) |
| 1353 """ | 1364 """ |
| 1354 if evt.modifiers() & Qt.ControlModifier: | 1365 if evt.modifiers() & Qt.KeyboardModifier.ControlModifier: |
| 1355 delta = evt.angleDelta().y() | 1366 delta = evt.angleDelta().y() |
| 1356 if delta < 0: | 1367 if delta < 0: |
| 1357 self.__zoomOut() | 1368 self.__zoomOut() |
| 1358 elif delta > 0: | 1369 elif delta > 0: |
| 1359 self.__zoomIn() | 1370 self.__zoomIn() |
| 1367 Public method handling events. | 1378 Public method handling events. |
| 1368 | 1379 |
| 1369 @param evt reference to the event (QEvent) | 1380 @param evt reference to the event (QEvent) |
| 1370 @return flag indicating, if the event was handled (boolean) | 1381 @return flag indicating, if the event was handled (boolean) |
| 1371 """ | 1382 """ |
| 1372 if evt.type() == QEvent.Gesture: | 1383 if evt.type() == QEvent.Type.Gesture: |
| 1373 self.gestureEvent(evt) | 1384 self.gestureEvent(evt) |
| 1374 return True | 1385 return True |
| 1375 | 1386 |
| 1376 return super(IconEditorWindow, self).event(evt) | 1387 return super(IconEditorWindow, self).event(evt) |
| 1377 | 1388 |
| 1379 """ | 1390 """ |
| 1380 Protected method handling gesture events. | 1391 Protected method handling gesture events. |
| 1381 | 1392 |
| 1382 @param evt reference to the gesture event (QGestureEvent | 1393 @param evt reference to the gesture event (QGestureEvent |
| 1383 """ | 1394 """ |
| 1384 pinch = evt.gesture(Qt.PinchGesture) | 1395 pinch = evt.gesture(Qt.GestureType.PinchGesture) |
| 1385 if pinch: | 1396 if pinch: |
| 1386 if pinch.state() == Qt.GestureStarted: | 1397 if pinch.state() == Qt.GestureState.GestureStarted: |
| 1387 pinch.setTotalScaleFactor(self.__editor.zoomFactor() / 100.0) | 1398 pinch.setTotalScaleFactor(self.__editor.zoomFactor() / 100.0) |
| 1388 elif pinch.state() == Qt.GestureUpdated: | 1399 elif pinch.state() == Qt.GestureState.GestureUpdated: |
| 1389 self.__editor.setZoomFactor( | 1400 self.__editor.setZoomFactor( |
| 1390 int(pinch.totalScaleFactor() * 100)) | 1401 int(pinch.totalScaleFactor() * 100)) |
| 1391 self.__updateZoom() | 1402 self.__updateZoom() |
| 1392 evt.accept() | 1403 evt.accept() |
