Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Jan 13 16:56:27 2013 +0100
+++ b/Documentation/Help/source.qhp	Sun Jan 13 16:57:02 2013 +0100
@@ -6728,6 +6728,7 @@
       <keyword name="IrcWidget.__autoJoinChannels" id="IrcWidget.__autoJoinChannels" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__autoJoinChannels" />
       <keyword name="IrcWidget.__away" id="IrcWidget.__away" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__away" />
       <keyword name="IrcWidget.__changeNick" id="IrcWidget.__changeNick" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__changeNick" />
+      <keyword name="IrcWidget.__closeAllChannels" id="IrcWidget.__closeAllChannels" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__closeAllChannels" />
       <keyword name="IrcWidget.__closeChannel" id="IrcWidget.__closeChannel" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__closeChannel" />
       <keyword name="IrcWidget.__connectNetwork" id="IrcWidget.__connectNetwork" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__connectNetwork" />
       <keyword name="IrcWidget.__editNetwork" id="IrcWidget.__editNetwork" ref="eric5.Network.IRC.IrcWidget.html#IrcWidget.__editNetwork" />

--- a/Documentation/Source/eric5.Network.IRC.IrcWidget.html	Sun Jan 13 16:56:27 2013 +0100
+++ b/Documentation/Source/eric5.Network.IRC.IrcWidget.html	Sun Jan 13 16:57:02 2013 +0100
@@ -76,6 +76,9 @@
 <td><a href="#IrcWidget.__changeNick">__changeNick</a></td>
 <td>Private slot to use a new nick name.</td>
 </tr><tr>
+<td><a href="#IrcWidget.__closeAllChannels">__closeAllChannels</a></td>
+<td>Private method to close all channels.</td>
+</tr><tr>
 <td><a href="#IrcWidget.__closeChannel">__closeChannel</a></td>
 <td>Private slot handling the closing of a channel.</td>
 </tr><tr>
@@ -212,7 +215,12 @@
 <dd>
 nick name to use (str)
 </dd>
-</dl><a NAME="IrcWidget.__closeChannel" ID="IrcWidget.__closeChannel"></a>
+</dl><a NAME="IrcWidget.__closeAllChannels" ID="IrcWidget.__closeAllChannels"></a>
+<h4>IrcWidget.__closeAllChannels</h4>
+<b>__closeAllChannels</b>(<i></i>)
+<p>
+        Private method to close all channels.
+</p><a NAME="IrcWidget.__closeChannel" ID="IrcWidget.__closeChannel"></a>
 <h4>IrcWidget.__closeChannel</h4>
 <b>__closeChannel</b>(<i>name</i>)
 <p>

--- a/Network/IRC/IrcWidget.py	Sun Jan 13 16:56:27 2013 +0100
+++ b/Network/IRC/IrcWidget.py	Sun Jan 13 16:57:02 2013 +0100
@@ -218,11 +218,7 @@
                 self.networkWidget.addServerMessage(self.trUtf8("Info"),
                     self.trUtf8("Disconnecting from server {0}...").format(
                         self.__server.getName()))
-                while self.__channelList:
-                    channel = self.__channelList.pop()
-                    self.channelsWidget.removeTab(self.channelsWidget.indexOf(channel))
-                    channel.deleteLater()
-                    channel = None
+                self.__closeAllChannels()
                 self.__send("QUIT :" + self.__quitMessage)
                 self.__socket and self.__socket.flush()
                 self.__socket and self.__socket.close()
@@ -344,6 +340,16 @@
         channel = self.channelsWidget.currentWidget()
         channel.requestLeave()
     
+    def __closeAllChannels(self):
+        """
+        Private method to close all channels.
+        """
+        while self.__channelList:
+            channel = self.__channelList.pop()
+            self.channelsWidget.removeTab(self.channelsWidget.indexOf(channel))
+            channel.deleteLater()
+            channel = None
+    
     def __closeChannel(self, name):
         """
         Private slot handling the closing of a channel.
@@ -432,6 +438,7 @@
         """
         Private slot to indicate the host was disconnected.
         """
+        self.__closeAllChannels()
         self.networkWidget.addServerMessage(self.trUtf8("Info"),
             self.trUtf8("Server disconnected."))
         self.networkWidget.setRegistered(False)