From 2ada98e9c2088a5cd380c62bbfb2754d9e417108 Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Tue, 29 Mar 2016 00:07:42 +0300 Subject: [PATCH] ft update --- src/list_items.py | 4 ++-- src/profile.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/list_items.py b/src/list_items.py index a67183d..cb9360b 100644 --- a/src/list_items.py +++ b/src/list_items.py @@ -132,10 +132,10 @@ class StatusCircle(QtGui.QWidget): paint.end() -class FileTransferItem(QtGui.QWidget): +class FileTransferItem(QtGui.QListWidget): def __init__(self, file_name, size, time, user, friend_number, file_number, show_accept, parent=None): - QtGui.QWidget.__init__(self, parent) + QtGui.QListWidget.__init__(self, parent) self.resize(QtCore.QSize(600, 50)) self.setStyleSheet('QWidget { background-color: green; }') diff --git a/src/profile.py b/src/profile.py index 10e5a49..19472ca 100644 --- a/src/profile.py +++ b/src/profile.py @@ -512,7 +512,7 @@ class Profile(Contact, Singleton): time.time(), message_type)) else: - friend = filter(lambda x: x.number == friend_num, self._friends)[0] + friend = self.get_friend_by_number(friend_num) friend.set_messages(True) friend.append_message((message.decode('utf-8'), MESSAGE_OWNER['FRIEND'], @@ -761,6 +761,7 @@ class Profile(Contact, Singleton): :param size: file size in bytes :param file_name: file name without path """ + # TODO: save transfer data in message list settings = Settings.get_instance() friend = self.get_friend_by_number(friend_number) file_name = file_name.decode('utf-8') @@ -777,6 +778,9 @@ class Profile(Contact, Singleton): item = self.create_file_transfer_item(new_file_name, size, friend_number, file_number, False) self.accept_transfer(item, path + '/' + new_file_name, friend_number, file_number) else: + if self.get_active_number() != friend_number: + friend = self.get_friend_by_number(friend_number) + friend.set_messages(True) self.create_file_transfer_item(file_name, size, friend_number, file_number, True) def cancel_transfer(self, friend_number, file_number, already_cancelled=False):