more project structure updates
This commit is contained in:
ingvar1995
parent
2de4eea357
commit
593e25efe5
13 changed files with 125 additions and 251 deletions
|
|
@ -2,7 +2,7 @@ from db.history import *
|
|||
from contacts import basecontact
|
||||
import util
|
||||
from messenger.messages import *
|
||||
import file_transfers as ft
|
||||
from file_tansfers import file_transfers as ft
|
||||
import re
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from ctypes import *
|
|||
from util import log, Singleton, curr_directory
|
||||
from network.tox_dns import tox_dns
|
||||
from db.history import *
|
||||
from file_transfers import *
|
||||
from file_tansfers.file_transfers import *
|
||||
import time
|
||||
from av import calls
|
||||
import plugin_support
|
||||
|
|
@ -1299,154 +1299,3 @@ class Profile(basecontact.BaseContact, Singleton):
|
|||
if friend_number == self.get_active_number():
|
||||
self.create_message_item(text, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
|
||||
self._messages.scrollToBottom()
|
||||
|
||||
# -----------------------------------------------------------------------------------------------------------------
|
||||
# GC support
|
||||
# -----------------------------------------------------------------------------------------------------------------
|
||||
|
||||
def is_active_a_friend(self):
|
||||
return type(self.get_curr_friend()) is Friend
|
||||
|
||||
def get_group_by_number(self, number):
|
||||
groups = filter(lambda x: type(x) is GroupChat and x.number == number, self._contacts)
|
||||
return list(groups)[0]
|
||||
|
||||
def add_gc(self, number):
|
||||
widget = self.create_friend_item()
|
||||
gc = GroupChat('Group chat #' + str(number), '', widget, self._tox, number)
|
||||
self._contacts.append(gc)
|
||||
|
||||
def create_group_chat(self):
|
||||
number = self._tox.add_av_groupchat()
|
||||
self.add_gc(number)
|
||||
|
||||
def leave_gc(self, num):
|
||||
gc = self._contacts[num]
|
||||
self._tox.del_groupchat(gc.number)
|
||||
del self._contacts[num]
|
||||
self._screen.friends_list.takeItem(num)
|
||||
if num == self._active_friend: # active friend was deleted
|
||||
if not len(self._contacts): # last friend was deleted
|
||||
self.set_active(-1)
|
||||
else:
|
||||
self.set_active(0)
|
||||
|
||||
def group_invite(self, friend_number, gc_type, data):
|
||||
text = QtWidgets.QApplication.translate('MainWindow', 'User {} invites you to group chat. Accept?')
|
||||
title = QtWidgets.QApplication.translate('MainWindow', 'Group chat invite')
|
||||
friend = self.get_friend_by_number(friend_number)
|
||||
reply = QtWidgets.QMessageBox.question(None, title, text.format(friend.name), QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
|
||||
if reply == QtWidgets.QMessageBox.Yes: # accepted
|
||||
if gc_type == TOX_GROUPCHAT_TYPE['TEXT']:
|
||||
number = self._tox.join_groupchat(friend_number, data)
|
||||
else:
|
||||
number = self._tox.join_av_groupchat(friend_number, data)
|
||||
self.add_gc(number)
|
||||
|
||||
def new_gc_message(self, group_number, peer_number, message_type, message):
|
||||
name = self._tox.group_peername(group_number, peer_number)
|
||||
message_type += 5
|
||||
if group_number == self.get_active_number() and not self.is_active_a_friend(): # add message to list
|
||||
t = time.time()
|
||||
self.create_gc_message_item(message, t, MESSAGE_OWNER['FRIEND'], name, message_type)
|
||||
self._messages.scrollToBottom()
|
||||
self.get_curr_friend().append_message(
|
||||
GroupChatMessage(message, MESSAGE_OWNER['FRIEND'], t, message_type, name))
|
||||
else:
|
||||
gc = self.get_group_by_number(group_number)
|
||||
gc.inc_messages()
|
||||
gc.append_message(
|
||||
GroupChatMessage(message, MESSAGE_OWNER['FRIEND'], time.time(), message_type, name))
|
||||
if not gc.visibility:
|
||||
self.update_filtration()
|
||||
|
||||
def new_gc_title(self, group_number, title):
|
||||
gc = self.get_group_by_number(group_number)
|
||||
gc.new_title(title)
|
||||
if not self.is_active_a_friend() and self.get_active_number() == group_number:
|
||||
self.update()
|
||||
|
||||
def update_gc(self, group_number):
|
||||
count = self._tox.group_number_peers(group_number)
|
||||
gc = self.get_group_by_number(group_number)
|
||||
text = QtWidgets.QApplication.translate('MainWindow', '{} users in chat')
|
||||
gc.status_message = text.format(str(count)).encode('utf-8')
|
||||
if not self.is_active_a_friend() and self.get_active_number() == group_number:
|
||||
self.update()
|
||||
|
||||
def send_gc_message(self, text):
|
||||
group_number = self.get_active_number()
|
||||
if text.startswith('/me '):
|
||||
text = text[4:]
|
||||
self._tox.group_action_send(group_number, text.encode('utf-8'))
|
||||
else:
|
||||
self._tox.group_message_send(group_number, text.encode('utf-8'))
|
||||
self._screen.messageEdit.clear()
|
||||
|
||||
def set_title(self, num):
|
||||
"""
|
||||
Set new title for gc
|
||||
"""
|
||||
gc = self._contacts[num]
|
||||
name = gc.name
|
||||
dialog = QtWidgets.QApplication.translate('MainWindow',
|
||||
"Enter new title for group {}:")
|
||||
dialog = dialog.format(name)
|
||||
title = QtWidgets.QApplication.translate('MainWindow',
|
||||
'Set title')
|
||||
text, ok = QtWidgets.QInputDialog.getText(None,
|
||||
title,
|
||||
dialog,
|
||||
QtWidgets.QLineEdit.Normal,
|
||||
name)
|
||||
if ok:
|
||||
text = text.encode('utf-8')
|
||||
self._tox.group_set_title(gc.number, text)
|
||||
self.new_gc_title(gc.number, text)
|
||||
|
||||
def get_group_chats(self):
|
||||
chats = filter(lambda x: type(x) is GroupChat, self._contacts)
|
||||
chats = map(lambda c: (c.name, c.number), chats)
|
||||
return list(chats)
|
||||
|
||||
def invite_friend(self, friend_num, group_number):
|
||||
friend = self._contacts[friend_num]
|
||||
self._tox.invite_friend(friend.number, group_number)
|
||||
|
||||
def get_gc_peer_name(self, text):
|
||||
gc = self.get_curr_friend()
|
||||
if type(gc) is not GroupChat:
|
||||
return '\t'
|
||||
names = gc.get_names()
|
||||
name = re.split("\s+", text)[-1]
|
||||
suggested_names = list(filter(lambda x: x.startswith(name), names))
|
||||
if not len(suggested_names):
|
||||
return '\t'
|
||||
return suggested_names[0][len(name):] + ': '
|
||||
|
||||
|
||||
def tox_factory(data=None, settings=None):
|
||||
"""
|
||||
:param data: user data from .tox file. None = no saved data, create new profile
|
||||
:param settings: current profile settings. None = default settings will be used
|
||||
:return: new tox instance
|
||||
"""
|
||||
if settings is None:
|
||||
settings = Settings.get_default_settings()
|
||||
tox_options = Tox.options_new()
|
||||
tox_options.contents.udp_enabled = settings['udp_enabled']
|
||||
tox_options.contents.proxy_type = settings['proxy_type']
|
||||
tox_options.contents.proxy_host = bytes(settings['proxy_host'], 'UTF-8')
|
||||
tox_options.contents.proxy_port = settings['proxy_port']
|
||||
tox_options.contents.start_port = settings['start_port']
|
||||
tox_options.contents.end_port = settings['end_port']
|
||||
tox_options.contents.tcp_port = settings['tcp_port']
|
||||
if data: # load existing profile
|
||||
tox_options.contents.savedata_type = TOX_SAVEDATA_TYPE['TOX_SAVE']
|
||||
tox_options.contents.savedata_data = c_char_p(data)
|
||||
tox_options.contents.savedata_length = len(data)
|
||||
else: # create new profile
|
||||
tox_options.contents.savedata_type = TOX_SAVEDATA_TYPE['NONE']
|
||||
tox_options.contents.savedata_data = None
|
||||
tox_options.contents.savedata_length = 0
|
||||
return Tox(tox_options)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue