diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/IconEditor/IconEditorWindow.py
--- a/eric7/IconEditor/IconEditorWindow.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/IconEditor/IconEditorWindow.py Sat May 22 18:51:46 2021 +0200
@@ -18,10 +18,10 @@
)
from PyQt6.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis
-from E5Gui.E5Action import E5Action, createActionGroup
-from E5Gui import E5FileDialog, E5MessageBox
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5ZoomWidget import E5ZoomWidget
+from E5Gui.EricAction import EricAction, createActionGroup
+from E5Gui import EricFileDialog, EricMessageBox
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricZoomWidget import EricZoomWidget
from .IconEditorGrid import IconEditorGrid, IconEditorTool
@@ -31,7 +31,7 @@
import Preferences
-class IconEditorWindow(E5MainWindow):
+class IconEditorWindow(EricMainWindow):
"""
Class implementing the web browser main window.
@@ -188,7 +188,7 @@
"""
Private method to define the file related user interface actions.
"""
- self.newAct = E5Action(
+ self.newAct = EricAction(
self.tr('New'),
UI.PixmapCache.getIcon("new"),
self.tr('&New'),
@@ -202,7 +202,7 @@
self.newAct.triggered.connect(self.__newIcon)
self.__actions.append(self.newAct)
- self.newWindowAct = E5Action(
+ self.newWindowAct = EricAction(
self.tr('New Window'),
UI.PixmapCache.getIcon("newWindow"),
self.tr('New &Window'),
@@ -216,7 +216,7 @@
self.newWindowAct.triggered.connect(self.__newWindow)
self.__actions.append(self.newWindowAct)
- self.openAct = E5Action(
+ self.openAct = EricAction(
self.tr('Open'),
UI.PixmapCache.getIcon("open"),
self.tr('&Open...'),
@@ -231,7 +231,7 @@
self.openAct.triggered.connect(self.__openIcon)
self.__actions.append(self.openAct)
- self.saveAct = E5Action(
+ self.saveAct = EricAction(
self.tr('Save'),
UI.PixmapCache.getIcon("fileSave"),
self.tr('&Save'),
@@ -245,7 +245,7 @@
self.saveAct.triggered.connect(self.__saveIcon)
self.__actions.append(self.saveAct)
- self.saveAsAct = E5Action(
+ self.saveAsAct = EricAction(
self.tr('Save As'),
UI.PixmapCache.getIcon("fileSaveAs"),
self.tr('Save &As...'),
@@ -260,7 +260,7 @@
self.saveAsAct.triggered.connect(self.__saveIconAs)
self.__actions.append(self.saveAsAct)
- self.closeAct = E5Action(
+ self.closeAct = EricAction(
self.tr('Close'),
UI.PixmapCache.getIcon("close"),
self.tr('&Close'),
@@ -275,7 +275,7 @@
self.closeAct.triggered.connect(self.close)
self.__actions.append(self.closeAct)
- self.closeAllAct = E5Action(
+ self.closeAllAct = EricAction(
self.tr('Close All'),
self.tr('Close &All'),
0, 0, self, 'iconEditor_file_close_all')
@@ -288,7 +288,7 @@
self.closeAllAct.triggered.connect(self.__closeAll)
self.__actions.append(self.closeAllAct)
- self.closeOthersAct = E5Action(
+ self.closeOthersAct = EricAction(
self.tr('Close Others'),
self.tr('Close Others'),
0, 0, self, 'iconEditor_file_close_others')
@@ -301,7 +301,7 @@
self.closeOthersAct.triggered.connect(self.__closeOthers)
self.__actions.append(self.closeOthersAct)
- self.exitAct = E5Action(
+ self.exitAct = EricAction(
self.tr('Quit'),
UI.PixmapCache.getIcon("exit"),
self.tr('&Quit'),
@@ -320,7 +320,7 @@
"""
Private method to create the Edit actions.
"""
- self.undoAct = E5Action(
+ self.undoAct = EricAction(
self.tr('Undo'),
UI.PixmapCache.getIcon("editUndo"),
self.tr('&Undo'),
@@ -335,7 +335,7 @@
self.undoAct.triggered.connect(self.__editor.editUndo)
self.__actions.append(self.undoAct)
- self.redoAct = E5Action(
+ self.redoAct = EricAction(
self.tr('Redo'),
UI.PixmapCache.getIcon("editRedo"),
self.tr('&Redo'),
@@ -349,7 +349,7 @@
self.redoAct.triggered.connect(self.__editor.editRedo)
self.__actions.append(self.redoAct)
- self.cutAct = E5Action(
+ self.cutAct = EricAction(
self.tr('Cut'),
UI.PixmapCache.getIcon("editCut"),
self.tr('Cu&t'),
@@ -364,7 +364,7 @@
self.cutAct.triggered.connect(self.__editor.editCut)
self.__actions.append(self.cutAct)
- self.copyAct = E5Action(
+ self.copyAct = EricAction(
self.tr('Copy'),
UI.PixmapCache.getIcon("editCopy"),
self.tr('&Copy'),
@@ -379,7 +379,7 @@
self.copyAct.triggered.connect(self.__editor.editCopy)
self.__actions.append(self.copyAct)
- self.pasteAct = E5Action(
+ self.pasteAct = EricAction(
self.tr('Paste'),
UI.PixmapCache.getIcon("editPaste"),
self.tr('&Paste'),
@@ -394,7 +394,7 @@
self.pasteAct.triggered.connect(self.__editor.editPaste)
self.__actions.append(self.pasteAct)
- self.pasteNewAct = E5Action(
+ self.pasteNewAct = EricAction(
self.tr('Paste as New'),
self.tr('Paste as &New'),
0, 0, self, 'iconEditor_edit_paste_as_new')
@@ -407,7 +407,7 @@
self.pasteNewAct.triggered.connect(self.__editor.editPasteAsNew)
self.__actions.append(self.pasteNewAct)
- self.deleteAct = E5Action(
+ self.deleteAct = EricAction(
self.tr('Clear'),
UI.PixmapCache.getIcon("editDelete"),
self.tr('Cl&ear'),
@@ -423,7 +423,7 @@
self.deleteAct.triggered.connect(self.__editor.editClear)
self.__actions.append(self.deleteAct)
- self.selectAllAct = E5Action(
+ self.selectAllAct = EricAction(
self.tr('Select All'),
self.tr('&Select All'),
QKeySequence(self.tr("Ctrl+A", "Edit|Select All")),
@@ -438,7 +438,7 @@
self.selectAllAct.triggered.connect(self.__editor.editSelectAll)
self.__actions.append(self.selectAllAct)
- self.resizeAct = E5Action(
+ self.resizeAct = EricAction(
self.tr('Change Size'),
UI.PixmapCache.getIcon("transformResize"),
self.tr('Change Si&ze...'),
@@ -452,7 +452,7 @@
self.resizeAct.triggered.connect(self.__editor.editResize)
self.__actions.append(self.resizeAct)
- self.grayscaleAct = E5Action(
+ self.grayscaleAct = EricAction(
self.tr('Grayscale'),
UI.PixmapCache.getIcon("grayscale"),
self.tr('&Grayscale'),
@@ -489,7 +489,7 @@
"""
Private method to create the View actions.
"""
- self.zoomInAct = E5Action(
+ self.zoomInAct = EricAction(
self.tr('Zoom in'),
UI.PixmapCache.getIcon("zoomIn"),
self.tr('Zoom &in'),
@@ -503,7 +503,7 @@
self.zoomInAct.triggered.connect(self.__zoomIn)
self.__actions.append(self.zoomInAct)
- self.zoomOutAct = E5Action(
+ self.zoomOutAct = EricAction(
self.tr('Zoom out'),
UI.PixmapCache.getIcon("zoomOut"),
self.tr('Zoom &out'),
@@ -517,7 +517,7 @@
self.zoomOutAct.triggered.connect(self.__zoomOut)
self.__actions.append(self.zoomOutAct)
- self.zoomResetAct = E5Action(
+ self.zoomResetAct = EricAction(
self.tr('Zoom reset'),
UI.PixmapCache.getIcon("zoomReset"),
self.tr('Zoom &reset'),
@@ -533,7 +533,7 @@
self.zoomResetAct.triggered.connect(self.__zoomReset)
self.__actions.append(self.zoomResetAct)
- self.showGridAct = E5Action(
+ self.showGridAct = EricAction(
self.tr('Show Grid'),
UI.PixmapCache.getIcon("grid"),
self.tr('Show &Grid'),
@@ -560,7 +560,7 @@
self.drawingActGrp = createActionGroup(self)
self.drawingActGrp.setExclusive(True)
- self.drawPencilAct = E5Action(
+ self.drawPencilAct = EricAction(
self.tr('Freehand'),
UI.PixmapCache.getIcon("drawBrush"),
self.tr('&Freehand'),
@@ -575,7 +575,7 @@
self.drawPencilAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawPencilAct)
- self.drawColorPickerAct = E5Action(
+ self.drawColorPickerAct = EricAction(
self.tr('Color Picker'),
UI.PixmapCache.getIcon("colorPicker"),
self.tr('&Color Picker'),
@@ -592,7 +592,7 @@
self.drawColorPickerAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawColorPickerAct)
- self.drawRectangleAct = E5Action(
+ self.drawRectangleAct = EricAction(
self.tr('Rectangle'),
UI.PixmapCache.getIcon("drawRectangle"),
self.tr('&Rectangle'),
@@ -607,7 +607,7 @@
self.drawRectangleAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawRectangleAct)
- self.drawFilledRectangleAct = E5Action(
+ self.drawFilledRectangleAct = EricAction(
self.tr('Filled Rectangle'),
UI.PixmapCache.getIcon("drawRectangleFilled"),
self.tr('F&illed Rectangle'),
@@ -623,7 +623,7 @@
self.drawFilledRectangleAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawFilledRectangleAct)
- self.drawCircleAct = E5Action(
+ self.drawCircleAct = EricAction(
self.tr('Circle'),
UI.PixmapCache.getIcon("drawCircle"),
self.tr('Circle'),
@@ -638,7 +638,7 @@
self.drawCircleAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawCircleAct)
- self.drawFilledCircleAct = E5Action(
+ self.drawFilledCircleAct = EricAction(
self.tr('Filled Circle'),
UI.PixmapCache.getIcon("drawCircleFilled"),
self.tr('Fille&d Circle'),
@@ -654,7 +654,7 @@
self.drawFilledCircleAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawFilledCircleAct)
- self.drawEllipseAct = E5Action(
+ self.drawEllipseAct = EricAction(
self.tr('Ellipse'),
UI.PixmapCache.getIcon("drawEllipse"),
self.tr('&Ellipse'),
@@ -669,7 +669,7 @@
self.drawEllipseAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawEllipseAct)
- self.drawFilledEllipseAct = E5Action(
+ self.drawFilledEllipseAct = EricAction(
self.tr('Filled Ellipse'),
UI.PixmapCache.getIcon("drawEllipseFilled"),
self.tr('Fille&d Elli&pse'),
@@ -685,7 +685,7 @@
self.drawFilledEllipseAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawFilledEllipseAct)
- self.drawFloodFillAct = E5Action(
+ self.drawFloodFillAct = EricAction(
self.tr('Flood Fill'),
UI.PixmapCache.getIcon("drawFill"),
self.tr('Fl&ood Fill'),
@@ -701,7 +701,7 @@
self.drawFloodFillAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawFloodFillAct)
- self.drawLineAct = E5Action(
+ self.drawLineAct = EricAction(
self.tr('Line'),
UI.PixmapCache.getIcon("drawLine"),
self.tr('&Line'),
@@ -716,7 +716,7 @@
self.drawLineAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawLineAct)
- self.drawEraserAct = E5Action(
+ self.drawEraserAct = EricAction(
self.tr('Eraser (Transparent)'),
UI.PixmapCache.getIcon("drawEraser"),
self.tr('Eraser (&Transparent)'),
@@ -731,7 +731,7 @@
self.drawEraserAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawEraserAct)
- self.drawRectangleSelectionAct = E5Action(
+ self.drawRectangleSelectionAct = EricAction(
self.tr('Rectangular Selection'),
UI.PixmapCache.getIcon("selectRectangle"),
self.tr('Rect&angular Selection'),
@@ -748,7 +748,7 @@
self.drawRectangleSelectionAct.triggered.connect(self.esm.map)
self.__actions.append(self.drawRectangleSelectionAct)
- self.drawCircleSelectionAct = E5Action(
+ self.drawCircleSelectionAct = EricAction(
self.tr('Circular Selection'),
UI.PixmapCache.getIcon("selectCircle"),
self.tr('Rect&angular Selection'),
@@ -771,7 +771,7 @@
"""
Private method to create the Help actions.
"""
- self.aboutAct = E5Action(
+ self.aboutAct = EricAction(
self.tr('About'),
self.tr('&About'),
0, 0, self, 'iconEditor_help_about')
@@ -783,7 +783,7 @@
self.aboutAct.triggered.connect(self.__about)
self.__actions.append(self.aboutAct)
- self.aboutQtAct = E5Action(
+ self.aboutQtAct = EricAction(
self.tr('About Qt'),
self.tr('About &Qt'),
0, 0, self, 'iconEditor_help_about_qt')
@@ -796,7 +796,7 @@
self.aboutQtAct.triggered.connect(self.__aboutQt)
self.__actions.append(self.aboutQtAct)
- self.whatsThisAct = E5Action(
+ self.whatsThisAct = EricAction(
self.tr('What\'s This?'),
UI.PixmapCache.getIcon("whatsThis"),
self.tr('&What\'s This?'),
@@ -967,7 +967,7 @@
))
self.__updatePosition(0, 0)
- self.__zoomWidget = E5ZoomWidget(
+ self.__zoomWidget = EricZoomWidget(
UI.PixmapCache.getPixmap("zoomOut"),
UI.PixmapCache.getPixmap("zoomIn"),
UI.PixmapCache.getPixmap("zoomReset"), self)
@@ -1062,7 +1062,7 @@
):
self.__lastOpenPath = self.__project.getProjectPath()
- fileName = E5FileDialog.getOpenFileNameAndFilter(
+ fileName = EricFileDialog.getOpenFileNameAndFilter(
self,
self.tr("Open icon file"),
self.__lastOpenPath,
@@ -1099,13 +1099,13 @@
if not self.__lastSavePath and self.__lastOpenPath:
self.__lastSavePath = self.__lastOpenPath
- fileName, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fileName, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
self,
self.tr("Save icon file"),
self.__lastSavePath,
self.__outputFilter,
self.__defaultFilter,
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fileName:
return False
@@ -1115,12 +1115,12 @@
if ex:
fileName += ex
if QFileInfo(fileName).exists():
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self,
self.tr("Save icon file"),
self.tr("<p>The file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fileName),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return False
@@ -1151,14 +1151,14 @@
"""
file = QFile(fileName)
if not file.exists():
- E5MessageBox.warning(
+ EricMessageBox.warning(
self, self.tr("eric Icon Editor"),
self.tr("The file '{0}' does not exist.")
.format(fileName))
return
if not file.open(QFile.ReadOnly):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self, self.tr("eric Icon Editor"),
self.tr("Cannot read file '{0}:\n{1}.")
.format(fileName, file.errorString()))
@@ -1178,7 +1178,7 @@
"""
file = QFile(fileName)
if not file.open(QFile.WriteOnly):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self, self.tr("eric Icon Editor"),
self.tr("Cannot write file '{0}:\n{1}.")
.format(fileName, file.errorString()))
@@ -1192,7 +1192,7 @@
file.close()
if not res:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self, self.tr("eric Icon Editor"),
self.tr("Cannot write file '{0}:\n{1}.")
.format(fileName, file.errorString()))
@@ -1245,7 +1245,7 @@
@return flag indicating, if it is ok to continue (boolean)
"""
if self.__editor.isDirty():
- ret = E5MessageBox.okToClearData(
+ ret = EricMessageBox.okToClearData(
self,
self.tr("eric Icon Editor"),
self.tr("""The icon image has unsaved changes."""),
@@ -1335,7 +1335,7 @@
"""
Private slot to show a little About message.
"""
- E5MessageBox.about(
+ EricMessageBox.about(
self, self.tr("About eric Icon Editor"),
self.tr("The eric Icon Editor is a simple editor component"
" to perform icon drawing tasks."))
@@ -1344,7 +1344,7 @@
"""
Private slot to handle the About Qt dialog.
"""
- E5MessageBox.aboutQt(self, "eric Icon Editor")
+ EricMessageBox.aboutQt(self, "eric Icon Editor")
def __whatsThis(self):
"""
