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

rebase

Browse source
This commit is contained in:
ingvar1995 2016-07-11 17:52:03 +03:00
parent 3ad7d20827
commit c8bdb32e86
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/images/group.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4 KiB

0
src/basecontact.py → toxygen/basecontact.py
View file

3
toxygen/contact.py
View file

@ -5,6 +5,9 @@ except ImportError:
import basecontact import basecontact
from messages import * from messages import *
from history import * from history import *
from settings import ProfileHelper
from toxcore_enums_and_consts import *
from util import curr_directory
class Contact(basecontact.BaseContact): class Contact(basecontact.BaseContact):

0
src/groupchat.py → toxygen/groupchat.py
View file

29
toxygen/profile.py
View file

@ -180,9 +180,6 @@ class Profile(basecontact.BaseContact, Singleton):
friend_or_gc.delete_old_messages() friend_or_gc.delete_old_messages()
self._screen.messageEdit.setPlainText(friend_or_gc.curr_text) self._screen.messageEdit.setPlainText(friend_or_gc.curr_text)
self._messages.clear() self._messages.clear()
friend.load_corr()
messages = friend.get_corr()[-PAGE_SIZE:]
self._load_history = False
friend_or_gc.load_corr() friend_or_gc.load_corr()
messages = friend_or_gc.get_corr()[-PAGE_SIZE:] messages = friend_or_gc.get_corr()[-PAGE_SIZE:]
self._load_history = False self._load_history = False
@ -424,8 +421,8 @@ class Profile(basecontact.BaseContact, Singleton):
friend.inc_receipts() friend.inc_receipts()
if friend.status is not None: if friend.status is not None:
self.split_and_send(friend.number, message_type, text.encode('utf-8')) self.split_and_send(friend.number, message_type, text.encode('utf-8'))
t = time.time()
if friend.number == self.get_active_number(): if friend.number == self.get_active_number():
t = time.time()
self.create_message_item(text, t, MESSAGE_OWNER['NOT_SENT'], message_type) self.create_message_item(text, t, MESSAGE_OWNER['NOT_SENT'], message_type)
self._screen.messageEdit.clear() self._screen.messageEdit.clear()
self._messages.scrollToBottom() self._messages.scrollToBottom()
@ -448,18 +445,18 @@ class Profile(basecontact.BaseContact, Singleton):
s = Settings.get_instance() s = Settings.get_instance()
if hasattr(self, '_history'): if hasattr(self, '_history'):
if s['save_history']: if s['save_history']:
for friend in self._friends_and_gc for friend_or_gc in self._friends_and_gc:
if not self._history.friend_exists_in_db(friend.tox_id): if not self._history.friend_exists_in_db(friend_or_gc.tox_id):
self._history.add_friend_to_db(friend.tox_id) self._history.add_friend_to_db(friend_or_gc.tox_id)
if not s['save_unsent_only']: if not s['save_unsent_only']:
messages = friend.get_corr_for_saving() messages = friend_or_gc.get_corr_for_saving()
else: else:
messages = friend.get_unsent_messages_for_saving() messages = friend_or_gc.get_unsent_messages_for_saving()
self._history.delete_messages(friend.tox_id) self._history.delete_messages(friend_or_gc.tox_id)
self._history.save_messages_to_db(friend.tox_id, messages) self._history.save_messages_to_db(friend_or_gc.tox_id, messages)
unsent_messages = friend.get_unsent_messages() unsent_messages = friend_or_gc.get_unsent_messages()
unsent_time = unsent_messages[0].get_data()[2] if len(unsent_messages) else time.time() + 1 unsent_time = unsent_messages[0].get_data()[2] if len(unsent_messages) else time.time() + 1
self._history.update_messages(friend.tox_id, unsent_time) self._history.update_messages(friend_or_gc.tox_id, unsent_time)
self._history.save() self._history.save()
del self._history del self._history
@ -474,7 +471,7 @@ class Profile(basecontact.BaseContact, Singleton):
self._history.delete_messages(friend.tox_id) self._history.delete_messages(friend.tox_id)
self._history.delete_friend_from_db(friend.tox_id) self._history.delete_friend_from_db(friend.tox_id)
else: # clear all history else: # clear all history
for number in range(len(self._friends_and_gc))): for number in range(len(self._friends_and_gc)):
self.clear_history(number, save_unsent) self.clear_history(number, save_unsent)
if num is None or num == self.get_active_number(): if num is None or num == self.get_active_number():
@ -808,8 +805,8 @@ class Profile(basecontact.BaseContact, Singleton):
if hasattr(self, '_call'): if hasattr(self, '_call'):
self._call.stop() self._call.stop()
del self._call del self._call
for i in range(len(self._friends)): for i in range(len(self._friends_and_gc)):
del self._friends[0] del self._friends_and_gc[0]
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
# File transfers support # File transfers support