file transfers and login screen fix
This commit is contained in:
parent
0cf459e3a9
commit
f5d129578e
2 changed files with 22 additions and 6 deletions
|
@ -194,11 +194,14 @@ def file_chunk_request(tox, friend_number, file_number, position, size, user_dat
|
||||||
"""
|
"""
|
||||||
Outgoing chunk
|
Outgoing chunk
|
||||||
"""
|
"""
|
||||||
invoke_in_main_thread(Profile.get_instance().outgoing_chunk,
|
if size:
|
||||||
friend_number,
|
Profile.get_instance().outgoing_chunk(friend_number, file_number, position, size)
|
||||||
file_number,
|
else:
|
||||||
position,
|
invoke_in_main_thread(Profile.get_instance().outgoing_chunk,
|
||||||
size)
|
friend_number,
|
||||||
|
file_number,
|
||||||
|
position,
|
||||||
|
size)
|
||||||
|
|
||||||
|
|
||||||
def file_recv_control(tox, friend_number, file_number, file_control, user_data):
|
def file_recv_control(tox, friend_number, file_number, file_control, user_data):
|
||||||
|
|
|
@ -4,6 +4,19 @@ from PySide import QtCore, QtGui
|
||||||
from widgets import *
|
from widgets import *
|
||||||
|
|
||||||
|
|
||||||
|
class NickEdit(QtGui.QPlainTextEdit):
|
||||||
|
|
||||||
|
def __init__(self, parent):
|
||||||
|
super(NickEdit, self).__init__(parent)
|
||||||
|
self.parent = parent
|
||||||
|
|
||||||
|
def keyPressEvent(self, event):
|
||||||
|
if event.key() == QtCore.Qt.Key_Return:
|
||||||
|
self.parent.create_profile()
|
||||||
|
else:
|
||||||
|
super(NickEdit, self).keyPressEvent(event)
|
||||||
|
|
||||||
|
|
||||||
class LoginScreen(CenteredWidget):
|
class LoginScreen(CenteredWidget):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -19,7 +32,7 @@ class LoginScreen(CenteredWidget):
|
||||||
self.new_profile.clicked.connect(self.create_profile)
|
self.new_profile.clicked.connect(self.create_profile)
|
||||||
self.label = QtGui.QLabel(self)
|
self.label = QtGui.QLabel(self)
|
||||||
self.label.setGeometry(QtCore.QRect(20, 70, 101, 17))
|
self.label.setGeometry(QtCore.QRect(20, 70, 101, 17))
|
||||||
self.new_name = QtGui.QPlainTextEdit(self)
|
self.new_name = NickEdit(self)
|
||||||
self.new_name.setGeometry(QtCore.QRect(20, 100, 171, 31))
|
self.new_name.setGeometry(QtCore.QRect(20, 100, 171, 31))
|
||||||
self.load_profile = QtGui.QPushButton(self)
|
self.load_profile = QtGui.QPushButton(self)
|
||||||
self.load_profile.setGeometry(QtCore.QRect(220, 150, 161, 27))
|
self.load_profile.setGeometry(QtCore.QRect(220, 150, 161, 27))
|
||||||
|
|
Loading…
Reference in a new issue