Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sat Jan 12 16:41:51 2013 +0100
+++ b/APIs/Python3/eric5.api	Sun Jan 13 12:56:00 2013 +0100
@@ -8606,6 +8606,7 @@
 eric5.install.createMacAppBundle?4(pydir)
 eric5.install.createPyWrapper?4(pydir, wfile, isGuiScript=True)
 eric5.install.currDir?7
+eric5.install.defaultMacAppBundleName?7
 eric5.install.distDir?7
 eric5.install.doCleanup?7
 eric5.install.doCompile?7
@@ -8613,6 +8614,8 @@
 eric5.install.exit?4(rcode=0)
 eric5.install.initGlobals?4()
 eric5.install.installEric?4()
+eric5.install.macAppBundleName?7
+eric5.install.macPythonExe?7
 eric5.install.main?4(argv)
 eric5.install.modDir?7
 eric5.install.platBinDir?7

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Jan 12 16:41:51 2013 +0100
+++ b/Documentation/Help/source.qhp	Sun Jan 13 12:56:00 2013 +0100
@@ -6703,6 +6703,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	Sat Jan 12 16:41:51 2013 +0100
+++ b/Documentation/Source/eric5.Network.IRC.IrcWidget.html	Sun Jan 13 12:56:00 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/Documentation/Source/eric5.install.html	Sat Jan 12 16:41:51 2013 +0100
+++ b/Documentation/Source/eric5.install.html	Sun Jan 13 12:56:00 2013 +0100
@@ -26,7 +26,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>BlackLists</td></tr><tr><td>PlatformsBlackLists</td></tr><tr><td>apisDir</td></tr><tr><td>cfg</td></tr><tr><td>configLength</td></tr><tr><td>configName</td></tr><tr><td>currDir</td></tr><tr><td>distDir</td></tr><tr><td>doCleanup</td></tr><tr><td>doCompile</td></tr><tr><td>modDir</td></tr><tr><td>platBinDir</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>sourceDir</td></tr>
+<tr><td>BlackLists</td></tr><tr><td>PlatformsBlackLists</td></tr><tr><td>apisDir</td></tr><tr><td>cfg</td></tr><tr><td>configLength</td></tr><tr><td>configName</td></tr><tr><td>currDir</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>distDir</td></tr><tr><td>doCleanup</td></tr><tr><td>doCompile</td></tr><tr><td>macAppBundleName</td></tr><tr><td>macPythonExe</td></tr><tr><td>modDir</td></tr><tr><td>platBinDir</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>sourceDir</td></tr>
 </table>
 <h3>Classes</h3>
 <table>

--- a/Network/IRC/IrcWidget.py	Sat Jan 12 16:41:51 2013 +0100
+++ b/Network/IRC/IrcWidget.py	Sun Jan 13 12:56:00 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)