Mercurial Repositories > eric / file comparison
comparison: IconEditor/IconEditorGrid.py
IconEditor/IconEditorGrid.py
- changeset 3020
- 542e97d4ecb3
- parent 2992
- dbdf27746da5
- child 3034
- 7ce719013078
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 887 """ | 887 """ |
| 888 img, ok = self.__clipboardImage() | 888 img, ok = self.__clipboardImage() |
| 889 if ok: | 889 if ok: |
| 890 if img.width() > self.__image.width() or \ | 890 if img.width() > self.__image.width() or \ |
| 891 img.height() > self.__image.height(): | 891 img.height() > self.__image.height(): |
| 892 res = E5MessageBox.yesNo(self, | 892 res = E5MessageBox.yesNo( |
| 893 self, | |
| 893 self.trUtf8("Paste"), | 894 self.trUtf8("Paste"), |
| 894 self.trUtf8( | 895 self.trUtf8( |
| 895 """<p>The clipboard image is larger than the""" | 896 """<p>The clipboard image is larger than the""" |
| 896 """ current image.<br/>Paste as new image?</p>""")) | 897 """ current image.<br/>Paste as new image?</p>""")) |
| 897 if res: | 898 if res: |
| 917 | 918 |
| 918 self.__updateImageRect( | 919 self.__updateImageRect( |
| 919 self.__pasteRect.topLeft(), | 920 self.__pasteRect.topLeft(), |
| 920 self.__pasteRect.bottomRight() + QPoint(1, 1)) | 921 self.__pasteRect.bottomRight() + QPoint(1, 1)) |
| 921 else: | 922 else: |
| 922 E5MessageBox.warning(self, | 923 E5MessageBox.warning( |
| 924 self, | |
| 923 self.trUtf8("Pasting Image"), | 925 self.trUtf8("Pasting Image"), |
| 924 self.trUtf8("""Invalid image data in clipboard.""")) | 926 self.trUtf8("""Invalid image data in clipboard.""")) |
| 925 | 927 |
| 926 def editPasteAsNew(self): | 928 def editPasteAsNew(self): |
| 927 """ | 929 """ |
