Mercurial Repositories > eric / file comparison
comparison: Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py
Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py
- changeset 3656
- 441956d8fce5
- parent 3484
- 645c12de6b0c
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import os | 12 import os |
| 13 | 13 |
| 14 from PyQt4.QtCore import pyqtSlot | 14 from PyQt5.QtCore import pyqtSlot |
| 15 from PyQt4.QtGui import QColor, QColorDialog, QDialog, QDialogButtonBox | 15 from PyQt5.QtGui import QColor |
| 16 from PyQt5.QtWidgets import QColorDialog, QDialog, QDialogButtonBox | |
| 16 | 17 |
| 17 from E5Gui import E5MessageBox | 18 from E5Gui import E5MessageBox |
| 18 | 19 |
| 19 from .Ui_ColorDialogWizardDialog import Ui_ColorDialogWizardDialog | 20 from .Ui_ColorDialogWizardDialog import Ui_ColorDialogWizardDialog |
| 20 | 21 |
| 63 if coStr.startswith('#'): | 64 if coStr.startswith('#'): |
| 64 coStr = "QColor('{0}')".format(coStr) | 65 coStr = "QColor('{0}')".format(coStr) |
| 65 else: | 66 else: |
| 66 coStr = "QColor({0})".format(coStr) | 67 coStr = "QColor({0})".format(coStr) |
| 67 try: | 68 try: |
| 68 exec('from PyQt4.QtCore import Qt;' | 69 exec('from PyQt5.QtCore import Qt;' |
| 69 ' QColorDialog.getColor({0}, None, "{1}")'.format( | 70 ' QColorDialog.getColor({0}, None, "{1}")'.format( |
| 70 coStr, self.eTitle.text())) | 71 coStr, self.eTitle.text())) |
| 71 except: | 72 except: |
| 72 E5MessageBox.critical( | 73 E5MessageBox.critical( |
| 73 self, | 74 self, |
