Change web browser code to show windows requested by JavaScript next to the requesting tab.

Mon, 11 Nov 2013 19:43:24 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 11 Nov 2013 19:43:24 +0100
changeset 3077
8d2e69e02e19
parent 3076
4002e6f10ec2
child 3078
b9422535d0fe

Change web browser code to show windows requested by JavaScript next to the requesting tab.

APIs/Python3/eric5.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Helpviewer.HelpTabWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Helpviewer.HelpWindow.html file | annotate | diff | comparison | revisions
Helpviewer/HelpBrowserWV.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTabWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWindow.py file | annotate | diff | comparison | revisions
eric5.e4p file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric5.api	Mon Nov 11 19:35:42 2013 +0100
+++ b/APIs/Python3/eric5.api	Mon Nov 11 19:43:24 2013 +0100
@@ -2574,6 +2574,7 @@
 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.currentUrlBar?4()
 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.getSourceFileList?4()
 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.newBrowser?4(link=None, requestData=None, position=-1)
+eric5.Helpviewer.HelpTabWidget.HelpTabWidget.newBrowserAfter?4(browser, link=None, requestData=None)
 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.preferencesChanged?4()
 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printBrowser?4(browser=None)
 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printBrowserPdf?4(browser=None)
@@ -2652,7 +2653,7 @@
 eric5.Helpviewer.HelpWindow.HelpWindow.maxMenuFilePathLen?7
 eric5.Helpviewer.HelpWindow.HelpWindow.mousePressEvent?4(evt)
 eric5.Helpviewer.HelpWindow.HelpWindow.networkAccessManager?4()
-eric5.Helpviewer.HelpWindow.HelpWindow.newTab?4(link=None, requestData=None)
+eric5.Helpviewer.HelpWindow.HelpWindow.newTab?4(link=None, requestData=None, addNextTo=None)
 eric5.Helpviewer.HelpWindow.HelpWindow.newWindow?4(link=None)
 eric5.Helpviewer.HelpWindow.HelpWindow.notificationsEnabled?4()
 eric5.Helpviewer.HelpWindow.HelpWindow.openSearchManager?4()
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Mon Nov 11 19:35:42 2013 +0100
+++ b/Documentation/Help/source.qhp	Mon Nov 11 19:43:24 2013 +0100
@@ -5429,6 +5429,7 @@
       <keyword name="HelpTabWidget.currentUrlBar" id="HelpTabWidget.currentUrlBar" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.currentUrlBar" />
       <keyword name="HelpTabWidget.getSourceFileList" id="HelpTabWidget.getSourceFileList" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.getSourceFileList" />
       <keyword name="HelpTabWidget.newBrowser" id="HelpTabWidget.newBrowser" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.newBrowser" />
+      <keyword name="HelpTabWidget.newBrowserAfter" id="HelpTabWidget.newBrowserAfter" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.newBrowserAfter" />
       <keyword name="HelpTabWidget.preferencesChanged" id="HelpTabWidget.preferencesChanged" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.preferencesChanged" />
       <keyword name="HelpTabWidget.printBrowser" id="HelpTabWidget.printBrowser" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.printBrowser" />
       <keyword name="HelpTabWidget.printBrowserPdf" id="HelpTabWidget.printBrowserPdf" ref="eric5.Helpviewer.HelpTabWidget.html#HelpTabWidget.printBrowserPdf" />
--- a/Documentation/Source/eric5.Helpviewer.HelpTabWidget.html	Mon Nov 11 19:35:42 2013 +0100
+++ b/Documentation/Source/eric5.Helpviewer.HelpTabWidget.html	Mon Nov 11 19:43:24 2013 +0100
@@ -202,6 +202,9 @@
 <td><a href="#HelpTabWidget.newBrowser">newBrowser</a></td>
 <td>Public method to create a new web browser tab.</td>
 </tr><tr>
+<td><a href="#HelpTabWidget.newBrowserAfter">newBrowserAfter</a></td>
+<td>Public method to create a new web browser tab after a given one.</td>
+</tr><tr>
 <td><a href="#HelpTabWidget.preferencesChanged">preferencesChanged</a></td>
 <td>Public slot to handle a change of preferences.</td>
 </tr><tr>
@@ -586,6 +589,23 @@
 position to create the new tab at or -1 to add it
             to the end (integer)
 </dd>
+</dl><a NAME="HelpTabWidget.newBrowserAfter" ID="HelpTabWidget.newBrowserAfter"></a>
+<h4>HelpTabWidget.newBrowserAfter</h4>
+<b>newBrowserAfter</b>(<i>browser, link=None, requestData=None</i>)
+<p>
+        Public method to create a new web browser tab after a given one.
+</p><dl>
+<dt><i>browser</i></dt>
+<dd>
+reference to the browser to add after (HelpBrowser)
+</dd><dt><i>link</i></dt>
+<dd>
+link to be shown (string or QUrl)
+</dd><dt><i>requestData</i></dt>
+<dd>
+tuple containing the request data (QNetworkRequest,
+            QNetworkAccessManager.Operation, QByteArray)
+</dd>
 </dl><a NAME="HelpTabWidget.preferencesChanged" ID="HelpTabWidget.preferencesChanged"></a>
 <h4>HelpTabWidget.preferencesChanged</h4>
 <b>preferencesChanged</b>(<i></i>)
--- a/Documentation/Source/eric5.Helpviewer.HelpWindow.html	Mon Nov 11 19:35:42 2013 +0100
+++ b/Documentation/Source/eric5.Helpviewer.HelpWindow.html	Mon Nov 11 19:43:24 2013 +0100
@@ -1520,7 +1520,7 @@
 </dd>
 </dl><a NAME="HelpWindow.newTab" ID="HelpWindow.newTab"></a>
 <h4>HelpWindow.newTab</h4>
-<b>newTab</b>(<i>link=None, requestData=None</i>)
+<b>newTab</b>(<i>link=None, requestData=None, addNextTo=None</i>)
 <p>
         Public slot called to open a new help window tab.
 </p><dl>
@@ -1531,6 +1531,10 @@
 <dd>
 tuple containing the request data (QNetworkRequest,
             QNetworkAccessManager.Operation, QByteArray)
+</dd><dt><i>addNextTo</i></dt>
+<dd>
+reference to the browser to open the tab after
+            (HelpBrowser)
 </dd>
 </dl><a NAME="HelpWindow.newWindow" ID="HelpWindow.newWindow"></a>
 <h4>HelpWindow.newWindow</h4>
--- a/Helpviewer/HelpBrowserWV.py	Mon Nov 11 19:35:42 2013 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Mon Nov 11 19:43:24 2013 +0100
@@ -2219,7 +2219,7 @@
         @param windowType type of the requested window (QWebPage.WebWindowType)
         @return reference to the created browser window (HelpBrowser)
         """
-        self.mw.newTab()
+        self.mw.newTab(addNextTo=self)
         return self.mw.currentBrowser()
     
     def preferencesChanged(self):
--- a/Helpviewer/HelpTabWidget.py	Mon Nov 11 19:35:42 2013 +0100
+++ b/Helpviewer/HelpTabWidget.py	Mon Nov 11 19:43:24 2013 +0100
@@ -370,6 +370,21 @@
         elif requestData:
             browser.load(*requestData)
     
+    def newBrowserAfter(self, browser, link=None, requestData=None):
+        """
+        Public method to create a new web browser tab after a given one.
+        
+        @param browser reference to the browser to add after (HelpBrowser)
+        @param link link to be shown (string or QUrl)
+        @param requestData tuple containing the request data (QNetworkRequest,
+            QNetworkAccessManager.Operation, QByteArray)
+        """
+        if browser:
+            position = self.indexOf(browser) + 1
+        else:
+            position = -1
+        self.newBrowser(link, requestData, position)
+    
     def __showNavigationMenu(self):
         """
         Private slot to show the navigation button menu.
--- a/Helpviewer/HelpWindow.py	Mon Nov 11 19:35:42 2013 +0100
+++ b/Helpviewer/HelpWindow.py	Mon Nov 11 19:43:24 2013 +0100
@@ -1924,15 +1924,20 @@
         self.historyManager().updateHistoryEntry(
             browser.url().toString(), title)
     
-    def newTab(self, link=None, requestData=None):
+    def newTab(self, link=None, requestData=None, addNextTo=None):
         """
         Public slot called to open a new help window tab.
         
         @param link file to be displayed in the new window (string or QUrl)
         @param requestData tuple containing the request data (QNetworkRequest,
             QNetworkAccessManager.Operation, QByteArray)
-        """
-        self.tabWidget.newBrowser(link, requestData)
+        @param addNextTo reference to the browser to open the tab after
+            (HelpBrowser)
+        """
+        if addNextTo:
+            self.tabWidget.newBrowserAfter(addNextTo, link, requestData)
+        else:
+            self.tabWidget.newBrowser(link, requestData)
     
     def newWindow(self, link=None):
         """
--- a/eric5.e4p	Mon Nov 11 19:35:42 2013 +0100
+++ b/eric5.e4p	Mon Nov 11 19:43:24 2013 +0100
@@ -1930,7 +1930,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>E24, D, W293, N802, N803, N807, N808, N821</string>
+              <string>E24, W293, N802, N803, N807, N808, N821</string>
             </value>
             <key>
               <string>FixCodes</string>

eric ide

mercurial