Mercurial Repositories > eric / file comparison
comparison: src/eric7/Tools/TrayStarter.py
src/eric7/Tools/TrayStarter.py
- branch
- eric7
- changeset 9482
- a2bc06a54d9d
- parent 9473
- 3f23dbf37dbe
- child 9573
- 9960d19d66b5
equal
deleted
inserted
replaced
| 9481:0b936ff1bbb9 | 9482:a2bc06a54d9d |
|---|---|
| 10 import contextlib | 10 import contextlib |
| 11 import os | 11 import os |
| 12 import pathlib | 12 import pathlib |
| 13 import sys | 13 import sys |
| 14 | 14 |
| 15 from PyQt6.QtCore import QProcess, QSettings | 15 from PyQt6 import sip |
| 16 from PyQt6.Qsci import QSCINTILLA_VERSION_STR | |
| 17 from PyQt6.QtCore import PYQT_VERSION_STR, QProcess, QSettings, qVersion | |
| 16 from PyQt6.QtGui import QCursor | 18 from PyQt6.QtGui import QCursor |
| 17 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon | 19 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon |
| 18 | 20 |
| 19 from eric7 import Globals, Preferences, Utilities | 21 from eric7 import Globals, Preferences, Utilities |
| 20 from eric7.EricGui import EricPixmapCache | 22 from eric7.EricGui import EricPixmapCache |
| 571 | 573 |
| 572 def __showVersions(self): | 574 def __showVersions(self): |
| 573 """ | 575 """ |
| 574 Private slot to handle the Versions dialog. | 576 Private slot to handle the Versions dialog. |
| 575 """ | 577 """ |
| 576 from PyQt6.Qsci import QSCINTILLA_VERSION_STR | |
| 577 from PyQt6.QtCore import PYQT_VERSION_STR, qVersion | |
| 578 | |
| 579 try: | 578 try: |
| 580 try: | |
| 581 from PyQt6 import sip | |
| 582 except ImportError: | |
| 583 import sip | |
| 584 sip_version_str = sip.SIP_VERSION_STR | 579 sip_version_str = sip.SIP_VERSION_STR |
| 585 except (ImportError, AttributeError): | 580 except AttributeError: |
| 586 sip_version_str = "sip version not available" | 581 sip_version_str = "sip version not available" |
| 587 | 582 |
| 588 versionText = self.tr("""<h3>Version Numbers</h3>""" """<table>""") | 583 versionText = self.tr("""<h3>Version Numbers</h3>""" """<table>""") |
| 589 | 584 |
| 590 # Python version | 585 # Python version |
| 606 QSCINTILLA_VERSION_STR | 601 QSCINTILLA_VERSION_STR |
| 607 ) | 602 ) |
| 608 | 603 |
| 609 # webengine (chromium) version | 604 # webengine (chromium) version |
| 610 with contextlib.suppress(ImportError): | 605 with contextlib.suppress(ImportError): |
| 611 from eric7.WebBrowser.Tools import WebBrowserTools | 606 from eric7.WebBrowser.Tools import ( # __IGNORE_WARNING_I101__ |
| 607 WebBrowserTools, | |
| 608 ) | |
| 612 | 609 |
| 613 ( | 610 ( |
| 614 chromiumVersion, | 611 chromiumVersion, |
| 615 chromiumSecurityVersion, | 612 chromiumSecurityVersion, |
| 616 ) = WebBrowserTools.getWebEngineVersions()[0:2] | 613 ) = WebBrowserTools.getWebEngineVersions()[0:2] |
