Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserView.py	Tue Mar 29 16:34:32 2016 +0200
+++ b/WebBrowser/WebBrowserView.py	Tue Mar 29 16:49:54 2016 +0200
@@ -90,7 +90,6 @@
         self.setPage(self.__page)
         
         self.__mw = mainWindow
-        self.__ctrlPressed = False
         self.__isLoading = False
         self.__progress = 0
         self.__siteIconLoader = None
@@ -212,26 +211,19 @@
 ##            self.page().runJavaScript(
 ##                Scripts.sendPostData(req.url(), req.data()))
     
-    # TODO: eliminate requestData, add param to get rid of __ctrlPressed
-    def setSource(self, name, requestData=None):
+    def setSource(self, name, newTab=False):
         """
         Public method used to set the source to be displayed.
         
         @param name filename to be shown (QUrl)
-        @param requestData tuple containing the request data (QNetworkRequest,
-            QNetworkAccessManager.Operation, QByteArray)
+        @param newTab flag indicating to open the URL in a new tab (bool)
         """
-##        if (name is None or not name.isValid()) and requestData is None:
         if name is None or not name.isValid():
             return
         
-##        if name is None and requestData is not None:
-##            name = requestData[0].url()
-##        
-        if self.__ctrlPressed:
-            # open in a new window
+        if newTab:
+            # open in a new tab
             self.__mw.newTab(name)
-            self.__ctrlPressed = False
             return
         
         if not name.scheme():
@@ -295,10 +287,7 @@
                         .format(name.path()))
                 return
         
-        if requestData is not None:
-            self.load(*requestData)
-        else:
-            self.load(name)
+        self.load(name)
 
     def source(self):
         """
@@ -937,10 +926,7 @@
         if url.isEmpty():
             return
         
-        # TODO: check, if this can be done simpler
-        self.__ctrlPressed = True
-        self.setSource(url)
-        self.__ctrlPressed = False
+        self.setSource(url, newTab=True)
     
     def __openLinkInNewWindow(self):
         """
@@ -1279,7 +1265,6 @@
                 evt.accept()
                 return
         
-        self.__ctrlPressed = (evt.key() == Qt.Key_Control)
         super(WebBrowserView, self).keyPressEvent(evt)
     
     def _keyReleaseEvent(self, evt):
@@ -1288,7 +1273,6 @@
         
         @param evt reference to the key event (QKeyEvent)
         """
-        self.__ctrlPressed = False
         super(WebBrowserView, self).keyReleaseEvent(evt)
     
     def focusOutEvent(self, evt):