Mercurial Repositories > eric / file comparison
comparison: eric7/WebBrowser/WebBrowserView.py
eric7/WebBrowser/WebBrowserView.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8312
- 800c432b34c8
- child 8324
- 83084f088655
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 10 | 10 |
| 11 import os | 11 import os |
| 12 import functools | 12 import functools |
| 13 import contextlib | 13 import contextlib |
| 14 | 14 |
| 15 from PyQt5.QtCore import ( | 15 from PyQt6.QtCore import ( |
| 16 pyqtSignal, pyqtSlot, Qt, QUrl, QFileInfo, QTimer, QEvent, QPoint, | 16 pyqtSignal, pyqtSlot, Qt, QUrl, QFileInfo, QTimer, QEvent, QPoint, |
| 17 QPointF, QDateTime, QStandardPaths, QByteArray, QIODevice, QDataStream | 17 QPointF, QDateTime, QStandardPaths, QByteArray, QIODevice, QDataStream |
| 18 ) | 18 ) |
| 19 from PyQt5.QtGui import ( | 19 from PyQt6.QtGui import ( |
| 20 QDesktopServices, QClipboard, QIcon, QContextMenuEvent, QPixmap, QCursor | 20 QDesktopServices, QClipboard, QIcon, QContextMenuEvent, QPixmap, QCursor |
| 21 ) | 21 ) |
| 22 from PyQt5.QtWidgets import QStyle, QMenu, QApplication, QDialog | 22 from PyQt6.QtWidgets import QStyle, QMenu, QApplication, QDialog |
| 23 from PyQt5.QtWebEngineWidgets import ( | 23 from PyQt6.QtWebEngineWidgets import ( |
| 24 QWebEngineView, QWebEnginePage, QWebEngineDownloadItem | 24 QWebEngineView, QWebEnginePage, QWebEngineDownloadItem |
| 25 ) | 25 ) |
| 26 | 26 |
| 27 from E5Gui import E5MessageBox, E5FileDialog | 27 from E5Gui import E5MessageBox, E5FileDialog |
| 28 from E5Gui.E5Application import e5App | 28 from E5Gui.E5Application import e5App |
| 155 # WebBrowserPage. | 155 # WebBrowserPage. |
| 156 self.__page.selectClientCertificate.connect( | 156 self.__page.selectClientCertificate.connect( |
| 157 self.__selectClientCertificate) | 157 self.__selectClientCertificate) |
| 158 with contextlib.suppress(AttributeError, ImportError): | 158 with contextlib.suppress(AttributeError, ImportError): |
| 159 #- Qt >= 5.14 | 159 #- Qt >= 5.14 |
| 160 from PyQt5.QtWebEngineCore import QWebEngineFindTextResult | 160 from PyQt6.QtWebEngineCore import QWebEngineFindTextResult |
| 161 # __IGNORE_WARNING__ | 161 # __IGNORE_WARNING__ |
| 162 | 162 |
| 163 self.__page.findTextFinished.connect( | 163 self.__page.findTextFinished.connect( |
| 164 self.__findTextFinished) | 164 self.__findTextFinished) |
| 165 | 165 |
| 563 | 563 |
| 564 self.__createContextMenu(self.__menu, hitTest) | 564 self.__createContextMenu(self.__menu, hitTest) |
| 565 | 565 |
| 566 if not hitTest.isContentEditable() and not hitTest.isContentSelected(): | 566 if not hitTest.isContentEditable() and not hitTest.isContentSelected(): |
| 567 self.__menu.addSeparator() | 567 self.__menu.addSeparator() |
| 568 # TODO: change this code to add a QMenu | |
| 568 self.__menu.addAction(self.__mw.adBlockIcon().menuAction()) | 569 self.__menu.addAction(self.__mw.adBlockIcon().menuAction()) |
| 569 | 570 |
| 570 self.__menu.addSeparator() | 571 self.__menu.addSeparator() |
| 571 self.__menu.addAction( | 572 self.__menu.addAction( |
| 572 UI.PixmapCache.getIcon("webInspector"), | 573 UI.PixmapCache.getIcon("webInspector"), |
| 1409 | 1410 |
| 1410 accepted = evt.isAccepted() | 1411 accepted = evt.isAccepted() |
| 1411 self.__page.event(evt) | 1412 self.__page.event(evt) |
| 1412 if ( | 1413 if ( |
| 1413 not evt.isAccepted() and | 1414 not evt.isAccepted() and |
| 1414 self.__mw.eventMouseButtons() & Qt.MouseButton.MidButton | 1415 self.__mw.eventMouseButtons() & Qt.MouseButton.MiddleButton |
| 1415 ): | 1416 ): |
| 1416 url = QUrl(QApplication.clipboard().text( | 1417 url = QUrl(QApplication.clipboard().text( |
| 1417 QClipboard.Mode.Selection)) | 1418 QClipboard.Mode.Selection)) |
| 1418 if ( | 1419 if ( |
| 1419 not url.isEmpty() and | 1420 not url.isEmpty() and |
