Mercurial Repositories > eric / changeset

--- a/WebBrowser/WebBrowserTabWidget.py	Tue Mar 29 16:34:32 2016 +0200
+++ b/WebBrowser/WebBrowserTabWidget.py	Tue Mar 29 16:49:54 2016 +0200
@@ -301,13 +301,11 @@
         """
         self.newBrowser()
     
-    # TODO: get rid of requestData
-    def newBrowser(self, link=None, requestData=None, position=-1):
+    def newBrowser(self, link=None, position=-1):
         """
         Public method to create a new web browser tab.
         
         @param link link to be shown (string or QUrl)
-        @param requestData page load request data (LoadRequest)
         @keyparam position position to create the new tab at or -1 to add it
             to the end (integer)
         """
@@ -366,7 +364,7 @@
         self.__closeButton.setEnabled(True)
         self.__navigationButton.setEnabled(True)
         
-        if not linkName and not requestData:
+        if not linkName:
             if Preferences.getWebBrowser("StartupBehavior") == 0:
                 linkName = Preferences.getWebBrowser("HomePage")
             elif Preferences.getWebBrowser("StartupBehavior") == 1:
@@ -382,22 +380,19 @@
                     index,
                     self.__elide(browser.documentTitle().replace("&", "&&")))
                 self.setTabToolTip(index, browser.documentTitle())
-##        elif requestData:
-##            browser.load(requestData)
     
-    def newBrowserAfter(self, browser, link=None, requestData=None):
+    def newBrowserAfter(self, browser, link=None):
         """
         Public method to create a new web browser tab after a given one.
         
         @param browser reference to the browser to add after (WebBrowserView)
         @param link link to be shown (string or QUrl)
-        @param requestData page load request data (LoadRequest)
         """
         if browser:
             position = self.indexOf(browser) + 1
         else:
             position = -1
-        self.newBrowser(link, requestData, position)
+        self.newBrowser(link, position)
     
     def __showNavigationMenu(self):
         """

--- 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):

--- a/WebBrowser/WebBrowserWindow.py	Tue Mar 29 16:34:32 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Tue Mar 29 16:49:54 2016 +0200
@@ -2053,19 +2053,18 @@
             browser.url().toString(), title)
     
     @pyqtSlot()
-    def newTab(self, link=None, requestData=None, addNextTo=None):
+    def newTab(self, link=None, addNextTo=None):
         """
         Public slot called to open a new web browser tab.
         
         @param link file to be displayed in the new window (string or QUrl)
-        @param requestData page load request data (LoadRequest)
         @param addNextTo reference to the browser to open the tab after
             (HelpBrowser)
         """
         if addNextTo:
-            self.__tabWidget.newBrowserAfter(addNextTo, link, requestData)
+            self.__tabWidget.newBrowserAfter(addNextTo, link)
         else:
-            self.__tabWidget.newBrowser(link, requestData)
+            self.__tabWidget.newBrowser(link)
     
     @pyqtSlot()
     def newWindow(self, link=None):