diff -r 10516539f238 -r 0a02c433f52d Cooperation/ChatWidget.py --- a/Cooperation/ChatWidget.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Cooperation/ChatWidget.py Fri Nov 01 15:48:48 2013 +0100 @@ -188,6 +188,7 @@ UI.PixmapCache.getPixmap("cooperation48.png"), self.trUtf8("New User"), self.trUtf8("{0} has joined.") .format(nick)) + def __participantLeft(self, nick): """ Private slot handling a participant leaving the session. @@ -230,7 +231,7 @@ return self.chatEdit.append( - QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) + \ + QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) + " <" + from_ + ">:") self.chatEdit.append(message + "\n") bar = self.chatEdit.verticalScrollBar() @@ -304,7 +305,7 @@ self.__client.close() self.serverButton.setText(self.trUtf8("Start Server")) self.serverPortSpin.setEnabled(True) - if (self.serverPortSpin.value() != + if (self.serverPortSpin.value() != Preferences.getCooperation("ServerPort")): self.serverPortSpin.setValue( Preferences.getCooperation("ServerPort")) @@ -320,7 +321,7 @@ else: self.__showErrorMessage( self.trUtf8("! Server Error: {0}\n").format( - self.__client.errorString()) + self.__client.errorString()) ) def __setConnected(self, connected): @@ -567,7 +568,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Chat"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -581,12 +583,13 @@ f.write(txt) f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving Chat"), self.trUtf8("""<p>The chat contents could not be""" """ written to <b>{0}</b></p>""" """<p>Reason: {1}</p>""") .format( - fname, str(err))) + fname, str(err))) def __copyChat(self): """ @@ -690,7 +693,7 @@ ":") self.chatEdit.append( self.trUtf8("* {0} has been banned and kicked.\n") - .format( itm.text().split("@")[0])) + .format(itm.text().split("@")[0])) self.chatEdit.setTextColor(color) def shutdown(self):