Mercurial Repositories > eric / file comparison
comparison: eric7/Tools/TrayStarter.py
eric7/Tools/TrayStarter.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8314
- e3642a6a1e71
- child 8356
- 68ec9c3d4de5
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 9 | 9 |
| 10 import sys | 10 import sys |
| 11 import os | 11 import os |
| 12 import contextlib | 12 import contextlib |
| 13 | 13 |
| 14 from PyQt5.QtCore import QProcess, QSettings, QFileInfo | 14 from PyQt6.QtCore import QProcess, QSettings, QFileInfo |
| 15 from PyQt5.QtGui import QCursor | 15 from PyQt6.QtGui import QCursor |
| 16 from PyQt5.QtWidgets import QSystemTrayIcon, QMenu, QDialog, QApplication | 16 from PyQt6.QtWidgets import QSystemTrayIcon, QMenu, QDialog, QApplication |
| 17 | 17 |
| 18 from E5Gui import E5MessageBox | 18 from E5Gui import E5MessageBox |
| 19 from E5Gui.E5Application import e5App | 19 from E5Gui.E5Application import e5App |
| 20 | 20 |
| 21 import Globals | 21 import Globals |
| 520 | 520 |
| 521 def __showVersions(self): | 521 def __showVersions(self): |
| 522 """ | 522 """ |
| 523 Private slot to handle the Versions dialog. | 523 Private slot to handle the Versions dialog. |
| 524 """ | 524 """ |
| 525 from PyQt5.QtCore import qVersion, PYQT_VERSION_STR | 525 from PyQt6.QtCore import qVersion, PYQT_VERSION_STR |
| 526 from PyQt5.Qsci import QSCINTILLA_VERSION_STR | 526 from PyQt6.Qsci import QSCINTILLA_VERSION_STR |
| 527 | 527 |
| 528 try: | 528 try: |
| 529 try: | 529 try: |
| 530 from PyQt5 import sip | 530 from PyQt6 import sip |
| 531 except ImportError: | 531 except ImportError: |
| 532 import sip | 532 import sip |
| 533 sip_version_str = sip.SIP_VERSION_STR | 533 sip_version_str = sip.SIP_VERSION_STR |
| 534 except (ImportError, AttributeError): | 534 except (ImportError, AttributeError): |
| 535 sip_version_str = "sip version not available" | 535 sip_version_str = "sip version not available" |
