Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Mon Feb 20 08:36:08 2012 +0100
+++ b/Documentation/Help/source.qhp	Tue Feb 21 18:37:34 2012 +0100
@@ -4477,6 +4477,7 @@
       <keyword name="HelpWindow.__browserClosed" id="HelpWindow.__browserClosed" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__browserClosed" />
       <keyword name="HelpWindow.__clearIconsDatabase" id="HelpWindow.__clearIconsDatabase" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__clearIconsDatabase" />
       <keyword name="HelpWindow.__clearPrivateData" id="HelpWindow.__clearPrivateData" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__clearPrivateData" />
+      <keyword name="HelpWindow.__closeAllWindows" id="HelpWindow.__closeAllWindows" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__closeAllWindows" />
       <keyword name="HelpWindow.__closeNetworkMonitor" id="HelpWindow.__closeNetworkMonitor" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__closeNetworkMonitor" />
       <keyword name="HelpWindow.__copy" id="HelpWindow.__copy" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__copy" />
       <keyword name="HelpWindow.__currentChanged" id="HelpWindow.__currentChanged" ref="eric5.Helpviewer.HelpWindow.html#HelpWindow.__currentChanged" />

--- a/Documentation/Source/eric5.Helpviewer.HelpWindow.html	Mon Feb 20 08:36:08 2012 +0100
+++ b/Documentation/Source/eric5.Helpviewer.HelpWindow.html	Tue Feb 21 18:37:34 2012 +0100
@@ -137,6 +137,9 @@
 <td><a href="#HelpWindow.__clearPrivateData">__clearPrivateData</a></td>
 <td>Private slot to clear the private data.</td>
 </tr><tr>
+<td><a href="#HelpWindow.__closeAllWindows">__closeAllWindows</a></td>
+<td>Private slot to close all windows.</td>
+</tr><tr>
 <td><a href="#HelpWindow.__closeNetworkMonitor">__closeNetworkMonitor</a></td>
 <td>Private slot to close the network monitor dialog.</td>
 </tr><tr>
@@ -660,6 +663,11 @@
 <b>__clearPrivateData</b>(<i></i>)
 <p>
         Private slot to clear the private data.
+</p><a NAME="HelpWindow.__closeAllWindows" ID="HelpWindow.__closeAllWindows"></a>
+<h4>HelpWindow.__closeAllWindows</h4>
+<b>__closeAllWindows</b>(<i></i>)
+<p>
+        Private slot to close all windows.
 </p><a NAME="HelpWindow.__closeNetworkMonitor" ID="HelpWindow.__closeNetworkMonitor"></a>
 <h4>HelpWindow.__closeNetworkMonitor</h4>
 <b>__closeNetworkMonitor</b>(<i></i>)

--- a/Helpviewer/HelpTabWidget.py	Mon Feb 20 08:36:08 2012 +0100
+++ b/Helpviewer/HelpTabWidget.py	Tue Feb 21 18:37:34 2012 +0100
@@ -356,6 +356,7 @@
         del urlbar
         
         browser = self.widget(index)
+        browser.home()
         self.removeTab(index)
         self.browserClosed.emit(browser)
         del browser

--- a/Helpviewer/HelpWindow.py	Mon Feb 20 08:36:08 2012 +0100
+++ b/Helpviewer/HelpWindow.py	Tue Feb 21 18:37:34 2012 +0100
@@ -12,7 +12,7 @@
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, \
     QThread, QTextCodec
 from PyQt4.QtGui import QMainWindow, QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \
-    QDesktopServices, QKeySequence, qApp, QComboBox, QFont, QFontMetrics, QLabel, \
+    QDesktopServices, QKeySequence, QComboBox, QFont, QFontMetrics, QLabel, \
     QSplitter, QMenu, QToolButton, QLineEdit, QApplication, QWhatsThis, QDialog, \
     QHBoxLayout, QProgressBar, QAction, QIcon
 from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin, QWebPage
@@ -545,7 +545,7 @@
             if self.fromEric:
                 self.exitAct.triggered[()].connect(self.close)
             else:
-                self.exitAct.triggered[()].connect(qApp.closeAllWindows)
+                self.exitAct.triggered[()].connect(self.__closeAllWindows)
         self.__actions.append(self.exitAct)
         
         self.backAct = E5Action(self.trUtf8('Backward'),
@@ -1786,6 +1786,15 @@
         """
         self.findDlg.showFind()
         
+    def __closeAllWindows(self):
+        """
+        Private slot to close all windows.
+        """
+        for browser in HelpWindow.helpwindows:
+            if browser != self:
+                browser.close()
+        self.close()
+        
     def closeEvent(self, e):
         """
         Private event handler for the close event.