emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

message edit rewritten. history bug fixed. ui improvements

Browse source
This commit is contained in:
ingvar1995 2016-03-25 16:24:38 +03:00
parent 50825c238c
commit 1d5d9d6e47
5 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/profile.py
View file

@ -219,7 +219,6 @@ class Friend(Contact):
:param first_time: friend became active, load first part of messages
:return: list of loaded messages
"""
# TODO: fix bug with message order
if (first_time and self._history_loaded) or (not hasattr(self, '_message_getter')):
return
data = self._message_getter.get(42)
@ -510,7 +509,7 @@ class Profile(Contact, Singleton):
self._messages.scrollToBottom()
self._friends[self._active_friend].append_message((message.decode('utf-8'),
MESSAGE_OWNER['FRIEND'],
int(time.time()),
time.time(),
message_type))
else:
friend = filter(lambda x: x.number == friend_num, self._friends)[0]
@ -538,7 +537,7 @@ class Profile(Contact, Singleton):
self._messages.scrollToBottom()
friend.append_message((text,
MESSAGE_OWNER['ME'],
int(time.time()),
time.time(),
message_type))
# -----------------------------------------------------------------------------------------------------------------
@ -580,6 +579,7 @@ class Profile(Contact, Singleton):
data = friend.load_corr(False)
if not data:
return
data.reverse()
for message in data:
self.create_message_item(message[0],
convert_time(message[2]),
@ -609,7 +609,7 @@ class Profile(Contact, Singleton):
def create_message_item(self, text, time, name, message_type, append=True):
item = MessageItem(text, time, name, message_type, self._messages)
elem = QtGui.QListWidgetItem()
elem.setSizeHint(QtCore.QSize(600, item.getHeight()))
elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height()))
if append:
self._messages.addItem(elem)
else: