Mercurial Repositories > eric / file comparison
comparison: IconEditor/IconEditorWindow.py
IconEditor/IconEditorWindow.py
- changeset 12
- 1d8dd9706f46
- parent 0
- de9c2efb9d02
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 10 from PyQt4.QtCore import * | 10 from PyQt4.QtCore import * |
| 11 from PyQt4.QtGui import * | 11 from PyQt4.QtGui import * |
| 12 | 12 |
| 13 from E4Gui.E4Action import E4Action, createActionGroup | 13 from E4Gui.E4Action import E4Action, createActionGroup |
| 14 | 14 |
| 15 from IconEditorGrid import IconEditorGrid | 15 from .IconEditorGrid import IconEditorGrid |
| 16 from IconZoomDialog import IconZoomDialog | 16 from .IconZoomDialog import IconZoomDialog |
| 17 from IconEditorPalette import IconEditorPalette | 17 from .IconEditorPalette import IconEditorPalette |
| 18 | 18 |
| 19 import UI.PixmapCache | 19 import UI.PixmapCache |
| 20 import UI.Config | 20 import UI.Config |
| 21 | 21 |
| 22 import Preferences | 22 import Preferences |
| 126 | 126 |
| 127 inputFormats = [] | 127 inputFormats = [] |
| 128 readFormats = QImageReader.supportedImageFormats() | 128 readFormats = QImageReader.supportedImageFormats() |
| 129 for readFormat in readFormats: | 129 for readFormat in readFormats: |
| 130 try: | 130 try: |
| 131 inputFormats.append(filters[unicode(readFormat)]) | 131 inputFormats.append(filters[str(readFormat)]) |
| 132 except KeyError: | 132 except KeyError: |
| 133 pass | 133 pass |
| 134 inputFormats.sort() | 134 inputFormats.sort() |
| 135 inputFormats.append(self.trUtf8("All Files (*)")) | 135 inputFormats.append(self.trUtf8("All Files (*)")) |
| 136 self.__inputFilter = ';;'.join(inputFormats) | 136 self.__inputFilter = ';;'.join(inputFormats) |
| 137 | 137 |
| 138 outputFormats = [] | 138 outputFormats = [] |
| 139 writeFormats = QImageWriter.supportedImageFormats() | 139 writeFormats = QImageWriter.supportedImageFormats() |
| 140 for writeFormat in writeFormats: | 140 for writeFormat in writeFormats: |
| 141 try: | 141 try: |
| 142 outputFormats.append(filters[unicode(writeFormat)]) | 142 outputFormats.append(filters[str(writeFormat)]) |
| 143 except KeyError: | 143 except KeyError: |
| 144 pass | 144 pass |
| 145 outputFormats.sort() | 145 outputFormats.sort() |
| 146 self.__outputFilter = ';;'.join(outputFormats) | 146 self.__outputFilter = ';;'.join(outputFormats) |
| 147 | 147 |
