Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 3656
- 441956d8fce5
- parent 3649
- 2456f04f60a8
- child 3659
- 15efe6df020d
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 15 | 15 |
| 16 import os | 16 import os |
| 17 import sys | 17 import sys |
| 18 import logging | 18 import logging |
| 19 | 19 |
| 20 from PyQt4.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \ | 20 from PyQt5.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \ |
| 21 PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ | 21 PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ |
| 22 QObject, Qt | 22 QObject, Qt |
| 23 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ | 23 from PyQt5.QtGui import QKeySequence, QDesktopServices |
| 24 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, \ | 24 from PyQt5.QtWidgets import QSizePolicy, QWidget, QWhatsThis, QToolBar, \ |
| 25 QVBoxLayout, QDockWidget, QAction, QLabel | 25 QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \ |
| 26 from PyQt4.Qsci import QSCINTILLA_VERSION_STR | 26 QAction, QLabel |
| 27 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ | 27 from PyQt5.Qsci import QSCINTILLA_VERSION_STR |
| 28 from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ | |
| 28 QNetworkRequest, QNetworkReply | 29 QNetworkRequest, QNetworkReply |
| 29 | 30 |
| 30 from .Info import Version, BugAddress, Program, FeatureAddress | 31 from .Info import Version, BugAddress, Program, FeatureAddress |
| 31 from . import Config | 32 from . import Config |
| 32 | 33 |
| 2245 )) | 2246 )) |
| 2246 self.qt5DocAct.triggered.connect(self.__showQt5Doc) | 2247 self.qt5DocAct.triggered.connect(self.__showQt5Doc) |
| 2247 self.actions.append(self.qt5DocAct) | 2248 self.actions.append(self.qt5DocAct) |
| 2248 | 2249 |
| 2249 self.pyqt4DocAct = E5Action( | 2250 self.pyqt4DocAct = E5Action( |
| 2250 self.tr('PyQt4 Documentation'), | 2251 self.tr('PyQt5 Documentation'), |
| 2251 self.tr('PyQt&4 Documentation'), | 2252 self.tr('PyQt&4 Documentation'), |
| 2252 0, 0, self, 'pyqt4_documentation') | 2253 0, 0, self, 'pyqt4_documentation') |
| 2253 self.pyqt4DocAct.setStatusTip(self.tr('Open PyQt4 Documentation')) | 2254 self.pyqt4DocAct.setStatusTip(self.tr('Open PyQt5 Documentation')) |
| 2254 self.pyqt4DocAct.setWhatsThis(self.tr( | 2255 self.pyqt4DocAct.setWhatsThis(self.tr( |
| 2255 """<b>PyQt4 Documentation</b>""" | 2256 """<b>PyQt5 Documentation</b>""" |
| 2256 """<p>Display the PyQt4 Documentation. Dependent upon your""" | 2257 """<p>Display the PyQt5 Documentation. Dependent upon your""" |
| 2257 """ settings, this will either show the help in Eric's internal""" | 2258 """ settings, this will either show the help in Eric's internal""" |
| 2258 """ help viewer, or execute a web browser or Qt Assistant. </p>""" | 2259 """ help viewer, or execute a web browser or Qt Assistant. </p>""" |
| 2259 )) | 2260 )) |
| 2260 self.pyqt4DocAct.triggered.connect(self.__showPyQt4Doc) | 2261 self.pyqt4DocAct.triggered.connect(self.__showPyQt5Doc) |
| 2261 self.actions.append(self.pyqt4DocAct) | 2262 self.actions.append(self.pyqt4DocAct) |
| 2262 | 2263 |
| 2263 try: | 2264 try: |
| 2264 import PyQt5 # __IGNORE_WARNING__ | 2265 import PyQt5 # __IGNORE_WARNING__ |
| 2265 self.pyqt5DocAct = E5Action( | 2266 self.pyqt5DocAct = E5Action( |
| 2942 versionText += """<tr><td><b>sip</b></td><td>{0}</td></tr>"""\ | 2943 versionText += """<tr><td><b>sip</b></td><td>{0}</td></tr>"""\ |
| 2943 .format(sip_version_str) | 2944 .format(sip_version_str) |
| 2944 versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\ | 2945 versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\ |
| 2945 .format(QSCINTILLA_VERSION_STR) | 2946 .format(QSCINTILLA_VERSION_STR) |
| 2946 try: | 2947 try: |
| 2947 from PyQt4.QtWebKit import qWebKitVersion | 2948 from PyQt5.QtWebKit import qWebKitVersion |
| 2948 versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ | 2949 versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ |
| 2949 .format(qWebKitVersion()) | 2950 .format(qWebKitVersion()) |
| 2950 except ImportError: | 2951 except ImportError: |
| 2951 pass | 2952 pass |
| 2952 versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\ | 2953 versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\ |
