Mercurial Repositories > eric / file comparison
comparison: IconEditor/IconEditorGrid.py
IconEditor/IconEditorGrid.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3020
- 542e97d4ecb3
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 889 """ | 889 """ |
| 890 img, ok = self.__clipboardImage() | 890 img, ok = self.__clipboardImage() |
| 891 if ok: | 891 if ok: |
| 892 if img.width() > self.__image.width() or \ | 892 if img.width() > self.__image.width() or \ |
| 893 img.height() > self.__image.height(): | 893 img.height() > self.__image.height(): |
| 894 res = E5MessageBox.yesNo(self, | 894 res = E5MessageBox.yesNo( |
| 895 self, | |
| 895 self.trUtf8("Paste"), | 896 self.trUtf8("Paste"), |
| 896 self.trUtf8( | 897 self.trUtf8( |
| 897 """<p>The clipboard image is larger than the""" | 898 """<p>The clipboard image is larger than the""" |
| 898 """ current image.<br/>Paste as new image?</p>""")) | 899 """ current image.<br/>Paste as new image?</p>""")) |
| 899 if res: | 900 if res: |
| 919 | 920 |
| 920 self.__updateImageRect( | 921 self.__updateImageRect( |
| 921 self.__pasteRect.topLeft(), | 922 self.__pasteRect.topLeft(), |
| 922 self.__pasteRect.bottomRight() + QPoint(1, 1)) | 923 self.__pasteRect.bottomRight() + QPoint(1, 1)) |
| 923 else: | 924 else: |
| 924 E5MessageBox.warning(self, | 925 E5MessageBox.warning( |
| 926 self, | |
| 925 self.trUtf8("Pasting Image"), | 927 self.trUtf8("Pasting Image"), |
| 926 self.trUtf8("""Invalid image data in clipboard.""")) | 928 self.trUtf8("""Invalid image data in clipboard.""")) |
| 927 | 929 |
| 928 def editPasteAsNew(self): | 930 def editPasteAsNew(self): |
| 929 """ | 931 """ |
