diff --git a/client/pmFile.py b/client/pmFile.py index 8aa7a58..0d038b0 100644 --- a/client/pmFile.py +++ b/client/pmFile.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'pmFile.ui' # -# Created: Fri Apr 10 16:31:47 2015 +# Created: Mon Apr 13 21:42:22 2015 # by: PyQt4 UI code generator 4.11.3 # # WARNING! All changes made in this file will be lost! @@ -71,8 +71,8 @@ class Ui_Dialog3(object): def retranslateUi(self, Dialog3): Dialog3.setWindowTitle(_translate("Dialog3", "Dialog", None)) - self.pushButton.setText(_translate("Dialog3", "Send message", None)) - self.pushButton_2.setText(_translate("Dialog3", "send file", None)) + self.pushButton.setText(_translate("Dialog3", "Send it", None)) + self.pushButton_2.setText(_translate("Dialog3", "import file ...", None)) self.label.setText(_translate("Dialog3", "Sending a file to : ", None)) self.label_2.setText(_translate("Dialog3", "BobZorro", None)) diff --git a/client/pmFile.ui b/client/pmFile.ui index 96b7163..50f7c1c 100644 --- a/client/pmFile.ui +++ b/client/pmFile.ui @@ -35,14 +35,14 @@ - Send message + Send it - send file + import file ... diff --git a/client/start.py b/client/start.py index bb97ced..823d006 100755 --- a/client/start.py +++ b/client/start.py @@ -179,7 +179,6 @@ class privateMessage () : self.ui.label_2.setText(pmPerson) def codeNb (self, txt): - #if re.compile(' ').search(str(txt)) : txt = txt.split(" ")[0] if txt == "300": info = "USERLIST" elif txt == "301": info = "USERAWAY" @@ -190,7 +189,7 @@ class privateMessage () : elif txt == "306": info = "NEW_PM" elif txt == "307": info = "ASKING_FOR_PM" - elif txt == "308": info = "PRIVATE_DISCU_ACCEPTED_FROM" #SUCC_PRIVATE_DISCUSSION_OK SUCC_PRIVATE_DISCUSSION_ACCEPTED + elif txt == "308": info = "PRIVATE_DISCU_ACCEPTED_FROM" elif txt == "309": info = "PRIVATE_DISCU_REFUSED_FROM" elif txt == "310": info = "IS_NOW_ENABLE" @@ -217,7 +216,7 @@ class privateMessage () : elif txt == "209": info = "SUCC_ENABLED" elif txt == "210": info = "SUCC_DISABLED" - elif txt == "211": info = "SUCC_PMFILE" #SUCC_ASKED_FILE + elif txt == "211": info = "SUCC_PMFILE" elif txt == "212": info = "SUCC_ACCEPTED_FILE" @@ -313,7 +312,7 @@ class privateMessage () : if self.codeNb(txt.split(" ")[0]) == "SUCC_PM_SENDED": - self.message_buffer2 += '
' + self.getTimeStamp() + ' < '+self.pmPerso +' > ' + self.htmlToText(self.cmdP) + '' + self.message_buffer2 += '
' + self.getTimeStamp() + ' < '+self.pmPerso +' > ' + self.htmlToText(self.cmdP) + '' if self.codeNb(txt.split(" ")[0]) == "SUCC_PRIVATE_DISCUSSION_ACCEPTED": @@ -476,7 +475,7 @@ class start(QtGui.QMainWindow): self.ShowMessageOK(txt.split(" ")[1]+" Rejected your Private discussion !!") - if self.codeNb(txt.split(" ")[0]) == "SUCCESSFUL_LOGOUT" : + if self.codeNb(txt.split(" ")[0]) == "SUCC_CHANNEL_QUIT" : self.ShowMessageOK("You have logged out of the DNC !") self.ui.listNames.clear() self.ui.listNames_2.clear()