Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserPage.py	Sat Apr 02 19:44:09 2016 +0200
+++ b/WebBrowser/WebBrowserPage.py	Sun Apr 03 16:22:18 2016 +0200
@@ -14,46 +14,24 @@
 except NameError:
     pass
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, \
-    QUrl, QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, \
-    QRect, QFile, QPoint, QByteArray, QEventLoop, qVersion
-from PyQt5.QtGui import QDesktopServices, QClipboard, QMouseEvent, QColor, \
-    QPalette
-from PyQt5.QtWidgets import qApp, QStyle, QMenu, QApplication, QInputDialog, \
-    QLineEdit, QLabel, QToolTip, QFrame, QDialog
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt5.QtCore import QUrl, QTimer, QEventLoop
+from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWebEngineWidgets import QWebEnginePage
 from PyQt5.QtWebChannel import QWebChannel
-from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
-import sip
 
-from E5Gui import E5MessageBox, E5FileDialog
-
-import WebBrowser
 from WebBrowser.WebBrowserWindow import WebBrowserWindow
 
 from .JavaScript.ExternalJsObject import ExternalJsObject
 
 from .Tools.WebHitTestResult import WebHitTestResult
-from .Tools import Scripts
 
 import Preferences
-import UI.PixmapCache
-import Globals
-##
-##try:
-##    from PyQt5.QtNetwork import QSslCertificate
-##    SSL_AVAILABLE = True
-##except ImportError:
-##    SSL_AVAILABLE = False
 
 
 class WebBrowserPage(QWebEnginePage):
     """
     Class implementing an enhanced web page.
     """
-##    _webPluginFactory = None
-##    
     def __init__(self, parent=None):
         """
         Constructor
@@ -65,24 +43,6 @@
         
         self.__setupWebChannel()
         
-##        self.setPluginFactory(self.webPluginFactory())
-##        
-##        self.__lastRequest = None
-##        self.__lastRequestType = QWebPage.NavigationTypeOther
-##        
-##        from .Network.NetworkAccessManagerProxy import \
-##            NetworkAccessManagerProxy
-##        self.__proxy = NetworkAccessManagerProxy(self)
-##        self.__proxy.setWebPage(self)
-##        self.__proxy.setPrimaryNetworkAccessManager(
-##            WebBrowserWindow.networkManager())
-##        self.setNetworkAccessManager(self.__proxy)
-##        
-##        self.__sslConfiguration = None
-##        self.__proxy.finished.connect(self.__managerFinished)
-##        
-##        self.__adBlockedEntries = []
-##        self.loadStarted.connect(self.__loadStarted)
         self.featurePermissionRequested.connect(
             self.__featurePermissionRequested)
         
@@ -161,37 +121,6 @@
                 agent = WebBrowserWindow.webProfile().httpUserAgent()
         return agent
     
-##    @classmethod
-##    def webPluginFactory(cls):
-##        """
-##        Class method to get a reference to the web plug-in factory
-##        instance.
-##        
-##        @return reference to the web plug-in factory instance (WebPluginFactory
-##        """
-##        if cls._webPluginFactory is None:
-##            from .WebPlugins.WebPluginFactory import WebPluginFactory
-##            cls._webPluginFactory = WebPluginFactory()
-##        
-##        return cls._webPluginFactory
-##    
-##    def event(self, evt):
-##        """
-##        Public method implementing the event handler.
-##        
-##        @param evt reference to the event (QEvent)
-##        @return flag indicating that the event was handled (boolean)
-##        """
-##        if evt.type() == QEvent.Leave:
-##            # Fake a mouse move event just outside of the widget to trigger
-##            # the WebKit event handler's mouseMoved function. This implements
-##            # the interesting mouse-out behavior like invalidating scrollbars.
-##            fakeEvent = QMouseEvent(QEvent.MouseMove, QPoint(0, -1),
-##                                    Qt.NoButton, Qt.NoButton, Qt.NoModifier)
-##            return super(HelpWebPage, self).event(fakeEvent)
-##        
-##        return super(HelpWebPage, self).event(evt)
-    
     def __featurePermissionRequested(self, url, feature):
         """
         Private slot handling a feature permission request.