diff -r 10516539f238 -r 0a02c433f52d IconEditor/IconEditorWindow.py
--- a/IconEditor/IconEditorWindow.py Fri Oct 18 23:00:41 2013 +0200
+++ b/IconEditor/IconEditorWindow.py Fri Nov 01 15:48:48 2013 +0100
@@ -185,7 +185,8 @@
"""
Private method to define the file related user interface actions.
"""
- self.newAct = E5Action(self.trUtf8('New'),
+ self.newAct = E5Action(
+ self.trUtf8('New'),
UI.PixmapCache.getIcon("new.png"),
self.trUtf8('&New'),
QKeySequence(self.trUtf8("Ctrl+N", "File|New")),
@@ -198,7 +199,8 @@
self.newAct.triggered[()].connect(self.__newIcon)
self.__actions.append(self.newAct)
- self.newWindowAct = E5Action(self.trUtf8('New Window'),
+ self.newWindowAct = E5Action(
+ self.trUtf8('New Window'),
UI.PixmapCache.getIcon("newWindow.png"),
self.trUtf8('New &Window'),
0, 0, self, 'iconEditor_file_new_window')
@@ -211,7 +213,8 @@
self.newWindowAct.triggered[()].connect(self.__newWindow)
self.__actions.append(self.newWindowAct)
- self.openAct = E5Action(self.trUtf8('Open'),
+ self.openAct = E5Action(
+ self.trUtf8('Open'),
UI.PixmapCache.getIcon("open.png"),
self.trUtf8('&Open...'),
QKeySequence(self.trUtf8("Ctrl+O", "File|Open")),
@@ -225,11 +228,12 @@
self.openAct.triggered[()].connect(self.__openIcon)
self.__actions.append(self.openAct)
- self.saveAct = E5Action(self.trUtf8('Save'),
- UI.PixmapCache.getIcon("fileSave.png"),
- self.trUtf8('&Save'),
- QKeySequence(self.trUtf8("Ctrl+S", "File|Save")),
- 0, self, 'iconEditor_file_save')
+ self.saveAct = E5Action(
+ self.trUtf8('Save'),
+ UI.PixmapCache.getIcon("fileSave.png"),
+ self.trUtf8('&Save'),
+ QKeySequence(self.trUtf8("Ctrl+S", "File|Save")),
+ 0, self, 'iconEditor_file_save')
self.saveAct.setStatusTip(self.trUtf8('Save the current icon'))
self.saveAct.setWhatsThis(self.trUtf8(
"""<b>Save File</b>"""
@@ -238,7 +242,8 @@
self.saveAct.triggered[()].connect(self.__saveIcon)
self.__actions.append(self.saveAct)
- self.saveAsAct = E5Action(self.trUtf8('Save As'),
+ self.saveAsAct = E5Action(
+ self.trUtf8('Save As'),
UI.PixmapCache.getIcon("fileSaveAs.png"),
self.trUtf8('Save &As...'),
QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")),
@@ -252,7 +257,8 @@
self.saveAsAct.triggered[()].connect(self.__saveIconAs)
self.__actions.append(self.saveAsAct)
- self.closeAct = E5Action(self.trUtf8('Close'),
+ self.closeAct = E5Action(
+ self.trUtf8('Close'),
UI.PixmapCache.getIcon("close.png"),
self.trUtf8('&Close'),
QKeySequence(self.trUtf8("Ctrl+W", "File|Close")),
@@ -266,7 +272,8 @@
self.closeAct.triggered[()].connect(self.close)
self.__actions.append(self.closeAct)
- self.closeAllAct = E5Action(self.trUtf8('Close All'),
+ self.closeAllAct = E5Action(
+ self.trUtf8('Close All'),
self.trUtf8('Close &All'),
0, 0, self, 'iconEditor_file_close_all')
self.closeAllAct.setStatusTip(self.trUtf8(
@@ -278,7 +285,8 @@
self.closeAllAct.triggered[()].connect(self.__closeAll)
self.__actions.append(self.closeAllAct)
- self.exitAct = E5Action(self.trUtf8('Quit'),
+ self.exitAct = E5Action(
+ self.trUtf8('Quit'),
UI.PixmapCache.getIcon("exit.png"),
self.trUtf8('&Quit'),
QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit")),
@@ -296,12 +304,13 @@
"""
Private method to create the Edit actions.
"""
- self.undoAct = E5Action(self.trUtf8('Undo'),
- UI.PixmapCache.getIcon("editUndo.png"),
- self.trUtf8('&Undo'),
- QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")),
- QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")),
- self, 'iconEditor_edit_undo')
+ self.undoAct = E5Action(
+ self.trUtf8('Undo'),
+ UI.PixmapCache.getIcon("editUndo.png"),
+ self.trUtf8('&Undo'),
+ QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")),
+ QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")),
+ self, 'iconEditor_edit_undo')
self.undoAct.setStatusTip(self.trUtf8('Undo the last change'))
self.undoAct.setWhatsThis(self.trUtf8(
"""<b>Undo</b>"""
@@ -310,11 +319,12 @@
self.undoAct.triggered[()].connect(self.__editor.editUndo)
self.__actions.append(self.undoAct)
- self.redoAct = E5Action(self.trUtf8('Redo'),
- UI.PixmapCache.getIcon("editRedo.png"),
- self.trUtf8('&Redo'),
- QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")),
- 0, self, 'iconEditor_edit_redo')
+ self.redoAct = E5Action(
+ self.trUtf8('Redo'),
+ UI.PixmapCache.getIcon("editRedo.png"),
+ self.trUtf8('&Redo'),
+ QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")),
+ 0, self, 'iconEditor_edit_redo')
self.redoAct.setStatusTip(self.trUtf8('Redo the last change'))
self.redoAct.setWhatsThis(self.trUtf8(
"""<b>Redo</b>"""
@@ -323,12 +333,13 @@
self.redoAct.triggered[()].connect(self.__editor.editRedo)
self.__actions.append(self.redoAct)
- self.cutAct = E5Action(self.trUtf8('Cut'),
- UI.PixmapCache.getIcon("editCut.png"),
- self.trUtf8('Cu&t'),
- QKeySequence(self.trUtf8("Ctrl+X", "Edit|Cut")),
- QKeySequence(self.trUtf8("Shift+Del", "Edit|Cut")),
- self, 'iconEditor_edit_cut')
+ self.cutAct = E5Action(
+ self.trUtf8('Cut'),
+ UI.PixmapCache.getIcon("editCut.png"),
+ self.trUtf8('Cu&t'),
+ QKeySequence(self.trUtf8("Ctrl+X", "Edit|Cut")),
+ QKeySequence(self.trUtf8("Shift+Del", "Edit|Cut")),
+ self, 'iconEditor_edit_cut')
self.cutAct.setStatusTip(self.trUtf8('Cut the selection'))
self.cutAct.setWhatsThis(self.trUtf8(
"""<b>Cut</b>"""
@@ -337,12 +348,13 @@
self.cutAct.triggered[()].connect(self.__editor.editCut)
self.__actions.append(self.cutAct)
- self.copyAct = E5Action(self.trUtf8('Copy'),
- UI.PixmapCache.getIcon("editCopy.png"),
- self.trUtf8('&Copy'),
- QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")),
- QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")),
- self, 'iconEditor_edit_copy')
+ self.copyAct = E5Action(
+ self.trUtf8('Copy'),
+ UI.PixmapCache.getIcon("editCopy.png"),
+ self.trUtf8('&Copy'),
+ QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")),
+ QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")),
+ self, 'iconEditor_edit_copy')
self.copyAct.setStatusTip(self.trUtf8('Copy the selection'))
self.copyAct.setWhatsThis(self.trUtf8(
"""<b>Copy</b>"""
@@ -351,12 +363,13 @@
self.copyAct.triggered[()].connect(self.__editor.editCopy)
self.__actions.append(self.copyAct)
- self.pasteAct = E5Action(self.trUtf8('Paste'),
- UI.PixmapCache.getIcon("editPaste.png"),
- self.trUtf8('&Paste'),
- QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")),
- QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")),
- self, 'iconEditor_edit_paste')
+ self.pasteAct = E5Action(
+ self.trUtf8('Paste'),
+ UI.PixmapCache.getIcon("editPaste.png"),
+ self.trUtf8('&Paste'),
+ QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")),
+ QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")),
+ self, 'iconEditor_edit_paste')
self.pasteAct.setStatusTip(self.trUtf8('Paste the clipboard image'))
self.pasteAct.setWhatsThis(self.trUtf8(
"""<b>Paste</b>"""
@@ -365,9 +378,10 @@
self.pasteAct.triggered[()].connect(self.__editor.editPaste)
self.__actions.append(self.pasteAct)
- self.pasteNewAct = E5Action(self.trUtf8('Paste as New'),
- self.trUtf8('Paste as &New'),
- 0, 0, self, 'iconEditor_edit_paste_as_new')
+ self.pasteNewAct = E5Action(
+ self.trUtf8('Paste as New'),
+ self.trUtf8('Paste as &New'),
+ 0, 0, self, 'iconEditor_edit_paste_as_new')
self.pasteNewAct.setStatusTip(self.trUtf8(
'Paste the clipboard image replacing the current one'))
self.pasteNewAct.setWhatsThis(self.trUtf8(
@@ -377,12 +391,13 @@
self.pasteNewAct.triggered[()].connect(self.__editor.editPasteAsNew)
self.__actions.append(self.pasteNewAct)
- self.deleteAct = E5Action(self.trUtf8('Clear'),
- UI.PixmapCache.getIcon("editDelete.png"),
- self.trUtf8('Cl&ear'),
- QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")),
- 0,
- self, 'iconEditor_edit_clear')
+ self.deleteAct = E5Action(
+ self.trUtf8('Clear'),
+ UI.PixmapCache.getIcon("editDelete.png"),
+ self.trUtf8('Cl&ear'),
+ QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")),
+ 0,
+ self, 'iconEditor_edit_clear')
self.deleteAct.setStatusTip(self.trUtf8('Clear the icon image'))
self.deleteAct.setWhatsThis(self.trUtf8(
"""<b>Clear</b>"""
@@ -392,11 +407,12 @@
self.deleteAct.triggered[()].connect(self.__editor.editClear)
self.__actions.append(self.deleteAct)
- self.selectAllAct = E5Action(self.trUtf8('Select All'),
- self.trUtf8('&Select All'),
- QKeySequence(self.trUtf8("Ctrl+A", "Edit|Select All")),
- 0,
- self, 'iconEditor_edit_select_all')
+ self.selectAllAct = E5Action(
+ self.trUtf8('Select All'),
+ self.trUtf8('&Select All'),
+ QKeySequence(self.trUtf8("Ctrl+A", "Edit|Select All")),
+ 0,
+ self, 'iconEditor_edit_select_all')
self.selectAllAct.setStatusTip(self.trUtf8(
'Select the complete icon image'))
self.selectAllAct.setWhatsThis(self.trUtf8(
@@ -406,11 +422,12 @@
self.selectAllAct.triggered[()].connect(self.__editor.editSelectAll)
self.__actions.append(self.selectAllAct)
- self.resizeAct = E5Action(self.trUtf8('Change Size'),
- UI.PixmapCache.getIcon("transformResize.png"),
- self.trUtf8('Change Si&ze...'),
- 0, 0,
- self, 'iconEditor_edit_change_size')
+ self.resizeAct = E5Action(
+ self.trUtf8('Change Size'),
+ UI.PixmapCache.getIcon("transformResize.png"),
+ self.trUtf8('Change Si&ze...'),
+ 0, 0,
+ self, 'iconEditor_edit_change_size')
self.resizeAct.setStatusTip(self.trUtf8('Change the icon size'))
self.resizeAct.setWhatsThis(self.trUtf8(
"""<b>Change Size...</b>"""
@@ -419,11 +436,12 @@
self.resizeAct.triggered[()].connect(self.__editor.editResize)
self.__actions.append(self.resizeAct)
- self.grayscaleAct = E5Action(self.trUtf8('Grayscale'),
- UI.PixmapCache.getIcon("grayscale.png"),
- self.trUtf8('&Grayscale'),
- 0, 0,
- self, 'iconEditor_edit_grayscale')
+ self.grayscaleAct = E5Action(
+ self.trUtf8('Grayscale'),
+ UI.PixmapCache.getIcon("grayscale.png"),
+ self.trUtf8('&Grayscale'),
+ 0, 0,
+ self, 'iconEditor_edit_grayscale')
self.grayscaleAct.setStatusTip(self.trUtf8(
'Change the icon to grayscale'))
self.grayscaleAct.setWhatsThis(self.trUtf8(
@@ -455,7 +473,8 @@
"""
Private method to create the View actions.
"""
- self.zoomInAct = E5Action(self.trUtf8('Zoom in'),
+ self.zoomInAct = E5Action(
+ self.trUtf8('Zoom in'),
UI.PixmapCache.getIcon("zoomIn.png"),
self.trUtf8('Zoom &in'),
QKeySequence(self.trUtf8("Ctrl++", "View|Zoom in")),
@@ -468,7 +487,8 @@
self.zoomInAct.triggered[()].connect(self.__zoomIn)
self.__actions.append(self.zoomInAct)
- self.zoomOutAct = E5Action(self.trUtf8('Zoom out'),
+ self.zoomOutAct = E5Action(
+ self.trUtf8('Zoom out'),
UI.PixmapCache.getIcon("zoomOut.png"),
self.trUtf8('Zoom &out'),
QKeySequence(self.trUtf8("Ctrl+-", "View|Zoom out")),
@@ -481,7 +501,8 @@
self.zoomOutAct.triggered[()].connect(self.__zoomOut)
self.__actions.append(self.zoomOutAct)
- self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'),
+ self.zoomResetAct = E5Action(
+ self.trUtf8('Zoom reset'),
UI.PixmapCache.getIcon("zoomReset.png"),
self.trUtf8('Zoom &reset'),
QKeySequence(self.trUtf8("Ctrl+0", "View|Zoom reset")),
@@ -496,7 +517,8 @@
self.zoomResetAct.triggered[()].connect(self.__zoomReset)
self.__actions.append(self.zoomResetAct)
- self.showGridAct = E5Action(self.trUtf8('Show Grid'),
+ self.showGridAct = E5Action(
+ self.trUtf8('Show Grid'),
UI.PixmapCache.getIcon("grid.png"),
self.trUtf8('Show &Grid'),
0, 0,
@@ -522,7 +544,8 @@
self.drawingActGrp = createActionGroup(self)
self.drawingActGrp.setExclusive(True)
- self.drawPencilAct = E5Action(self.trUtf8('Freehand'),
+ self.drawPencilAct = E5Action(
+ self.trUtf8('Freehand'),
UI.PixmapCache.getIcon("drawBrush.png"),
self.trUtf8('&Freehand'),
0, 0,
@@ -536,7 +559,8 @@
self.drawPencilAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawPencilAct)
- self.drawColorPickerAct = E5Action(self.trUtf8('Color Picker'),
+ self.drawColorPickerAct = E5Action(
+ self.trUtf8('Color Picker'),
UI.PixmapCache.getIcon("colorPicker.png"),
self.trUtf8('&Color Picker'),
0, 0,
@@ -552,7 +576,8 @@
self.drawColorPickerAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawColorPickerAct)
- self.drawRectangleAct = E5Action(self.trUtf8('Rectangle'),
+ self.drawRectangleAct = E5Action(
+ self.trUtf8('Rectangle'),
UI.PixmapCache.getIcon("drawRectangle.png"),
self.trUtf8('&Rectangle'),
0, 0,
@@ -566,7 +591,8 @@
self.drawRectangleAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawRectangleAct)
- self.drawFilledRectangleAct = E5Action(self.trUtf8('Filled Rectangle'),
+ self.drawFilledRectangleAct = E5Action(
+ self.trUtf8('Filled Rectangle'),
UI.PixmapCache.getIcon("drawRectangleFilled.png"),
self.trUtf8('F&illed Rectangle'),
0, 0,
@@ -581,7 +607,8 @@
self.drawFilledRectangleAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawFilledRectangleAct)
- self.drawCircleAct = E5Action(self.trUtf8('Circle'),
+ self.drawCircleAct = E5Action(
+ self.trUtf8('Circle'),
UI.PixmapCache.getIcon("drawCircle.png"),
self.trUtf8('Circle'),
0, 0,
@@ -595,7 +622,8 @@
self.drawCircleAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawCircleAct)
- self.drawFilledCircleAct = E5Action(self.trUtf8('Filled Circle'),
+ self.drawFilledCircleAct = E5Action(
+ self.trUtf8('Filled Circle'),
UI.PixmapCache.getIcon("drawCircleFilled.png"),
self.trUtf8('Fille&d Circle'),
0, 0,
@@ -610,7 +638,8 @@
self.drawFilledCircleAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawFilledCircleAct)
- self.drawEllipseAct = E5Action(self.trUtf8('Ellipse'),
+ self.drawEllipseAct = E5Action(
+ self.trUtf8('Ellipse'),
UI.PixmapCache.getIcon("drawEllipse.png"),
self.trUtf8('&Ellipse'),
0, 0,
@@ -624,7 +653,8 @@
self.drawEllipseAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawEllipseAct)
- self.drawFilledEllipseAct = E5Action(self.trUtf8('Filled Ellipse'),
+ self.drawFilledEllipseAct = E5Action(
+ self.trUtf8('Filled Ellipse'),
UI.PixmapCache.getIcon("drawEllipseFilled.png"),
self.trUtf8('Fille&d Elli&pse'),
0, 0,
@@ -639,7 +669,8 @@
self.drawFilledEllipseAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawFilledEllipseAct)
- self.drawFloodFillAct = E5Action(self.trUtf8('Flood Fill'),
+ self.drawFloodFillAct = E5Action(
+ self.trUtf8('Flood Fill'),
UI.PixmapCache.getIcon("drawFill.png"),
self.trUtf8('Fl&ood Fill'),
0, 0,
@@ -654,7 +685,8 @@
self.drawFloodFillAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawFloodFillAct)
- self.drawLineAct = E5Action(self.trUtf8('Line'),
+ self.drawLineAct = E5Action(
+ self.trUtf8('Line'),
UI.PixmapCache.getIcon("drawLine.png"),
self.trUtf8('&Line'),
0, 0,
@@ -668,7 +700,8 @@
self.drawLineAct.triggered[()].connect(self.esm.map)
self.__actions.append(self.drawLineAct)
- self.drawEraserAct = E5Action(self.trUtf8('Eraser (Transparent)'),
+ self.drawEraserAct = E5Action(
+ self.trUtf8('Eraser (Transparent)'),
UI.PixmapCache.getIcon("drawEraser.png"),
self.trUtf8('Eraser (&Transparent)'),
0, 0,
@@ -722,9 +755,10 @@
"""
Private method to create the Help actions.
"""
- self.aboutAct = E5Action(self.trUtf8('About'),
- self.trUtf8('&About'),
- 0, 0, self, 'iconEditor_help_about')
+ self.aboutAct = E5Action(
+ self.trUtf8('About'),
+ self.trUtf8('&About'),
+ 0, 0, self, 'iconEditor_help_about')
self.aboutAct.setStatusTip(self.trUtf8(
'Display information about this software'))
self.aboutAct.setWhatsThis(self.trUtf8(
@@ -733,9 +767,10 @@
self.aboutAct.triggered[()].connect(self.__about)
self.__actions.append(self.aboutAct)
- self.aboutQtAct = E5Action(self.trUtf8('About Qt'),
- self.trUtf8('About &Qt'),
- 0, 0, self, 'iconEditor_help_about_qt')
+ self.aboutQtAct = E5Action(
+ self.trUtf8('About Qt'),
+ self.trUtf8('About &Qt'),
+ 0, 0, self, 'iconEditor_help_about_qt')
self.aboutQtAct.setStatusTip(
self.trUtf8('Display information about the Qt toolkit'))
self.aboutQtAct.setWhatsThis(self.trUtf8(
@@ -745,7 +780,8 @@
self.aboutQtAct.triggered[()].connect(self.__aboutQt)
self.__actions.append(self.aboutQtAct)
- self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'),
+ self.whatsThisAct = E5Action(
+ self.trUtf8('What\'s This?'),
UI.PixmapCache.getIcon("whatsThis.png"),
self.trUtf8('&What\'s This?'),
QKeySequence(self.trUtf8("Shift+F1", "Help|What's This?'")),
@@ -1053,7 +1089,8 @@
if ex:
fileName += ex
if QFileInfo(fileName).exists():
- res = E5MessageBox.yesNo(self,
+ res = E5MessageBox.yesNo(
+ self,
self.trUtf8("Save icon file"),
self.trUtf8("<p>The file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fileName),
@@ -1175,7 +1212,8 @@
@return flag indicating, if it is ok to continue (boolean)
"""
if self.__editor.isDirty():
- ret = E5MessageBox.okToClearData(self,
+ ret = E5MessageBox.okToClearData(
+ self,
self.trUtf8("eric5 Icon Editor"),
self.trUtf8("""The icon image has unsaved changes."""),
self.__saveIcon)
