Merge branch 'python3' into develop
This commit is contained in:
ingvar1995
commit
fc2b53d4a5
|
|
@ -3,13 +3,7 @@
|
|||
You can compile Toxygen using [PyInstaller](http://www.pyinstaller.org/)
|
||||
|
||||
Install PyInstaller:
|
||||
``pip install pyinstaller``
|
||||
|
||||
On Linux:
|
||||
|
||||
``pyinstaller --windowed main.py``
|
||||
|
||||
On Windows:
|
||||
``pip3 install pyinstaller``
|
||||
|
||||
``pyinstaller --windowed --icon images/icon.ico main.py``
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
|
||||
### Windows
|
||||
|
||||
1. [Download and install latest Python 2.7](https://www.python.org/downloads/windows/)
|
||||
1. [Download and install latest Python 3.4](https://www.python.org/downloads/windows/)
|
||||
2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
|
||||
3. Install PyAudio: ``python -m pip install pyaudio``
|
||||
3. Install PyAudio: ``pip3 install pyaudio``
|
||||
4. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
|
||||
5. Unpack archive
|
||||
6. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\
|
||||
|
|
@ -28,21 +28,21 @@
|
|||
|
||||
Dependencies:
|
||||
|
||||
1. Install Python2.7:
|
||||
``sudo apt-get install python2.7``
|
||||
2. [Install PySide](https://wiki.qt.io/PySide_Binaries_Linux) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
|
||||
1. Install Python3.4:
|
||||
``sudo apt-get install python3``
|
||||
2. [Install PySide](https://wiki.qt.io/PySide_Binaries_Linux) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
|
||||
3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
|
||||
4. Install PyAudio:
|
||||
```bash
|
||||
sudo apt-get install portaudio19-dev
|
||||
sudo pip install pyaudio
|
||||
sudo apt-get install python3-pyaudio
|
||||
```
|
||||
Toxygen:
|
||||
|
||||
1. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
|
||||
2. Unpack archive
|
||||
3. Run app:
|
||||
``python main.py``
|
||||
``python3 main.py``
|
||||
|
||||
## Compile Toxygen
|
||||
Check [compile.md](/docs/compile.md) for more info
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#Plugins
|
||||
|
||||
Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python module (.py file) and directory with plugin's data which provide some additional functionality.
|
||||
Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python 3.4 module (.py file) and directory with plugin's data which provide some additional functionality.
|
||||
|
||||
#How to write plugin
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class IncomingCallWidget(widgets.CenteredWidget):
|
|||
QtCore.QThread.__init__(self)
|
||||
|
||||
def run(self):
|
||||
class AudioFile(object):
|
||||
class AudioFile:
|
||||
chunk = 1024
|
||||
|
||||
def __init__(self, fl):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import random
|
||||
|
||||
|
||||
class Node(object):
|
||||
class Node:
|
||||
def __init__(self, ip, port, tox_key, rand):
|
||||
self._ip, self._port, self._tox_key, self.rand = ip, port, tox_key, rand
|
||||
|
||||
|
|
@ -75,13 +75,9 @@ def node_generator():
|
|||
"5625A62618CB4FCA70E147A71B29695F38CC65FF0CBD68AD46254585BE564802",
|
||||
"31910C0497D347FF160D6F3A6C0E317BAFA71E8E03BC4CBB2A185C9D4FB8B31E"
|
||||
]
|
||||
for i in xrange(len(ips)):
|
||||
for i in range(len(ips)):
|
||||
nodes.append(Node(ips[i], ports[i], ids[i], random.randint(0, 1000000)))
|
||||
arr = sorted(nodes, key=lambda x: x.rand)[:4]
|
||||
for elem in arr:
|
||||
yield elem.get_data()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
for elem in node_generator():
|
||||
print str(elem)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ def self_connection_status(tox_link):
|
|||
Current user changed connection status (offline, UDP, TCP)
|
||||
"""
|
||||
def wrapped(tox, connection, user_data):
|
||||
print 'Connection status: ', str(connection)
|
||||
print('Connection status: ', str(connection))
|
||||
profile = Profile.get_instance()
|
||||
if profile.status is None:
|
||||
status = tox_link.self_get_status()
|
||||
|
|
@ -62,7 +62,7 @@ def friend_status(tox, friend_num, new_status, user_data):
|
|||
"""
|
||||
Check friend's status (none, busy, away)
|
||||
"""
|
||||
print "Friend's #{} status changed! New status: {}".format(friend_num, new_status)
|
||||
print("Friend's #{} status changed! New status: {}".format(friend_num, new_status))
|
||||
profile = Profile.get_instance()
|
||||
friend = profile.get_friend_by_number(friend_num)
|
||||
if friend.status is None and Settings.get_instance()['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
|
||||
|
|
@ -76,7 +76,7 @@ def friend_connection_status(tox, friend_num, new_status, user_data):
|
|||
"""
|
||||
Check friend's connection status (offline, udp, tcp)
|
||||
"""
|
||||
print "Friend #{} connection status: {}".format(friend_num, new_status)
|
||||
print("Friend #{} connection status: {}".format(friend_num, new_status))
|
||||
profile = Profile.get_instance()
|
||||
friend = profile.get_friend_by_number(friend_num)
|
||||
if new_status == TOX_CONNECTION['NONE']:
|
||||
|
|
@ -94,7 +94,7 @@ def friend_name(tox, friend_num, name, size, user_data):
|
|||
Friend changed his name
|
||||
"""
|
||||
profile = Profile.get_instance()
|
||||
print 'New name: ', friend_num, name
|
||||
print('New name: ', friend_num, name)
|
||||
invoke_in_main_thread(profile.new_name, friend_num, name)
|
||||
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ def friend_status_message(tox, friend_num, status_message, size, user_data):
|
|||
profile = Profile.get_instance()
|
||||
friend = profile.get_friend_by_number(friend_num)
|
||||
invoke_in_main_thread(friend.set_status_message, status_message)
|
||||
print 'User #{} has new status: {}'.format(friend_num, status_message)
|
||||
print('User #{} has new status: {}'.format(friend_num, status_message))
|
||||
invoke_in_main_thread(profile.send_messages, friend_num)
|
||||
if profile.get_active_number() == friend_num:
|
||||
invoke_in_main_thread(profile.set_active)
|
||||
|
|
@ -119,11 +119,12 @@ def friend_message(window, tray):
|
|||
def wrapped(tox, friend_number, message_type, message, size, user_data):
|
||||
profile = Profile.get_instance()
|
||||
settings = Settings.get_instance()
|
||||
message = str(message, 'utf-8')
|
||||
invoke_in_main_thread(profile.new_message, friend_number, message_type, message)
|
||||
if not window.isActiveWindow():
|
||||
friend = profile.get_friend_by_number(friend_number)
|
||||
if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
|
||||
invoke_in_main_thread(tray_notification, friend.name, message.decode('utf8'), tray, window)
|
||||
invoke_in_main_thread(tray_notification, friend.name, message, tray, window)
|
||||
if settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
|
||||
sound_notification(SOUND_NOTIFICATION['MESSAGE'])
|
||||
invoke_in_main_thread(tray.setIcon, QtGui.QIcon(curr_directory() + '/images/icon_new_messages.png'))
|
||||
|
|
@ -134,12 +135,12 @@ def friend_request(tox, public_key, message, message_size, user_data):
|
|||
"""
|
||||
Called when user get new friend request
|
||||
"""
|
||||
print 'Friend request'
|
||||
print('Friend request')
|
||||
profile = Profile.get_instance()
|
||||
key = ''.join(chr(x) for x in public_key[:TOX_PUBLIC_KEY_SIZE])
|
||||
tox_id = bin_to_string(key, TOX_PUBLIC_KEY_SIZE)
|
||||
if tox_id not in Settings.get_instance()['blocked']:
|
||||
invoke_in_main_thread(profile.process_friend_request, tox_id, message.decode('utf-8'))
|
||||
invoke_in_main_thread(profile.process_friend_request, tox_id, str(message, 'utf-8'))
|
||||
|
||||
|
||||
def friend_typing(tox, friend_number, typing, user_data):
|
||||
|
|
@ -165,11 +166,11 @@ def tox_file_recv(window, tray):
|
|||
profile = Profile.get_instance()
|
||||
settings = Settings.get_instance()
|
||||
if file_type == TOX_FILE_KIND['DATA']:
|
||||
print 'file'
|
||||
print('File')
|
||||
try:
|
||||
file_name = unicode(file_name[:file_name_size].decode('utf-8'))
|
||||
file_name = str(file_name[:file_name_size], 'utf-8')
|
||||
except:
|
||||
file_name = u'toxygen_file'
|
||||
file_name = 'toxygen_file'
|
||||
invoke_in_main_thread(profile.incoming_file_transfer,
|
||||
friend_number,
|
||||
file_number,
|
||||
|
|
@ -184,7 +185,7 @@ def tox_file_recv(window, tray):
|
|||
sound_notification(SOUND_NOTIFICATION['FILE_TRANSFER'])
|
||||
invoke_in_main_thread(tray.setIcon, QtGui.QIcon(curr_directory() + '/images/icon_new_messages.png'))
|
||||
else: # AVATAR
|
||||
print 'Avatar'
|
||||
print ('Avatar')
|
||||
invoke_in_main_thread(profile.incoming_avatar,
|
||||
friend_number,
|
||||
file_number,
|
||||
|
|
@ -260,7 +261,7 @@ def call_state(toxav, friend_number, mask, user_data):
|
|||
"""
|
||||
New call state
|
||||
"""
|
||||
print friend_number, mask
|
||||
print(friend_number, mask)
|
||||
if mask == TOXAV_FRIEND_CALL_STATE['FINISHED'] or mask == TOXAV_FRIEND_CALL_STATE['ERROR']:
|
||||
invoke_in_main_thread(Profile.get_instance().stop_call, friend_number, True)
|
||||
else:
|
||||
|
|
@ -271,7 +272,7 @@ def call(toxav, friend_number, audio, video, user_data):
|
|||
"""
|
||||
Incoming call from friend
|
||||
"""
|
||||
print friend_number, audio, video
|
||||
print(friend_number, audio, video)
|
||||
invoke_in_main_thread(Profile.get_instance().incoming_call, audio, video, friend_number)
|
||||
|
||||
|
||||
|
|
@ -279,9 +280,9 @@ def callback_audio(toxav, friend_number, samples, audio_samples_per_channel, aud
|
|||
"""
|
||||
New audio chunk
|
||||
"""
|
||||
# print audio_samples_per_channel, audio_channels_count, rate
|
||||
# print(audio_samples_per_channel, audio_channels_count, rate)
|
||||
Profile.get_instance().call.chunk(
|
||||
''.join(chr(x) for x in samples[:audio_samples_per_channel * 2 * audio_channels_count]),
|
||||
bytes(samples[:audio_samples_per_channel * 2 * audio_channels_count]),
|
||||
audio_channels_count,
|
||||
rate)
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ CALL_TYPE = {
|
|||
}
|
||||
|
||||
|
||||
class AV(object):
|
||||
class AV:
|
||||
|
||||
def __init__(self, toxav):
|
||||
self._toxav = toxav
|
||||
|
|
@ -30,7 +30,7 @@ class AV(object):
|
|||
self._audio_rate = 8000
|
||||
self._audio_channels = 1
|
||||
self._audio_duration = 60
|
||||
self._audio_sample_count = self._audio_rate * self._audio_channels * self._audio_duration / 1000
|
||||
self._audio_sample_count = self._audio_rate * self._audio_channels * self._audio_duration // 1000
|
||||
|
||||
def __contains__(self, friend_number):
|
||||
return friend_number in self._calls
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ except ImportError:
|
|||
from toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE
|
||||
|
||||
|
||||
class Contact(object):
|
||||
class Contact:
|
||||
"""
|
||||
Class encapsulating TOX contact
|
||||
Properties: name (alias of contact or name), status_message, status (connection status)
|
||||
|
|
@ -36,7 +36,7 @@ class Contact(object):
|
|||
return self._name
|
||||
|
||||
def set_name(self, value):
|
||||
self._name = value.decode('utf-8')
|
||||
self._name = str(value, 'utf-8')
|
||||
self._widget.name.setText(self._name)
|
||||
self._widget.name.repaint()
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ class Contact(object):
|
|||
return self._status_message
|
||||
|
||||
def set_status_message(self, value):
|
||||
self._status_message = value.decode('utf-8')
|
||||
self._status_message = str(value, 'utf-8')
|
||||
self._widget.status_message.setText(self._status_message)
|
||||
self._widget.status_message.repaint()
|
||||
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ class SendTransfer(FileTransfer):
|
|||
super(SendTransfer, self).__init__(path, tox, friend_number, size)
|
||||
self.state = TOX_FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
|
||||
self._file_number = tox.file_send(friend_number, kind, size, file_id,
|
||||
basename(path).encode('utf-8') if path else '')
|
||||
bytes(basename(path), 'utf-8') if path else b'')
|
||||
|
||||
def send_chunk(self, position, size):
|
||||
"""
|
||||
|
|
@ -167,7 +167,8 @@ class SendFromBuffer(FileTransfer):
|
|||
super(SendFromBuffer, self).__init__(None, tox, friend_number, len(data))
|
||||
self.state = TOX_FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
|
||||
self._data = data
|
||||
self._file_number = tox.file_send(friend_number, TOX_FILE_KIND['DATA'], len(data), None, file_name)
|
||||
self._file_number = tox.file_send(friend_number, TOX_FILE_KIND['DATA'],
|
||||
len(data), None, bytes(file_name, 'utf-8'))
|
||||
|
||||
def get_data(self):
|
||||
return self._data
|
||||
|
|
@ -229,7 +230,7 @@ class ReceiveTransfer(FileTransfer):
|
|||
data = bytearray(data)
|
||||
if self._file_size < position:
|
||||
self._file.seek(0, 2)
|
||||
self._file.write('\0' * (position - self._file_size))
|
||||
self._file.write(b'\0' * (position - self._file_size))
|
||||
self._file.seek(position)
|
||||
self._file.write(data)
|
||||
l = len(data)
|
||||
|
|
@ -246,7 +247,7 @@ class ReceiveToBuffer(FileTransfer):
|
|||
|
||||
def __init__(self, tox, friend_number, size, file_number):
|
||||
super(ReceiveToBuffer, self).__init__(None, tox, friend_number, size, file_number)
|
||||
self._data = ''
|
||||
self._data = bytes()
|
||||
self._data_size = 0
|
||||
|
||||
def get_data(self):
|
||||
|
|
@ -257,17 +258,16 @@ class ReceiveToBuffer(FileTransfer):
|
|||
self._creation_time = time()
|
||||
if data is None:
|
||||
self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
|
||||
self.signal()
|
||||
else:
|
||||
data = ''.join(chr(x) for x in data)
|
||||
data = bytes(data)
|
||||
l = len(data)
|
||||
if self._data_size < position:
|
||||
self._data += ('\0' * (position - self._data_size))
|
||||
self._data += (b'\0' * (position - self._data_size))
|
||||
self._data = self._data[:position] + data + self._data[position + l:]
|
||||
if position + l > self._data_size:
|
||||
self._data_size = position + l
|
||||
self._done += l
|
||||
self.signal()
|
||||
self.signal()
|
||||
|
||||
|
||||
class ReceiveAvatar(ReceiveTransfer):
|
||||
|
|
@ -281,20 +281,23 @@ class ReceiveAvatar(ReceiveTransfer):
|
|||
super(ReceiveAvatar, self).__init__(path + '.tmp', tox, friend_number, size, file_number)
|
||||
if size > self.MAX_AVATAR_SIZE:
|
||||
self.send_control(TOX_FILE_CONTROL['CANCEL'])
|
||||
self._file.close()
|
||||
remove(path + '.tmp')
|
||||
elif not size:
|
||||
self.send_control(TOX_FILE_CONTROL['CANCEL'])
|
||||
self._file.close()
|
||||
if exists(path):
|
||||
remove(path)
|
||||
self._file.close()
|
||||
remove(path + '.tmp')
|
||||
elif exists(path):
|
||||
hash = self.get_file_id()
|
||||
with open(path) as fl:
|
||||
with open(path, 'rb') as fl:
|
||||
data = fl.read()
|
||||
existing_hash = Tox.hash(data)
|
||||
if hash == existing_hash:
|
||||
self.send_control(TOX_FILE_CONTROL['CANCEL'])
|
||||
self._file.close()
|
||||
remove(path + '.tmp')
|
||||
else:
|
||||
self.send_control(TOX_FILE_CONTROL['RESUME'])
|
||||
|
|
@ -309,5 +312,3 @@ class ReceiveAvatar(ReceiveTransfer):
|
|||
chdir(dirname(avatar_path))
|
||||
remove(avatar_path)
|
||||
rename(self._path, avatar_path)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -55,12 +55,12 @@ class Friend(contact.Contact):
|
|||
"""
|
||||
if (first_time and self._history_loaded) or (not hasattr(self, '_message_getter')):
|
||||
return
|
||||
data = self._message_getter.get(PAGE_SIZE)
|
||||
data = list(self._message_getter.get(PAGE_SIZE))
|
||||
if data is not None and len(data):
|
||||
data.reverse()
|
||||
else:
|
||||
return
|
||||
data = map(lambda tupl: TextMessage(*tupl), data)
|
||||
data = list(map(lambda tupl: TextMessage(*tupl), data))
|
||||
self._corr = data + self._corr
|
||||
self._history_loaded = True
|
||||
|
||||
|
|
@ -71,8 +71,8 @@ class Friend(contact.Contact):
|
|||
"""
|
||||
if hasattr(self, '_message_getter'):
|
||||
del self._message_getter
|
||||
messages = filter(lambda x: x.get_type() <= 1, self._corr)
|
||||
return map(lambda x: x.get_data(), messages[-self._unsaved_messages:]) if self._unsaved_messages else []
|
||||
messages = list(filter(lambda x: x.get_type() <= 1, self._corr))
|
||||
return list(map(lambda x: x.get_data(), list(messages[-self._unsaved_messages:]))) if self._unsaved_messages else []
|
||||
|
||||
def get_corr(self):
|
||||
return self._corr[:]
|
||||
|
|
@ -86,7 +86,7 @@ class Friend(contact.Contact):
|
|||
self._unsaved_messages += 1
|
||||
|
||||
def get_last_message_text(self):
|
||||
messages = filter(lambda x: x.get_type() <= 1 and x.get_owner() != MESSAGE_OWNER['FRIEND'], self._corr)
|
||||
messages = list(filter(lambda x: x.get_type() <= 1 and x.get_owner() != MESSAGE_OWNER['FRIEND'], self._corr))
|
||||
if messages:
|
||||
return messages[-1].get_data()[0]
|
||||
else:
|
||||
|
|
@ -97,11 +97,11 @@ class Friend(contact.Contact):
|
|||
:return list of unsent messages
|
||||
"""
|
||||
messages = filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
|
||||
return messages
|
||||
return list(messages)
|
||||
|
||||
def mark_as_sent(self):
|
||||
try:
|
||||
message = filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)[0]
|
||||
message = list(filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr))[0]
|
||||
message.mark_as_sent()
|
||||
except Exception as ex:
|
||||
util.log('Mark as sent ex: ' + str(ex))
|
||||
|
|
@ -113,7 +113,7 @@ class Friend(contact.Contact):
|
|||
if hasattr(self, '_message_getter'):
|
||||
del self._message_getter
|
||||
# don't delete data about active file transfer
|
||||
self._corr = filter(lambda x: x.get_type() in (2, 3) and x.get_status() >= 2, self._corr)
|
||||
self._corr = list(filter(lambda x: x.get_type() in (2, 3) and x.get_status() >= 2, self._corr))
|
||||
self._unsaved_messages = 0
|
||||
|
||||
def get_curr_text(self):
|
||||
|
|
@ -133,8 +133,8 @@ class Friend(contact.Contact):
|
|||
Update status of active transfer and load inline if needed
|
||||
"""
|
||||
try:
|
||||
tr = filter(lambda x: x.get_type() == MESSAGE_TYPE['FILE_TRANSFER'] and x.is_active(file_number),
|
||||
self._corr)[0]
|
||||
tr = list(filter(lambda x: x.get_type() == MESSAGE_TYPE['FILE_TRANSFER'] and x.is_active(file_number),
|
||||
self._corr))[0]
|
||||
tr.set_status(status)
|
||||
i = self._corr.index(tr)
|
||||
if inline: # inline was loaded
|
||||
|
|
@ -148,10 +148,10 @@ class Friend(contact.Contact):
|
|||
return messages
|
||||
|
||||
def clear_unsent_files(self):
|
||||
self._corr = filter(lambda x: type(x) is not UnsentFile, self._corr)
|
||||
self._corr = list(filter(lambda x: type(x) is not UnsentFile, self._corr))
|
||||
|
||||
def delete_one_unsent_file(self, time):
|
||||
self._corr = filter(lambda x: not (type(x) is UnsentFile and x.get_data()[2] == time), self._corr)
|
||||
self._corr = list(filter(lambda x: not (type(x) is UnsentFile and x.get_data()[2] == time), self._corr))
|
||||
|
||||
# -----------------------------------------------------------------------------------------------------------------
|
||||
# Alias support
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ MESSAGE_OWNER = {
|
|||
}
|
||||
|
||||
|
||||
class History(object):
|
||||
class History:
|
||||
|
||||
def __init__(self, name):
|
||||
self._name = name
|
||||
|
|
@ -45,7 +45,7 @@ class History(object):
|
|||
path = settings.ProfileHelper.get_path() + self._name + '.hstr'
|
||||
with open(path, 'rb') as fin:
|
||||
data = fin.read()
|
||||
data = encr.pass_encrypt(data)
|
||||
data = encr.pass_encrypt(bytes(data))
|
||||
with open(path, 'wb') as fout:
|
||||
fout.write(data)
|
||||
|
||||
|
|
@ -148,7 +148,7 @@ class History(object):
|
|||
def messages_getter(self, tox_id):
|
||||
return History.MessageGetter(self._name, tox_id)
|
||||
|
||||
class MessageGetter(object):
|
||||
class MessageGetter:
|
||||
def __init__(self, name, tox_id):
|
||||
chdir(settings.ProfileHelper.get_path())
|
||||
self._db = connect(name + '.hstr')
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
from platform import system
|
||||
from ctypes import CDLL
|
||||
import util
|
||||
|
||||
|
||||
class LibToxCore(object):
|
||||
class LibToxCore:
|
||||
|
||||
def __init__(self):
|
||||
if system() == 'Linux':
|
||||
# libtoxcore and libsodium must be installed in your os
|
||||
self._libtoxcore = CDLL('libtoxcore.so')
|
||||
elif system() == 'Windows':
|
||||
self._libtoxcore = CDLL('libs/libtox.dll')
|
||||
self._libtoxcore = CDLL(util.curr_directory() + '/libs/libtox.dll')
|
||||
else:
|
||||
raise OSError('Unknown system.')
|
||||
|
||||
|
|
@ -17,7 +18,7 @@ class LibToxCore(object):
|
|||
return self._libtoxcore.__getattr__(item)
|
||||
|
||||
|
||||
class LibToxAV(object):
|
||||
class LibToxAV:
|
||||
|
||||
def __init__(self):
|
||||
if system() == 'Linux':
|
||||
|
|
@ -25,7 +26,7 @@ class LibToxAV(object):
|
|||
self._libtoxav = CDLL('libtoxav.so')
|
||||
elif system() == 'Windows':
|
||||
# on Windows av api is in libtox.dll
|
||||
self._libtoxav = CDLL('libs/libtox.dll')
|
||||
self._libtoxav = CDLL(util.curr_directory() + '/libs/libtox.dll')
|
||||
else:
|
||||
raise OSError('Unknown system.')
|
||||
|
||||
|
|
@ -33,7 +34,7 @@ class LibToxAV(object):
|
|||
return self._libtoxav.__getattr__(item)
|
||||
|
||||
|
||||
class LibToxEncryptSave(object):
|
||||
class LibToxEncryptSave:
|
||||
|
||||
def __init__(self):
|
||||
if system() == 'Linux':
|
||||
|
|
@ -41,7 +42,7 @@ class LibToxEncryptSave(object):
|
|||
self._lib_tox_encrypt_save = CDLL('libtoxencryptsave.so')
|
||||
elif system() == 'Windows':
|
||||
# on Windows profile encryption api is in libtox.dll
|
||||
self._lib_tox_encrypt_save = CDLL('libs/libtox.dll')
|
||||
self._lib_tox_encrypt_save = CDLL(util.curr_directory() + '/libs/libtox.dll')
|
||||
else:
|
||||
raise OSError('Unknown system.')
|
||||
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ class MessageEdit(QtGui.QTextBrowser):
|
|||
self.setLineWrapColumnOrWidth(self.lineWrapColumnOrWidth())
|
||||
|
||||
def decoratedText(self, text):
|
||||
text = text.replace("&", "&")
|
||||
text = cgi.escape(text) # replace < and >
|
||||
exp = QtCore.QRegExp(
|
||||
'('
|
||||
|
|
@ -303,14 +304,14 @@ class FileTransferItem(QtGui.QListWidget):
|
|||
self.file_name.setGeometry(QtCore.QRect(210, 7, width - 420, 20))
|
||||
font.setPointSize(12)
|
||||
self.file_name.setFont(font)
|
||||
file_size = size / 1024
|
||||
file_size = size // 1024
|
||||
if not file_size:
|
||||
file_size = '{}B'.format(size)
|
||||
elif file_size >= 1024:
|
||||
file_size = '{}MB'.format(file_size / 1024)
|
||||
file_size = '{}MB'.format(file_size // 1024)
|
||||
else:
|
||||
file_size = '{}KB'.format(file_size)
|
||||
file_data = u'{} {}'.format(file_size, file_name)
|
||||
file_data = '{} {}'.format(file_size, file_name)
|
||||
self.file_name.setText(file_data)
|
||||
self.file_name.setToolTip(file_name)
|
||||
self.saved_name = file_name
|
||||
|
|
@ -435,7 +436,7 @@ class InlineImageItem(QtGui.QScrollArea):
|
|||
self.setWidget(self._image_label)
|
||||
self._image_label.setScaledContents(False)
|
||||
self._pixmap = QtGui.QPixmap()
|
||||
self._pixmap.loadFromData(QtCore.QByteArray(data), "PNG")
|
||||
self._pixmap.loadFromData(data, 'PNG')
|
||||
self._max_size = width - 30
|
||||
self._resize_needed = not (self._pixmap.width() <= self._max_size)
|
||||
self._full_size = not self._resize_needed
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ class LoginScreen(CenteredWidget):
|
|||
|
||||
def create_profile(self):
|
||||
self.type = 1
|
||||
self.name = self.new_name.toPlainText()
|
||||
self.name = self.new_name.text()
|
||||
self.close()
|
||||
|
||||
def load_ex_profile(self):
|
||||
|
|
|
|||
17
src/main.py
17
src/main.py
|
|
@ -11,14 +11,13 @@ from profile import tox_factory
|
|||
from callbacks import init_callbacks
|
||||
from util import curr_directory
|
||||
import styles.style
|
||||
import locale
|
||||
import toxencryptsave
|
||||
from passwordscreen import PasswordScreen
|
||||
import profile
|
||||
from plugin_support import PluginLoader
|
||||
|
||||
|
||||
class Toxygen(object):
|
||||
class Toxygen:
|
||||
|
||||
def __init__(self, path_or_uri=None):
|
||||
super(Toxygen, self).__init__()
|
||||
|
|
@ -62,8 +61,8 @@ class Toxygen(object):
|
|||
encrypt_save = toxencryptsave.LibToxEncryptSave()
|
||||
|
||||
if self.path is not None:
|
||||
path = os.path.dirname(self.path.encode(locale.getpreferredencoding())) + '/'
|
||||
name = os.path.basename(self.path.encode(locale.getpreferredencoding()))[:-4]
|
||||
path = os.path.dirname(self.path) + '/'
|
||||
name = os.path.basename(self.path)[:-4]
|
||||
data = ProfileHelper(path, name).open_profile()
|
||||
if encrypt_save.is_data_encrypted(data):
|
||||
data = self.enter_pass(data)
|
||||
|
|
@ -94,10 +93,11 @@ class Toxygen(object):
|
|||
if not _login.t:
|
||||
return
|
||||
elif _login.t == 1: # create new profile
|
||||
_login.name = _login.name.strip()
|
||||
name = _login.name if _login.name else 'toxygen_user'
|
||||
self.tox = tox_factory()
|
||||
self.tox.self_set_name(_login.name if _login.name else 'Toxygen User')
|
||||
self.tox.self_set_status_message('Toxing on Toxygen')
|
||||
self.tox.self_set_name(bytes(_login.name, 'utf-8') if _login.name else b'Toxygen User')
|
||||
self.tox.self_set_status_message(b'Toxing on Toxygen')
|
||||
ProfileHelper(Settings.get_default_path(), name).save_profile(self.tox.get_savedata())
|
||||
path = Settings.get_default_path()
|
||||
settings = Settings(name)
|
||||
|
|
@ -112,7 +112,6 @@ class Toxygen(object):
|
|||
self.tox = tox_factory(data, settings)
|
||||
else:
|
||||
path, name = auto_profile
|
||||
path = path.encode(locale.getpreferredencoding())
|
||||
data = ProfileHelper(path, name).open_profile()
|
||||
if encrypt_save.is_data_encrypted(data):
|
||||
data = self.enter_pass(data)
|
||||
|
|
@ -283,7 +282,7 @@ class Toxygen(object):
|
|||
self.tox.bootstrap(*data)
|
||||
except:
|
||||
pass
|
||||
for _ in xrange(10):
|
||||
for _ in range(10):
|
||||
if self.stop:
|
||||
return
|
||||
self.msleep(1000)
|
||||
|
|
@ -322,7 +321,7 @@ class Toxygen(object):
|
|||
self.toxav.iterate()
|
||||
self.msleep(self.toxav.iteration_interval())
|
||||
|
||||
class Login(object):
|
||||
class Login:
|
||||
|
||||
def __init__(self, arr):
|
||||
self.arr = arr
|
||||
|
|
|
|||
|
|
@ -423,7 +423,8 @@ class MainWindow(QtGui.QMainWindow):
|
|||
def send_smiley(self):
|
||||
self.menu.hide()
|
||||
if self.profile.active_friend + 1:
|
||||
self.smiley = SmileyWindow(self)
|
||||
if not hasattr(self, 'smiley'):
|
||||
self.smiley = SmileyWindow(self)
|
||||
self.smiley.setGeometry(QtCore.QRect(self.x() if Settings.get_instance()['mirror_mode'] else 270 + self.x(),
|
||||
self.y() + self.height() - 200,
|
||||
self.smiley.width(),
|
||||
|
|
@ -499,7 +500,7 @@ class MainWindow(QtGui.QMainWindow):
|
|||
s = Settings.get_instance()
|
||||
note = s['notes'][friend.tox_id] if friend.tox_id in s['notes'] else ''
|
||||
user = QtGui.QApplication.translate("MainWindow", 'Notes about user', None, QtGui.QApplication.UnicodeUTF8)
|
||||
user = u'{} {}'.format(user, friend.name)
|
||||
user = '{} {}'.format(user, friend.name)
|
||||
|
||||
def save_note(text):
|
||||
if friend.tox_id in s['notes']:
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ class ScreenShotWindow(QtGui.QWidget):
|
|||
if self.rubberband.isVisible():
|
||||
self.rubberband.hide()
|
||||
rect = self.rubberband.geometry()
|
||||
print rect
|
||||
if rect.width() and rect.height():
|
||||
p = QtGui.QPixmap.grabWindow(QtGui.QApplication.desktop().winId(),
|
||||
rect.x() + 4,
|
||||
|
|
@ -110,7 +109,7 @@ class ScreenShotWindow(QtGui.QWidget):
|
|||
buffer = QtCore.QBuffer(byte_array)
|
||||
buffer.open(QtCore.QIODevice.WriteOnly)
|
||||
p.save(buffer, 'PNG')
|
||||
Profile.get_instance().send_screenshot(str(byte_array.data()))
|
||||
Profile.get_instance().send_screenshot(bytes(byte_array.data()))
|
||||
self.close()
|
||||
|
||||
def keyPressEvent(self, event):
|
||||
|
|
@ -134,10 +133,10 @@ class SmileyWindow(QtGui.QWidget):
|
|||
count = len(self.data)
|
||||
self.page_size = int(pow(count / 8, 0.5) + 1) * 8 # smileys per page
|
||||
if count % self.page_size == 0:
|
||||
self.page_count = count / self.page_size
|
||||
self.page_count = count // self.page_size
|
||||
else:
|
||||
self.page_count = int(count / float(self.page_size) + 0.5)
|
||||
self.page = 0
|
||||
self.page = -1
|
||||
self.radio = []
|
||||
self.parent = parent
|
||||
for i in range(self.page_count): # buttons with smileys
|
||||
|
|
@ -145,13 +144,13 @@ class SmileyWindow(QtGui.QWidget):
|
|||
elem.setGeometry(QtCore.QRect(i * 20 + 5, 180, 20, 20))
|
||||
elem.clicked.connect(lambda i=i: self.checked(i))
|
||||
self.radio.append(elem)
|
||||
width = max(self.page_count * 20 + 30, (self.page_size + 5) * 8 / 10)
|
||||
width = max(self.page_count * 20 + 30, (self.page_size + 5) * 8 // 10)
|
||||
self.setMaximumSize(width, 200)
|
||||
self.setMinimumSize(width, 200)
|
||||
self.buttons = []
|
||||
for i in range(self.page_size): # pages - radio buttons
|
||||
b = QtGui.QPushButton(self)
|
||||
b.setGeometry(QtCore.QRect((i / 8) * 20 + 5, (i % 8) * 20, 20, 20))
|
||||
b.setGeometry(QtCore.QRect((i // 8) * 20 + 5, (i % 8) * 20, 20, 20))
|
||||
b.clicked.connect(lambda i=i: self.clicked(i))
|
||||
self.buttons.append(b)
|
||||
self.checked(0)
|
||||
|
|
|
|||
12
src/menu.py
12
src/menu.py
|
|
@ -258,7 +258,7 @@ class ProfileSettings(CenteredWidget):
|
|||
|
||||
def closeEvent(self, event):
|
||||
profile = Profile.get_instance()
|
||||
profile.set_name(self.nick.text().encode('utf-8'))
|
||||
profile.set_name(self.nick.text())
|
||||
profile.set_status_message(self.status_message.text().encode('utf-8'))
|
||||
profile.set_status(self.status.currentIndex())
|
||||
|
||||
|
|
@ -306,7 +306,7 @@ class NetworkSettings(CenteredWidget):
|
|||
self.udp.setChecked(settings['udp_enabled'])
|
||||
self.proxy.setChecked(settings['proxy_type'])
|
||||
self.proxyip.setText(settings['proxy_host'])
|
||||
self.proxyport.setText(unicode(settings['proxy_port']))
|
||||
self.proxyport.setText(str(settings['proxy_port']))
|
||||
self.http.setChecked(settings['proxy_type'] == 1)
|
||||
self.warning = QtGui.QLabel(self)
|
||||
self.warning.setGeometry(QtCore.QRect(5, 270, 290, 60))
|
||||
|
|
@ -650,13 +650,13 @@ class AudioSettings(CenteredWidget):
|
|||
p = pyaudio.PyAudio()
|
||||
settings = Settings.get_instance()
|
||||
self.in_indexes, self.out_indexes = [], []
|
||||
for i in xrange(p.get_device_count()):
|
||||
for i in range(p.get_device_count()):
|
||||
device = p.get_device_info_by_index(i)
|
||||
if device["maxInputChannels"]:
|
||||
self.input.addItem(unicode(device["name"]))
|
||||
self.input.addItem(str(device["name"]))
|
||||
self.in_indexes.append(i)
|
||||
if device["maxOutputChannels"]:
|
||||
self.output.addItem(unicode(device["name"]))
|
||||
self.output.addItem(str(device["name"]))
|
||||
self.out_indexes.append(i)
|
||||
self.input.setCurrentIndex(self.in_indexes.index(settings.audio['input']))
|
||||
self.output.setCurrentIndex(self.out_indexes.index(settings.audio['output']))
|
||||
|
|
@ -728,7 +728,7 @@ class PluginsSettings(CenteredWidget):
|
|||
def update_list(self):
|
||||
self.comboBox.clear()
|
||||
data = self.pl_loader.get_plugins_list()
|
||||
self.comboBox.addItems(map(lambda x: x[0], data))
|
||||
self.comboBox.addItems(list(map(lambda x: x[0], data)))
|
||||
self.data = data
|
||||
|
||||
def show_data(self):
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ MESSAGE_TYPE = {
|
|||
}
|
||||
|
||||
|
||||
class Message(object):
|
||||
class Message:
|
||||
|
||||
def __init__(self, message_type, owner, time):
|
||||
self._time = time
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ def tray_notification(title, text, tray, window):
|
|||
tray.connect(tray, QtCore.SIGNAL("messageClicked()"), message_clicked)
|
||||
|
||||
|
||||
class AudioFile(object):
|
||||
class AudioFile:
|
||||
chunk = 1024
|
||||
|
||||
def __init__(self, fl):
|
||||
|
|
|
|||
|
|
@ -57,8 +57,9 @@ class PasswordScreen(CenteredWidget):
|
|||
try:
|
||||
self._encrypt.set_password(self.password.text())
|
||||
new_data = self._encrypt.pass_decrypt(self._data[0])
|
||||
except Exception:
|
||||
except Exception as ex:
|
||||
self.warning.setVisible(True)
|
||||
print('Decryption error:', ex)
|
||||
else:
|
||||
self._data[0] = new_data
|
||||
self.close()
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
import util
|
||||
import profile
|
||||
import os
|
||||
import imp
|
||||
import importlib
|
||||
import inspect
|
||||
import plugins.plugin_super_class as pl
|
||||
import toxencryptsave
|
||||
import sys
|
||||
|
||||
|
||||
class PluginLoader(util.Singleton):
|
||||
|
||||
def __init__(self, tox, settings):
|
||||
super().__init__()
|
||||
self._profile = profile.Profile.get_instance()
|
||||
self._settings = settings
|
||||
self._plugins = {} # dict. key - plugin unique short name, value - tuple (plugin instance, is active)
|
||||
|
|
@ -32,13 +34,15 @@ class PluginLoader(util.Singleton):
|
|||
if not os.path.exists(path):
|
||||
util.log('Plugin dir not found')
|
||||
return
|
||||
else:
|
||||
sys.path.append(path)
|
||||
files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
|
||||
for fl in files:
|
||||
if fl in ('plugin_super_class.py', '__init__.py') or not fl.endswith('.py'):
|
||||
continue
|
||||
name = fl[:-3] # module name without .py
|
||||
try:
|
||||
module = imp.load_source('plugins.' + name, path + fl) # import plugin
|
||||
module = importlib.import_module(name) # import plugin
|
||||
except ImportError:
|
||||
util.log('Import error in module ' + name)
|
||||
continue
|
||||
|
|
@ -47,8 +51,8 @@ class PluginLoader(util.Singleton):
|
|||
continue
|
||||
for elem in dir(module):
|
||||
obj = getattr(module, elem)
|
||||
if inspect.isclass(obj) and issubclass(obj, pl.PluginSuperClass): # looking for plugin class in module
|
||||
print 'Plugin', elem
|
||||
if inspect.isclass(obj) and hasattr(obj, 'is_plugin') and obj.is_plugin: # looking for plugin class in module
|
||||
print('Plugin', elem)
|
||||
try: # create instance of plugin class
|
||||
inst = obj(self._tox, self._profile, self._settings, self._encr)
|
||||
autostart = inst.get_short_name() in self._settings['plugins']
|
||||
|
|
@ -147,6 +151,6 @@ class PluginLoader(util.Singleton):
|
|||
"""
|
||||
App is closing, stop all plugins
|
||||
"""
|
||||
for key in self._plugins.keys():
|
||||
for key in list(self._plugins.keys()):
|
||||
self._plugins[key][0].close()
|
||||
del self._plugins[key]
|
||||
|
|
|
|||
|
|
@ -26,13 +26,14 @@ def log(name, data):
|
|||
:param data: data for saving in log
|
||||
"""
|
||||
with open(path_to_data(name) + 'logs.txt', 'a') as fl:
|
||||
fl.write(str(data) + '\n')
|
||||
fl.write(bytes(data, 'utf-8') + b'\n')
|
||||
|
||||
|
||||
class PluginSuperClass(object):
|
||||
class PluginSuperClass:
|
||||
"""
|
||||
Superclass for all plugins. Plugin is python module with at least one class derived from PluginSuperClass.
|
||||
"""
|
||||
is_plugin = True
|
||||
|
||||
def __init__(self, name, short_name, tox=None, profile=None, settings=None, encrypt_save=None):
|
||||
"""
|
||||
|
|
@ -159,9 +160,9 @@ class PluginSuperClass(object):
|
|||
"""
|
||||
This method loads settings of plugin and returns raw data
|
||||
"""
|
||||
with open(path_to_data(self._short_name) + 'settings.json') as fl:
|
||||
with open(path_to_data(self._short_name) + 'settings.json', 'rb') as fl:
|
||||
data = fl.read()
|
||||
return data
|
||||
return str(data, 'utf-8')
|
||||
|
||||
def save_settings(self, data):
|
||||
"""
|
||||
|
|
@ -169,7 +170,7 @@ class PluginSuperClass(object):
|
|||
:param data: string with data
|
||||
"""
|
||||
with open(path_to_data(self._short_name) + 'settings.json', 'wb') as fl:
|
||||
fl.write(data)
|
||||
fl.write(bytes(data, 'utf-8'))
|
||||
|
||||
# -----------------------------------------------------------------------------------------------------------------
|
||||
# Callbacks
|
||||
|
|
@ -212,8 +213,10 @@ class PluginSuperClass(object):
|
|||
data = ''
|
||||
try:
|
||||
return self._tox.friend_send_lossless_packet(friend_number,
|
||||
chr(len(self._short_name) + LOSSLESS_FIRST_BYTE) +
|
||||
self._short_name + str(data))
|
||||
bytes([ord(x) for x in
|
||||
chr(len(self._short_name) + LOSSLESS_FIRST_BYTE) +
|
||||
self._short_name + str(data)
|
||||
]))
|
||||
except:
|
||||
return False
|
||||
|
||||
|
|
@ -228,7 +231,9 @@ class PluginSuperClass(object):
|
|||
data = ''
|
||||
try:
|
||||
return self._tox.friend_send_lossy_packet(friend_number,
|
||||
chr(len(self._short_name) + LOSSY_FIRST_BYTE) +
|
||||
self._short_name + str(data))
|
||||
bytes([ord(x) for x in
|
||||
chr(len(self._short_name) + LOSSY_FIRST_BYTE) +
|
||||
self._short_name + str(data)
|
||||
]))
|
||||
except:
|
||||
return False
|
||||
|
|
|
|||
|
|
@ -26,10 +26,12 @@ class Profile(contact.Contact, Singleton):
|
|||
:param tox: tox instance
|
||||
:param screen: ref to main screen
|
||||
"""
|
||||
super(Profile, self).__init__(tox.self_get_name(),
|
||||
tox.self_get_status_message(),
|
||||
screen.user_info,
|
||||
tox.self_get_address())
|
||||
contact.Contact.__init__(self,
|
||||
tox.self_get_name(),
|
||||
tox.self_get_status_message(),
|
||||
screen.user_info,
|
||||
tox.self_get_address())
|
||||
Singleton.__init__(self)
|
||||
self._screen = screen
|
||||
self._messages = screen.messages
|
||||
self._tox = tox
|
||||
|
|
@ -48,7 +50,7 @@ class Profile(contact.Contact, Singleton):
|
|||
if not self._history.friend_exists_in_db(tox_id):
|
||||
self._history.add_friend_to_db(tox_id)
|
||||
try:
|
||||
alias = filter(lambda x: x[0] == tox_id, aliases)[0][1]
|
||||
alias = list(filter(lambda x: x[0] == tox_id, aliases))[0][1]
|
||||
except:
|
||||
alias = ''
|
||||
item = self.create_friend_item()
|
||||
|
|
@ -77,18 +79,19 @@ class Profile(contact.Contact, Singleton):
|
|||
self._tox.self_set_status(status)
|
||||
|
||||
def set_name(self, value):
|
||||
if self.name == value:
|
||||
return
|
||||
tmp = self.name
|
||||
super(Profile, self).set_name(value)
|
||||
super(Profile, self).set_name(value.encode('utf-8'))
|
||||
self._tox.self_set_name(self._name.encode('utf-8'))
|
||||
if tmp != value:
|
||||
message = QtGui.QApplication.translate("MainWindow", 'User {} is now known as {}', None,
|
||||
QtGui.QApplication.UnicodeUTF8)
|
||||
message = message.format(tmp, value)
|
||||
for friend in self._friends:
|
||||
friend.append_message(InfoMessage(message, time.time()))
|
||||
if self._active_friend + 1:
|
||||
self.create_message_item(message, curr_time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
|
||||
self._messages.scrollToBottom()
|
||||
message = QtGui.QApplication.translate("MainWindow", 'User {} is now known as {}', None,
|
||||
QtGui.QApplication.UnicodeUTF8)
|
||||
message = message.format(tmp, value)
|
||||
for friend in self._friends:
|
||||
friend.append_message(InfoMessage(message, time.time()))
|
||||
if self._active_friend + 1:
|
||||
self.create_message_item(message, curr_time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
|
||||
self._messages.scrollToBottom()
|
||||
|
||||
def set_status_message(self, value):
|
||||
super(Profile, self).set_status_message(value)
|
||||
|
|
@ -131,7 +134,7 @@ class Profile(contact.Contact, Singleton):
|
|||
self.filtration(self._show_online, self._filter_string)
|
||||
|
||||
def get_friend_by_number(self, num):
|
||||
return filter(lambda x: x.number == num, self._friends)[0]
|
||||
return list(filter(lambda x: x.number == num, self._friends))[0]
|
||||
|
||||
def get_friend(self, num):
|
||||
return self._friends[num]
|
||||
|
|
@ -192,7 +195,7 @@ class Profile(contact.Contact, Singleton):
|
|||
ft.set_state_changed_handler(item.update)
|
||||
ft.signal()
|
||||
except:
|
||||
print 'Incoming not started transfer - no info found'
|
||||
print('Incoming not started transfer - no info found')
|
||||
elif message.get_type() == MESSAGE_TYPE['INLINE']: # inline
|
||||
self.create_inline_item(message.get_data())
|
||||
else: # info message
|
||||
|
|
@ -222,8 +225,9 @@ class Profile(contact.Contact, Singleton):
|
|||
self._screen.account_avatar.setScaledContents(False)
|
||||
self._screen.account_avatar.setPixmap(pixmap.scaled(64, 64, QtCore.Qt.KeepAspectRatio))
|
||||
self._screen.account_avatar.repaint() # comment?
|
||||
except: # no friend found. ignore
|
||||
log('Incorrect friend value: ' + str(value))
|
||||
except Exception as ex: # no friend found. ignore
|
||||
log('Friend value: ' + str(value))
|
||||
log('Error: ' + str(ex))
|
||||
raise
|
||||
|
||||
active_friend = property(get_active, set_active)
|
||||
|
|
@ -244,7 +248,7 @@ class Profile(contact.Contact, Singleton):
|
|||
friend = self.get_friend_by_number(number)
|
||||
tmp = friend.name
|
||||
friend.set_name(name)
|
||||
name = name.decode('utf-8')
|
||||
name = str(name, 'utf-8')
|
||||
if friend.name == name and tmp != name:
|
||||
message = QtGui.QApplication.translate("MainWindow", 'User {} is now known as {}', None, QtGui.QApplication.UnicodeUTF8)
|
||||
message = message.format(tmp, name)
|
||||
|
|
@ -277,7 +281,7 @@ class Profile(contact.Contact, Singleton):
|
|||
if friend_number == self.get_active_number():
|
||||
self.update()
|
||||
except Exception as ex:
|
||||
print 'Exception in file sending: ' + str(ex)
|
||||
print('Exception in file sending: ' + str(ex))
|
||||
|
||||
def friend_exit(self, friend_number):
|
||||
"""
|
||||
|
|
@ -328,6 +332,7 @@ class Profile(contact.Contact, Singleton):
|
|||
try:
|
||||
for message in messages:
|
||||
self.split_and_send(friend_number, message.get_data()[-1], message.get_data()[0].encode('utf-8'))
|
||||
friend.inc_receipts()
|
||||
except:
|
||||
pass
|
||||
|
||||
|
|
@ -362,15 +367,15 @@ class Profile(contact.Contact, Singleton):
|
|||
:param message: text of message
|
||||
"""
|
||||
if friend_num == self.get_active_number(): # add message to list
|
||||
self.create_message_item(message.decode('utf-8'), curr_time(), MESSAGE_OWNER['FRIEND'], message_type)
|
||||
self.create_message_item(message, curr_time(), MESSAGE_OWNER['FRIEND'], message_type)
|
||||
self._messages.scrollToBottom()
|
||||
self._friends[self._active_friend].append_message(
|
||||
TextMessage(message.decode('utf-8'), MESSAGE_OWNER['FRIEND'], time.time(), message_type))
|
||||
TextMessage(message, MESSAGE_OWNER['FRIEND'], time.time(), message_type))
|
||||
else:
|
||||
friend = self.get_friend_by_number(friend_num)
|
||||
friend.inc_messages()
|
||||
friend.append_message(
|
||||
TextMessage(message.decode('utf-8'), MESSAGE_OWNER['FRIEND'], time.time(), message_type))
|
||||
TextMessage(message, MESSAGE_OWNER['FRIEND'], time.time(), message_type))
|
||||
if not friend.visibility:
|
||||
self.update_filtration()
|
||||
|
||||
|
|
@ -429,7 +434,7 @@ class Profile(contact.Contact, Singleton):
|
|||
self._history.delete_messages(friend.tox_id)
|
||||
self._history.delete_friend_from_db(friend.tox_id)
|
||||
else: # clear all history
|
||||
for number in xrange(len(self._friends)):
|
||||
for number in range(len(self._friends)):
|
||||
self.clear_history(number)
|
||||
if num is None or num == self.get_active_number():
|
||||
self._messages.clear()
|
||||
|
|
@ -465,7 +470,7 @@ class Profile(contact.Contact, Singleton):
|
|||
ft.set_state_changed_handler(item.update)
|
||||
ft.signal()
|
||||
except:
|
||||
print 'Incoming not started transfer - no info found'
|
||||
print('Incoming not started transfer - no info found')
|
||||
elif message.get_type() == MESSAGE_TYPE['INLINE']: # inline
|
||||
self.create_inline_item(message.get_data())
|
||||
else: # info message
|
||||
|
|
@ -558,11 +563,11 @@ class Profile(contact.Contact, Singleton):
|
|||
Set new alias for friend
|
||||
"""
|
||||
friend = self._friends[num]
|
||||
name = friend.name.encode('utf-8')
|
||||
name = friend.name
|
||||
dialog = QtGui.QApplication.translate('MainWindow',
|
||||
"Enter new alias for friend {} or leave empty to use friend's name:",
|
||||
None, QtGui.QApplication.UnicodeUTF8)
|
||||
dialog = dialog.format(name.decode('utf-8'))
|
||||
dialog = dialog.format(name)
|
||||
title = QtGui.QApplication.translate('MainWindow',
|
||||
'Set alias',
|
||||
None, QtGui.QApplication.UnicodeUTF8)
|
||||
|
|
@ -570,28 +575,29 @@ class Profile(contact.Contact, Singleton):
|
|||
title,
|
||||
dialog,
|
||||
QtGui.QLineEdit.Normal,
|
||||
name.decode('utf-8'))
|
||||
name)
|
||||
if ok:
|
||||
settings = Settings.get_instance()
|
||||
aliases = settings['friends_aliases']
|
||||
if text:
|
||||
friend.name = text.encode('utf-8')
|
||||
friend.name = bytes(text, 'utf-8')
|
||||
try:
|
||||
index = map(lambda x: x[0], aliases).index(friend.tox_id)
|
||||
index = list(map(lambda x: x[0], aliases)).index(friend.tox_id)
|
||||
aliases[index] = (friend.tox_id, text)
|
||||
except:
|
||||
aliases.append((friend.tox_id, text))
|
||||
friend.set_alias(text)
|
||||
else: # use default name
|
||||
friend.name = self._tox.friend_get_name(friend.number).encode('utf-8')
|
||||
friend.name = bytes(self._tox.friend_get_name(friend.number), 'utf-8')
|
||||
friend.set_alias('')
|
||||
try:
|
||||
index = map(lambda x: x[0], aliases).index(friend.tox_id)
|
||||
index = list(map(lambda x: x[0], aliases)).index(friend.tox_id)
|
||||
del aliases[index]
|
||||
except:
|
||||
pass
|
||||
settings.save()
|
||||
self.set_active()
|
||||
if num == self.get_active_number():
|
||||
self.update()
|
||||
|
||||
def friend_public_key(self, num):
|
||||
return self._friends[num].tox_id
|
||||
|
|
@ -604,7 +610,7 @@ class Profile(contact.Contact, Singleton):
|
|||
friend = self._friends[num]
|
||||
settings = Settings.get_instance()
|
||||
try:
|
||||
index = map(lambda x: x[0], settings['friends_aliases']).index(friend.tox_id)
|
||||
index = list(map(lambda x: x[0], settings['friends_aliases'])).index(friend.tox_id)
|
||||
del settings['friends_aliases'][index]
|
||||
except:
|
||||
pass
|
||||
|
|
@ -905,7 +911,7 @@ class Profile(contact.Contact, Singleton):
|
|||
self.send_inline(data, 'toxygen_inline.png')
|
||||
|
||||
def send_sticker(self, path):
|
||||
with open(path) as fl:
|
||||
with open(path, 'rb') as fl:
|
||||
data = fl.read()
|
||||
self.send_inline(data, 'sticker.png')
|
||||
|
||||
|
|
@ -948,7 +954,7 @@ class Profile(contact.Contact, Singleton):
|
|||
self.update()
|
||||
return
|
||||
elif friend.status is None and is_resend:
|
||||
print 'Error in sending'
|
||||
print('Error in sending')
|
||||
raise RuntimeError()
|
||||
st = SendTransfer(path, self._tox, friend_number)
|
||||
self._file_transfers[(friend_number, st.get_file_number())] = st
|
||||
|
|
@ -976,6 +982,7 @@ class Profile(contact.Contact, Singleton):
|
|||
self.get_friend_by_number(friend_number).load_avatar()
|
||||
self.set_active(None)
|
||||
elif type(transfer) is ReceiveToBuffer: # inline image
|
||||
print('inline')
|
||||
inline = InlineImage(transfer.get_data())
|
||||
i = self.get_friend_by_number(friend_number).update_transfer_data(file_number,
|
||||
TOX_FILE_TRANSFER_STATE['FINISHED'],
|
||||
|
|
@ -1005,6 +1012,7 @@ class Profile(contact.Contact, Singleton):
|
|||
if type(transfer) is not SendAvatar:
|
||||
if type(transfer) is SendFromBuffer and Settings.get_instance()['allow_inline']: # inline
|
||||
inline = InlineImage(transfer.get_data())
|
||||
print('inline')
|
||||
i = self.get_friend_by_number(friend_number).update_transfer_data(file_number,
|
||||
TOX_FILE_TRANSFER_STATE[
|
||||
'FINISHED'],
|
||||
|
|
@ -1151,7 +1159,7 @@ def tox_factory(data=None, settings=None):
|
|||
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 = settings['proxy_host']
|
||||
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']
|
||||
|
|
|
|||
|
|
@ -8,13 +8,14 @@ from toxencryptsave import LibToxEncryptSave
|
|||
import smileys
|
||||
|
||||
|
||||
class Settings(Singleton, dict):
|
||||
class Settings(dict, Singleton):
|
||||
"""
|
||||
Settings of current profile + global app settings
|
||||
"""
|
||||
|
||||
def __init__(self, name):
|
||||
self.path = ProfileHelper.get_path() + unicode(name) + '.json'
|
||||
Singleton.__init__(self)
|
||||
self.path = ProfileHelper.get_path() + str(name) + '.json'
|
||||
self.name = name
|
||||
if os.path.isfile(self.path):
|
||||
with open(self.path, 'rb') as fl:
|
||||
|
|
@ -23,7 +24,7 @@ class Settings(Singleton, dict):
|
|||
try:
|
||||
if inst.is_data_encrypted(data):
|
||||
data = inst.pass_decrypt(data)
|
||||
info = json.loads(data)
|
||||
info = json.loads(str(data, 'utf-8'))
|
||||
except Exception as ex:
|
||||
info = Settings.get_default_settings()
|
||||
log('Parsing settings error: ' + str(ex))
|
||||
|
|
@ -45,7 +46,7 @@ class Settings(Singleton, dict):
|
|||
data = fl.read()
|
||||
auto = json.loads(data)
|
||||
if 'path' in auto and 'name' in auto:
|
||||
return unicode(auto['path']), unicode(auto['name'])
|
||||
return str(auto['path']), str(auto['name'])
|
||||
return '', ''
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -54,8 +55,8 @@ class Settings(Singleton, dict):
|
|||
with open(p) as fl:
|
||||
data = fl.read()
|
||||
data = json.loads(data)
|
||||
data['path'] = unicode(path.decode(locale.getpreferredencoding()))
|
||||
data['name'] = unicode(name)
|
||||
data['path'] = str(path)
|
||||
data['name'] = str(name)
|
||||
with open(p, 'w') as fl:
|
||||
fl.write(json.dumps(data))
|
||||
|
||||
|
|
@ -73,7 +74,7 @@ class Settings(Singleton, dict):
|
|||
|
||||
@staticmethod
|
||||
def is_active_profile(path, name):
|
||||
path = path.decode(locale.getpreferredencoding()) + name + '.tox'
|
||||
path = path + name + '.tox'
|
||||
settings = Settings.get_default_path() + 'toxygen.json'
|
||||
if os.path.isfile(settings):
|
||||
with open(settings) as fl:
|
||||
|
|
@ -136,7 +137,7 @@ class Settings(Singleton, dict):
|
|||
default = Settings.get_default_settings()
|
||||
for key in default:
|
||||
if key not in self:
|
||||
print key
|
||||
print(key)
|
||||
self[key] = default[key]
|
||||
self.save()
|
||||
|
||||
|
|
@ -144,7 +145,9 @@ class Settings(Singleton, dict):
|
|||
text = json.dumps(self)
|
||||
inst = LibToxEncryptSave.get_instance()
|
||||
if inst.has_password():
|
||||
text = inst.pass_encrypt(text)
|
||||
text = bytes(inst.pass_encrypt(bytes(text, 'utf-8')))
|
||||
else:
|
||||
text = bytes(text, 'utf-8')
|
||||
with open(self.path, 'wb') as fl:
|
||||
fl.write(text)
|
||||
|
||||
|
|
@ -155,7 +158,7 @@ class Settings(Singleton, dict):
|
|||
data = fl.read()
|
||||
app_settings = json.loads(data)
|
||||
try:
|
||||
app_settings['active_profile'].remove(unicode(ProfileHelper.get_path() + self.name + '.tox'))
|
||||
app_settings['active_profile'].remove(str(ProfileHelper.get_path() + self.name + '.tox'))
|
||||
except:
|
||||
pass
|
||||
data = json.dumps(app_settings)
|
||||
|
|
@ -176,7 +179,7 @@ class Settings(Singleton, dict):
|
|||
if 'active_profile' not in app_settings:
|
||||
app_settings['active_profile'] = []
|
||||
profile_path = ProfileHelper.get_path()
|
||||
app_settings['active_profile'].append(unicode(profile_path + str(self.name) + '.tox'))
|
||||
app_settings['active_profile'].append(str(profile_path + str(self.name) + '.tox'))
|
||||
data = json.dumps(app_settings)
|
||||
with open(path, 'w') as fl:
|
||||
fl.write(data)
|
||||
|
|
@ -199,7 +202,7 @@ class ProfileHelper(Singleton):
|
|||
Class with methods for search, load and save profiles
|
||||
"""
|
||||
def __init__(self, path, name):
|
||||
path = path.decode(locale.getpreferredencoding())
|
||||
Singleton.__init__(self)
|
||||
self._path = path + name + '.tox'
|
||||
self._directory = path
|
||||
# create /avatars if not exists:
|
||||
|
|
@ -224,7 +227,7 @@ class ProfileHelper(Singleton):
|
|||
data = inst.pass_encrypt(data)
|
||||
with open(self._path, 'wb') as fl:
|
||||
fl.write(data)
|
||||
print 'Profile saved successfully'
|
||||
print('Profile saved successfully')
|
||||
|
||||
def export_profile(self, new_path):
|
||||
new_path += os.path.basename(self._path)
|
||||
|
|
@ -232,7 +235,7 @@ class ProfileHelper(Singleton):
|
|||
data = fin.read()
|
||||
with open(new_path, 'wb') as fout:
|
||||
fout.write(data)
|
||||
print 'Profile exported successfully'
|
||||
print('Profile exported successfully')
|
||||
|
||||
@staticmethod
|
||||
def find_profiles():
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ class SmileyLoader(util.Singleton):
|
|||
"""
|
||||
|
||||
def __init__(self, settings):
|
||||
super().__init__()
|
||||
self._settings = settings
|
||||
self._curr_pack = None # current pack name
|
||||
self._smileys = {} # smileys dict. key - smiley (str), value - path to image (str)
|
||||
|
|
@ -33,18 +34,18 @@ class SmileyLoader(util.Singleton):
|
|||
self._smileys = json.loads(fl.read())
|
||||
fl.seek(0)
|
||||
tmp = json.loads(fl.read(), object_pairs_hook=OrderedDict)
|
||||
print 'Smiley pack {} loaded'.format(pack_name)
|
||||
print('Smiley pack {} loaded'.format(pack_name))
|
||||
keys, values, self._list = [], [], []
|
||||
for key, value in tmp.items():
|
||||
value = self.get_smileys_path() + value
|
||||
if value not in values:
|
||||
keys.append(key)
|
||||
values.append(value)
|
||||
self._list = zip(keys, values)
|
||||
self._list = list(zip(keys, values))
|
||||
except Exception as ex:
|
||||
self._smileys = {}
|
||||
self._list = []
|
||||
print 'Smiley pack {} was not loaded. Error: {}'.format(pack_name, ex)
|
||||
print('Smiley pack {} was not loaded. Error: {}'.format(pack_name, ex))
|
||||
|
||||
def get_smileys_path(self):
|
||||
return util.curr_directory() + '/smileys/' + self._curr_pack + '/'
|
||||
|
|
@ -54,7 +55,7 @@ class SmileyLoader(util.Singleton):
|
|||
return [x[1] for x in os.walk(d)][0]
|
||||
|
||||
def get_smileys(self):
|
||||
return self._list[:]
|
||||
return list(self._list)
|
||||
|
||||
def add_smileys_to_text(self, text, edit):
|
||||
"""
|
||||
|
|
@ -69,7 +70,7 @@ class SmileyLoader(util.Singleton):
|
|||
for i in range(len(arr)):
|
||||
if arr[i] in self._smileys:
|
||||
file_name = self._smileys[arr[i]] # image name
|
||||
arr[i] = u'<img title=\"{}\" src=\"{}\" />'.format(arr[i], file_name)
|
||||
arr[i] = '<img title=\"{}\" src=\"{}\" />'.format(arr[i], file_name)
|
||||
if file_name.endswith('.gif'): # animated smiley
|
||||
edit.addAnimation(QtCore.QUrl(file_name), self.get_smileys_path() + file_name)
|
||||
return ' '.join(arr)
|
||||
|
|
@ -85,6 +86,6 @@ def sticker_loader():
|
|||
for key in keys:
|
||||
path = d + key + '/'
|
||||
files = filter(lambda f: f.endswith('.png'), os.listdir(path))
|
||||
files = map(lambda f: unicode(path + f), files)
|
||||
files = map(lambda f: str(path + f), files)
|
||||
result.extend(files)
|
||||
return result
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
18
src/tox.py
18
src/tox.py
|
|
@ -23,15 +23,15 @@ class ToxOptions(Structure):
|
|||
|
||||
|
||||
def string_to_bin(tox_id):
|
||||
return c_char_p(tox_id.decode('hex')) if tox_id is not None else None
|
||||
return c_char_p(bytes.fromhex(tox_id)) if tox_id is not None else None
|
||||
|
||||
|
||||
def bin_to_string(raw_id, length):
|
||||
res = ''.join('{:02x}'.format(ord(raw_id[i])) for i in xrange(length))
|
||||
res = ''.join('{:02x}'.format(ord(raw_id[i])) for i in range(length))
|
||||
return res.upper()
|
||||
|
||||
|
||||
class Tox(object):
|
||||
class Tox:
|
||||
|
||||
libtoxcore = LibToxCore()
|
||||
|
||||
|
|
@ -382,7 +382,7 @@ class Tox(object):
|
|||
if name is None:
|
||||
name = create_string_buffer(self.self_get_name_size())
|
||||
Tox.libtoxcore.tox_self_get_name(self._tox_pointer, name)
|
||||
return name.value.decode('utf8')
|
||||
return str(name.value, 'utf-8')
|
||||
|
||||
def self_set_status_message(self, status_message):
|
||||
"""
|
||||
|
|
@ -430,7 +430,7 @@ class Tox(object):
|
|||
if status_message is None:
|
||||
status_message = create_string_buffer(self.self_get_status_message_size())
|
||||
Tox.libtoxcore.tox_self_get_status_message(self._tox_pointer, status_message)
|
||||
return status_message.value.decode('utf8')
|
||||
return str(status_message.value, 'utf-8')
|
||||
|
||||
def self_set_status(self, status):
|
||||
"""
|
||||
|
|
@ -688,7 +688,7 @@ class Tox(object):
|
|||
byref(tox_err_friend_query))
|
||||
tox_err_friend_query = tox_err_friend_query.value
|
||||
if tox_err_friend_query == TOX_ERR_FRIEND_QUERY['OK']:
|
||||
return name.value.decode('utf8')
|
||||
return str(name.value, 'utf-8')
|
||||
elif tox_err_friend_query == TOX_ERR_FRIEND_QUERY['NULL']:
|
||||
raise ArgumentError('The pointer parameter for storing the query result (name, message) was NULL. Unlike'
|
||||
' the `_self_` variants of these functions, which have no effect when a parameter is'
|
||||
|
|
@ -752,7 +752,7 @@ class Tox(object):
|
|||
byref(tox_err_friend_query))
|
||||
tox_err_friend_query = tox_err_friend_query.value
|
||||
if tox_err_friend_query == TOX_ERR_FRIEND_QUERY['OK']:
|
||||
return status_message.value.decode('utf8')
|
||||
return str(status_message.value, 'utf-8')
|
||||
elif tox_err_friend_query == TOX_ERR_FRIEND_QUERY['NULL']:
|
||||
raise ArgumentError('The pointer parameter for storing the query result (name, message) was NULL. Unlike'
|
||||
' the `_self_` variants of these functions, which have no effect when a parameter is'
|
||||
|
|
@ -1200,7 +1200,9 @@ class Tox(object):
|
|||
"""
|
||||
tox_err_file_send = c_int()
|
||||
result = self.libtoxcore.tox_file_send(self._tox_pointer, c_uint32(friend_number), c_uint32(kind),
|
||||
c_uint64(file_size), string_to_bin(file_id), c_char_p(filename),
|
||||
c_uint64(file_size),
|
||||
string_to_bin(file_id),
|
||||
c_char_p(filename),
|
||||
c_size_t(len(filename)), byref(tox_err_file_send))
|
||||
tox_err_file_send = tox_err_file_send.value
|
||||
if tox_err_file_send == TOX_ERR_FILE_SEND['OK']:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import json
|
||||
import urllib2
|
||||
import urllib.request
|
||||
from util import log
|
||||
|
||||
|
||||
|
|
@ -20,10 +20,10 @@ def tox_dns(email):
|
|||
|
||||
|
||||
def send_request(url, data):
|
||||
req = urllib2.Request(url)
|
||||
req = urllib.request.Request(url)
|
||||
req.add_header('Content-Type', 'application/json')
|
||||
response = urllib2.urlopen(req, json.dumps(data))
|
||||
res = json.loads(response.read())
|
||||
response = urllib.request.urlopen(req, bytes(json.dumps(data), 'utf-8'))
|
||||
res = json.loads(str(response.read(), 'utf-8'))
|
||||
if not res['c']:
|
||||
return res['tox_id']
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ from libtox import LibToxAV
|
|||
from toxav_enums import *
|
||||
|
||||
|
||||
class ToxAV(object):
|
||||
class ToxAV:
|
||||
"""
|
||||
The ToxAV instance type. Each ToxAV instance can be bound to only one Tox instance, and Tox instance can have only
|
||||
one ToxAV instance. One must make sure to close ToxAV instance prior closing Tox instance otherwise undefined
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ class LibToxEncryptSave(util.Singleton):
|
|||
libtoxencryptsave = libtox.LibToxEncryptSave()
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self._passphrase = None
|
||||
|
||||
def set_password(self, passphrase):
|
||||
|
|
@ -50,7 +51,7 @@ class LibToxEncryptSave(util.Singleton):
|
|||
def is_data_encrypted(self, data):
|
||||
func = self.libtoxencryptsave.tox_is_data_encrypted
|
||||
func.restype = c_bool
|
||||
result = func(c_char_p(data))
|
||||
result = func(c_char_p(bytes(data)))
|
||||
return result
|
||||
|
||||
def pass_encrypt(self, data):
|
||||
|
|
@ -63,7 +64,7 @@ class LibToxEncryptSave(util.Singleton):
|
|||
tox_err_encryption = c_int()
|
||||
self.libtoxencryptsave.tox_pass_encrypt(c_char_p(data),
|
||||
c_size_t(len(data)),
|
||||
c_char_p(self._passphrase),
|
||||
c_char_p(bytes(self._passphrase, 'utf-8')),
|
||||
c_size_t(len(self._passphrase)),
|
||||
out,
|
||||
byref(tox_err_encryption))
|
||||
|
|
@ -86,9 +87,9 @@ class LibToxEncryptSave(util.Singleton):
|
|||
"""
|
||||
out = create_string_buffer(len(data) - TOX_PASS_ENCRYPTION_EXTRA_LENGTH)
|
||||
tox_err_decryption = c_int()
|
||||
self.libtoxencryptsave.tox_pass_decrypt(c_char_p(data),
|
||||
self.libtoxencryptsave.tox_pass_decrypt(c_char_p(bytes(data)),
|
||||
c_size_t(len(data)),
|
||||
c_char_p(self._passphrase),
|
||||
c_char_p(bytes(self._passphrase, 'utf-8')),
|
||||
c_size_t(len(self._passphrase)),
|
||||
out,
|
||||
byref(tox_err_decryption))
|
||||
|
|
|
|||
|
|
@ -26,12 +26,11 @@ def convert_time(t):
|
|||
return '%02d:%02d' % (h, m)
|
||||
|
||||
|
||||
class Singleton(object):
|
||||
class Singleton:
|
||||
_instance = None
|
||||
|
||||
def __new__(cls, *args, **kwargs):
|
||||
if not hasattr(cls, '_instance'):
|
||||
cls._instance = super(Singleton, cls).__new__(cls, *args, **kwargs)
|
||||
return cls._instance
|
||||
def __init__(self):
|
||||
self.__class__._instance = self
|
||||
|
||||
@classmethod
|
||||
def get_instance(cls):
|
||||
|
|
|
|||
|
|
@ -8,12 +8,11 @@ class DataLabel(QtGui.QLabel):
|
|||
"""
|
||||
Label with elided text
|
||||
"""
|
||||
|
||||
def paintEvent(self, event):
|
||||
painter = QtGui.QPainter(self)
|
||||
def setText(self, text):
|
||||
text = ''.join(c if c <= '\u10FFFF' else '\u25AF' for c in text)
|
||||
metrics = QtGui.QFontMetrics(self.font())
|
||||
text = metrics.elidedText(self.text(), QtCore.Qt.ElideRight, self.width())
|
||||
painter.drawText(self.rect(), self.alignment(), text)
|
||||
text = metrics.elidedText(text, QtCore.Qt.ElideRight, self.width())
|
||||
super().setText(text)
|
||||
|
||||
|
||||
class CenteredWidget(QtGui.QWidget):
|
||||
|
|
|
|||
Loading…
Reference in New Issue