Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 5736
- 000ea446ff4b
- parent 5720
- fc72c0c81a0f
- child 5739
- a870f5f03baa
equal
deleted
inserted
replaced
| 5735:f606dbe20be6 | 5736:000ea446ff4b |
|---|---|
| 25 QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \ | 25 QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \ |
| 26 QAction, QLabel | 26 QAction, QLabel |
| 27 from PyQt5.Qsci import QSCINTILLA_VERSION_STR | 27 from PyQt5.Qsci import QSCINTILLA_VERSION_STR |
| 28 from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ | 28 from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ |
| 29 QNetworkRequest, QNetworkReply | 29 QNetworkRequest, QNetworkReply |
| 30 | |
| 31 from Globals import qVersionTuple | |
| 30 try: | 32 try: |
| 31 from PyQt5 import QtWebKit # __IGNORE_WARNING__ | 33 from PyQt5 import QtWebKit # __IGNORE_WARNING__ |
| 32 WEBKIT_AVAILABLE = True | 34 WEBKIT_AVAILABLE = True |
| 33 except ImportError: | 35 except ImportError: |
| 34 WEBKIT_AVAILABLE = False | 36 WEBKIT_AVAILABLE = False |
| 35 if qVersion() < "5.6.0": | 37 if qVersionTuple() < (5, 6, 0): |
| 36 WEBENGINE_AVAILABLE = False | 38 WEBENGINE_AVAILABLE = False |
| 37 else: | 39 else: |
| 38 try: | 40 try: |
| 39 from PyQt5 import QtWebEngineWidgets # __IGNORE_WARNING__ | 41 from PyQt5 import QtWebEngineWidgets # __IGNORE_WARNING__ |
| 40 WEBENGINE_AVAILABLE = True | 42 WEBENGINE_AVAILABLE = True |
| 3191 Utilities.generateVersionInfo("\r\n"), | 3193 Utilities.generateVersionInfo("\r\n"), |
| 3192 Utilities.generatePluginsVersionInfo("\r\n"), | 3194 Utilities.generatePluginsVersionInfo("\r\n"), |
| 3193 Utilities.generateDistroInfo("\r\n")) | 3195 Utilities.generateDistroInfo("\r\n")) |
| 3194 | 3196 |
| 3195 url = QUrl("mailto:{0}".format(address)) | 3197 url = QUrl("mailto:{0}".format(address)) |
| 3196 if qVersion() >= "5.0.0": | 3198 if qVersionTuple() >= (5, 0, 0): |
| 3197 from PyQt5.QtCore import QUrlQuery | 3199 from PyQt5.QtCore import QUrlQuery |
| 3198 urlQuery = QUrlQuery(url) | 3200 urlQuery = QUrlQuery(url) |
| 3199 urlQuery.addQueryItem("subject", subject) | 3201 urlQuery.addQueryItem("subject", subject) |
| 3200 urlQuery.addQueryItem("body", body) | 3202 urlQuery.addQueryItem("body", body) |
| 3201 url.setQuery(urlQuery) | 3203 url.setQuery(urlQuery) |
