Mercurial Repositories > eric / file comparison
comparison: eric7/IconEditor/IconEditorWindow.py
eric7/IconEditor/IconEditorWindow.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8314
- e3642a6a1e71
- child 8322
- b422b4e77d19
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 8 """ | 8 """ |
| 9 | 9 |
| 10 import os | 10 import os |
| 11 import contextlib | 11 import contextlib |
| 12 | 12 |
| 13 from PyQt5.QtCore import ( | 13 from PyQt6.QtCore import ( |
| 14 pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile, QEvent | 14 pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile, QEvent |
| 15 ) | 15 ) |
| 16 from PyQt5.QtGui import ( | 16 from PyQt6.QtGui import ( |
| 17 QPalette, QImage, QImageReader, QImageWriter, QKeySequence | 17 QPalette, QImage, QImageReader, QImageWriter, QKeySequence |
| 18 ) | 18 ) |
| 19 from PyQt5.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis | 19 from PyQt6.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis |
| 20 | 20 |
| 21 from E5Gui.E5Action import E5Action, createActionGroup | 21 from E5Gui.E5Action import E5Action, createActionGroup |
| 22 from E5Gui import E5FileDialog, E5MessageBox | 22 from E5Gui import E5FileDialog, E5MessageBox |
| 23 from E5Gui.E5MainWindow import E5MainWindow | 23 from E5Gui.E5MainWindow import E5MainWindow |
| 24 from E5Gui.E5ZoomWidget import E5ZoomWidget | 24 from E5Gui.E5ZoomWidget import E5ZoomWidget |
| 994 from .IconEditorPalette import IconEditorPalette | 994 from .IconEditorPalette import IconEditorPalette |
| 995 | 995 |
| 996 self.__paletteDock = QDockWidget(self) | 996 self.__paletteDock = QDockWidget(self) |
| 997 self.__paletteDock.setObjectName("paletteDock") | 997 self.__paletteDock.setObjectName("paletteDock") |
| 998 self.__paletteDock.setFeatures( | 998 self.__paletteDock.setFeatures( |
| 999 QDockWidget.DockWidgetFeatures( | 999 QDockWidget.DockWidgetFeature.DockWidgetClosable | |
| 1000 QDockWidget.DockWidgetFeature.DockWidgetClosable | | 1000 QDockWidget.DockWidgetFeature.DockWidgetMovable | |
| 1001 QDockWidget.DockWidgetFeature.DockWidgetMovable | | 1001 QDockWidget.DockWidgetFeature.DockWidgetFloatable |
| 1002 QDockWidget.DockWidgetFeature.DockWidgetFloatable | |
| 1003 ) | |
| 1004 ) | 1002 ) |
| 1005 self.__paletteDock.setWindowTitle("Palette") | 1003 self.__paletteDock.setWindowTitle("Palette") |
| 1006 self.__palette = IconEditorPalette() | 1004 self.__palette = IconEditorPalette() |
| 1007 self.__paletteDock.setWidget(self.__palette) | 1005 self.__paletteDock.setWidget(self.__palette) |
| 1008 self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, | 1006 self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, |
