From 18e027ffd9ab5c288adb7a2247f19352dfd74789 Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Tue, 23 Feb 2016 00:18:58 +0300 Subject: [PATCH] callbacks update, bug fixes --- src/callbacks.py | 20 +++++++++++++------- src/main.py | 6 ++---- src/profile.py | 2 +- src/settings.py | 1 + 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/callbacks.py b/src/callbacks.py index 4a96b7e..1de3672 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -1,14 +1,20 @@ -# TODO: add all callbacks (use wrappers) +# TODO: add all callbacks (replace test callbacks and use wrappers) -def status(a, b, c): +def self_connection_status(a, b, c): print 'WOW, it works!' - print str(b) + print 'Status: ', str(b) -def friend_status(a, b, c, d, e): - print 'Friend connected! Friend number: ' + str(c) +def friend_status(a, b, c, d): + print "Friend connected! Friend's data: ", str(a), str(b), str(c) -def message(a, b, c, d, e, f): - print 'Message: ', str(d) \ No newline at end of file +def friend_message(a, b, c, d, e, f): + print 'Message: ', unicode(d, "utf-8") + + +def init_callbacks(tox): + tox.callback_friend_status(friend_status, 0) + tox.callback_friend_message(friend_message, 0) + tox.callback_self_connection_status(self_connection_status, 0) diff --git a/src/main.py b/src/main.py index 66593bd..a60bd69 100644 --- a/src/main.py +++ b/src/main.py @@ -4,7 +4,7 @@ from mainscreen import MainWindow from profile import Profile, tox_factory import sys from PySide import QtCore, QtGui -from callbacks import * +from callbacks import init_callbacks from tox import Tox from bootstrap import node_generator @@ -73,9 +73,7 @@ def main(): # bootstrap for data in node_generator(): tox.bootstrap(*data) - # TODO: set all callbacks and init it with ms - tox.callback_friend_message(message, 0) - tox.callback_self_connection_status(status, 0) + init_callbacks(tox) # starting thread for tox iterate mainloop = ToxIterateThread(tox) mainloop.start() diff --git a/src/profile.py b/src/profile.py index 95ee3bd..5bca1b7 100644 --- a/src/profile.py +++ b/src/profile.py @@ -51,7 +51,7 @@ def tox_factory(data, settings): tox_options.contents.start_port = settings['start_port'] tox_options.contents.end_port = settings['end_port'] tox_options.contents.tcp_port = settings['tcp_port'] - tox_options.contents.savedata_type = TOX_SAVEDATA_TYPE['TOX_SAVEDATA_TYPE_TOX_SAVE'] + 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) return Tox(tox_options) diff --git a/src/settings.py b/src/settings.py index 0194fd9..268f4dc 100644 --- a/src/settings.py +++ b/src/settings.py @@ -33,6 +33,7 @@ class Settings(dict): 'save_history': False, 'allow_inline': True, 'allow_auto_accept': False, + 'show_online_friends': False, 'auto_accept_from_friends': [], 'friends_aliases': [], 'typing_notifications': True,