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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sidya82 2015-04-15 08:46:50 +02:00
parent 049dc46f63 df6e05d566
commit eeb2a6372b
5 changed files with 397 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
client/img/Dalek.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

BIN
client/img/tardis.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

6
client/pmFile.py
View File

@ -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))

4
client/pmFile.ui
View File

@ -35,14 +35,14 @@
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Send message</string>
<string>Send it</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>send file</string>
<string>import file ...</string>
</property>
</widget>
</item>

675
client/start.py
View File

File diff suppressed because it is too large Load Diff