QRouland/L3DNC
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

B08Y

Browse Source
This commit is contained in:
DonRenando 2015-04-12 16:21:25 +02:00
parent a2804e8b3a
commit 399e748432
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/pmWindow.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'pmWindow.ui' # Form implementation generated from reading ui file 'pmWindow.ui'
# #
# Created: Mon Apr 6 17:05:26 2015 # Created: Sun Apr 12 16:19:04 2015
# by: PyQt4 UI code generator 4.11.3 # by: PyQt4 UI code generator 4.11.3
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -51,9 +51,6 @@ class Ui_Dialog2(object):
self.pushButton = QtGui.QPushButton(self.horizontalLayoutWidget) self.pushButton = QtGui.QPushButton(self.horizontalLayoutWidget)
self.pushButton.setObjectName(_fromUtf8("pushButton")) self.pushButton.setObjectName(_fromUtf8("pushButton"))
self.horizontalLayout.addWidget(self.pushButton) self.horizontalLayout.addWidget(self.pushButton)
self.pushButton_2 = QtGui.QPushButton(self.horizontalLayoutWidget)
self.pushButton_2.setObjectName(_fromUtf8("pushButton_2"))
self.horizontalLayout.addWidget(self.pushButton_2)
self.txtOutput = QtGui.QTextEdit(Dialog2) self.txtOutput = QtGui.QTextEdit(Dialog2)
self.txtOutput.setGeometry(QtCore.QRect(50, 80, 531, 231)) self.txtOutput.setGeometry(QtCore.QRect(50, 80, 531, 231))
self.txtOutput.setMinimumSize(QtCore.QSize(200, 0)) self.txtOutput.setMinimumSize(QtCore.QSize(200, 0))
@ -94,7 +91,6 @@ class Ui_Dialog2(object):
self.pushButton_3.setText(_translate("Dialog2", "Accept", None)) self.pushButton_3.setText(_translate("Dialog2", "Accept", None))
self.pushButton_4.setText(_translate("Dialog2", "Refuse", None)) self.pushButton_4.setText(_translate("Dialog2", "Refuse", None))
self.pushButton.setText(_translate("Dialog2", "Send message", None)) self.pushButton.setText(_translate("Dialog2", "Send message", None))
self.pushButton_2.setText(_translate("Dialog2", "send file", None))
self.txtOutput.setHtml(_translate("Dialog2", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" self.txtOutput.setHtml(_translate("Dialog2", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n" "p, li { white-space: pre-wrap; }\n"

7
client/pmWindow.ui
View File

@ -59,13 +59,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>send file</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QTextEdit" name="txtOutput"> <widget class="QTextEdit" name="txtOutput">

5
client/start.py
View File

@ -527,6 +527,10 @@ class start(QtGui.QMainWindow):
if reply == QtGui.QMessageBox.Yes: if reply == QtGui.QMessageBox.Yes:
text = ''.join(str(random.randint(1,9)) for _ in range(4)) text = ''.join(str(random.randint(1,9)) for _ in range(4))
while text == self.portCo :
text = ''.join(str(random.randint(1,9)) for _ in range(4))
cmdAccF = "/acceptfile "+name+" "+text+" "+fileN cmdAccF = "/acceptfile "+name+" "+text+" "+fileN
try: try:
self.s.send(cmdAccF.encode()) self.s.send(cmdAccF.encode())
@ -675,6 +679,7 @@ class start(QtGui.QMainWindow):
ip= self.ui.lineEdit_4.text() ip= self.ui.lineEdit_4.text()
port = int(self.ui.lineEdit_3.text()) port = int(self.ui.lineEdit_3.text())
self.portCo = port
Addr = (ip,port) Addr = (ip,port)