update big NGC

This reverts commit 47c115e699.

.gitignore

@@ -1,6 +1,5 @@
 *.pyc
 *.pyo
-*.ui
 toxygen/toxcore
 tests/tests
 tests/libs
@@ -25,3 +24,5 @@ html
 Toxygen.egg-info
 *.tox
 .cache
+*.db
+

.travis.yml

@@ -18,6 +18,7 @@ install:
   - pip install pyqt5
   - pip install pyaudio
   - pip install opencv-python
+  - pip install pydenticon
 before_script:
 # Opus
   - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
@@ -37,15 +38,16 @@ before_script:
   - sudo ldconfig
   - cd ..
 # Toxcore
-  - git clone https://github.com/irungentoo/toxcore.git
+  - git clone https://github.com/ingvar1995/toxcore.git --branch=ngc_rebase
   - cd toxcore
-  - autoreconf -if
+  - mkdir _build && cd _build
-  - ./configure
+  - cmake ..
   - make -j$(nproc)
   - sudo make install
   - echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
   - sudo ldconfig
   - cd ..
+  - cd ..
 script:
   - py.test tests/travis.py
   - py.test tests/tests.py

MANIFEST.in

@@ -16,4 +16,4 @@ include toxygen/styles/*.qss
 include toxygen/translations/*.qm
 include toxygen/libs/libtox.dll
 include toxygen/libs/libsodium.a
-include toxygen/nodes.json
+include toxygen/bootstrap/nodes.json

build/Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+apt-get install build-essential libtool autotools-dev automake checkinstall cmake check git yasm libsodium-dev libopus-dev libvpx-dev pkg-config -y && \
+git clone https://github.com/ingvar1995/toxcore.git --branch=ngc_rebase && \
+cd toxcore && mkdir _build && cd _build && \
+cmake .. && make && make install
+
+RUN apt-get install portaudio19-dev python3-pyqt5 python3-pyaudio python3-pip -y && \
+pip3 install numpy pydenticon opencv-python pyinstaller
+
+RUN useradd -ms /bin/bash toxygen
+USER toxygen

build/build.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+cd ~
+git clone https://github.com/toxygen-project/toxygen.git --branch=next_gen
+cd toxygen/toxygen
+
+pyinstaller --windowed --icon=images/icon.ico main.py
+
+cp -r styles dist/main/
+find . -type f ! -name '*.qss' -delete
+cp -r plugins dist/main/
+mkdir -p dist/main/ui/views
+cp -r ui/views dist/main/ui/
+cp -r sounds dist/main/
+cp -r smileys dist/main/
+cp -r stickers dist/main/
+cp -r bootstrap dist/main/
+find . -type f ! -name '*.json' -delete
+cp -r images dist/main/
+cp -r translations dist/main/
+find . -name "*.ts" -type f -delete
+
+cd dist
+mv main toxygen
+cd toxygen
+mv main toxygen
+wget -O updater https://github.com/toxygen-project/toxygen_updater/releases/download/v0.1/toxygen_updater_linux_64
+echo "[Paths]" >> qt.conf
+echo "Prefix = PyQt5/Qt" >> qt.conf
+cd ..
+
+tar -zcvf toxygen_linux_64.tar.gz toxygen > /dev/null
+rm -rf toxygen

docs/compile.md

@@ -2,10 +2,18 @@
 
 You can compile Toxygen using [PyInstaller](http://www.pyinstaller.org/)
 
-Install PyInstaller: 
+Use Dockerfile and build script from `build` directory:
-``pip3 install pyinstaller``
 
-Compile Toxygen:
+1. Build image:
-``pyinstaller --windowed --icon images/icon.ico main.py``
+```
+docker build -t toxygen .
+```
 
-Don't forget to copy /images/, /sounds/, /translations/, /styles/, /smileys/, /stickers/, /plugins/ (and /libs/libtox.dll, /libs/libsodium.a on Windows) to /dist/main/
+2. Run container:
+```
+docker run -it toxygen bash
+```
+
+3. Execute `build.sh` script:
+
+```./build.sh```

docs/contact.md

@@ -1,5 +1,6 @@
 # Contact us:
 
-1) Using GitHub - open issue
+1) https://git.plastiras.org/emdee/toxygen/issues
 
-2) Use Toxygen Tox Group - add bot kalina@toxme.io (or 12EDB939AA529641CE53830B518D6EB30241868EE0E5023C46A372363CAEC91C2C948AEFE4EB)
+2) Use Toxygen Tox Group (NGC) - 
+ID: 59D68B2709E81A679CF91416CB0E3692851C6CFCABEFF98B7131E3805A6D75FA

docs/contributing.md

@@ -7,12 +7,15 @@ Help us find all bugs in Toxygen! Please provide following info:
 - Toxygen executable info - python executable (.py), precompiled binary, from package etc.
 - Steps to reproduce the bug
 
-Want to see new feature in Toxygen? [Ask for it!](https://github.com/toxygen-project/toxygen/issues)
+Want to see new feature in Toxygen? 
+[Ask for it!](https://git.plastiras.org/emdee/toxygen/issues)
 
 # Pull requests
 
 Developer? Feel free to open pull request. Our dev team is small so we glad to get help.
-Don't know what to do? Improve UI, fix [issues](https://github.com/toxygen-project/toxygen/issues) or implement features from our TODO list.
+Don't know what to do? Improve UI, fix 
+[issues](https://git.plastiras.org/emdee/toxygen/issues) 
+or implement features from our TODO list.
 You can find our TODO's in code, issues list and [here](/README.md). Also you can implement [plugins](/docs/plugins.md) for Toxygen.
 
 Note that we have a lot of branches for different purposes. Master branch is for stable versions (releases) only, so I recommend to open PR's to develop branch. Development of next Toxygen version usually goes there. Other branches used for implementing different tasks such as file transfers improvements or audio calls implementation etc.

docs/install.md

@@ -1,33 +1,15 @@
 # How to install Toxygen
 
-## Use precompiled binary (recommended for users):
-[Check our releases page](https://github.com/toxygen-project/toxygen/releases)
-
-## Using pip3
-
-### Windows
-
-``pip install toxygen``
-
-Run app using ``toxygen`` command.
-
 ### Linux
 
-1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
+1. Install [c-toxcore](https://github.com/TokTok/c-toxcore/)
 2. Install PortAudio: 
 ``sudo apt-get install portaudio19-dev``
 3. For 32-bit Linux install PyQt5: ``sudo apt-get install python3-pyqt5``
 4. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo pip3 install opencv-python``
-5. Install toxygen: 
+5. Install [toxygen](https://git.plastiras.org/emdee/toxygen/)
-``sudo pip3 install toxygen``
 6. Run toxygen using ``toxygen`` command.
 
-## Packages
-
-Arch Linux: [AUR](https://aur.archlinux.org/packages/toxygen-git/)
-
-Debian/Ubuntu: [tox.chat](https://tox.chat/download.html#gnulinux)
-
 ## From source code (recommended for developers)
 
 ### Windows
@@ -44,27 +26,17 @@ Note: 32-bit Python isn't supported due to bug with videocalls. It is strictly r
 8. Download latest libtox.dll build, download latest libsodium.a build, put it into \toxygen\libs\
 9. Run \toxygen\main.py.
 
-Optional: install toxygen using setup.py: ``python setup.py install``
-
-[libtox.dll for 32-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86_shared_release.zip)
-
-[libtox.dll for 64-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86-64_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86-64_shared_release.zip)
-
-[libsodium.a for 32-bit Python](https://build.tox.chat/view/libsodium/job/libsodium_build_windows_x86_static_release/lastSuccessfulBuild/artifact/libsodium_build_windows_x86_static_release.zip)
-
-[libsodium.a for 64-bit Python](https://build.tox.chat/view/libsodium/job/libsodium_build_windows_x86-64_static_release/lastSuccessfulBuild/artifact/libsodium_build_windows_x86-64_static_release.zip)
-
 ### Linux
 
 1. Install latest Python3: 
 ``sudo apt-get install python3``
 2. Install PyQt5: ``sudo apt-get install python3-pyqt5`` or ``sudo pip3 install pyqt5``
-3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
+3. Install [toxcore](https://github.com/TokTok/c-toxcore) with toxav support)
 4. Install PyAudio: 
 ``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``sudo pip3 install pyaudio``)
 5. Install NumPy: ``sudo pip3 install numpy``
 6. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo pip3 install opencv-python``
-7. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip)
+7. [Download toxygen](https://git.plastiras.org/emdee/toxygen/)
 8. Unpack archive
 9. Run app:
 ``python3 main.py``

docs/plugin_api.md

@@ -1,6 +1,6 @@
 # Plugins API
 
-In Toxygen plugin is single python (supported Python 3.4 - 3.6) module (.py file) and directory with data associated with it. 
+In Toxygen plugin is single python module (.py file) and directory with data associated with it. 
 Every module must contain one class derived from PluginSuperClass defined in [plugin_super_class.py](/src/plugins/plugin_super_class.py). Instance of this class will be created by PluginLoader class (defined in [plugin_support.py](/src/plugin_support.py) ). This class can enable/disable plugins and send data to it. 
 
 Every plugin has its own full name and unique short name (1-5 symbols). Main app can get it using special methods. 

setup.py

@@ -2,15 +2,17 @@ from setuptools import setup
 from setuptools.command.install import install
 from platform import system
 from subprocess import call
-from toxygen.util import program_version
+import main
 import sys
+import os
+from utils.util import curr_directory, join_path
 
 
-version = program_version + '.0'
+version = main.__version__ + '.0'
 
 
 if system() == 'Windows':
-    MODULES = ['PyQt5', 'PyAudio', 'numpy', 'opencv-python']
+    MODULES = ['PyQt5', 'PyAudio', 'numpy', 'opencv-python', 'pydenticon']
 else:
     MODULES = []
     try:
@@ -29,6 +31,19 @@ else:
         import cv2
     except ImportError:
         MODULES.append('opencv-python')
+    try:
+        import pydenticon
+    except ImportError:
+        MODULES.append('pydenticon')
+
+
+def get_packages():
+    directory = join_path(curr_directory(__file__), 'toxygen')
+    for root, dirs, files in os.walk(directory):
+        packages = map(lambda d: 'toxygen.' + d, dirs)
+        packages = ['toxygen'] + list(packages)
+
+        return packages
 
 
 class InstallScript(install):
@@ -62,7 +77,7 @@ setup(name='Toxygen',
       author='Ingvar',
       maintainer='Ingvar',
       license='GPL3',
-      packages=['toxygen', 'toxygen.plugins', 'toxygen.styles'],
+      packages=get_packages(),
       install_requires=MODULES,
       include_package_data=True,
       classifiers=[
@@ -71,8 +86,8 @@ setup(name='Toxygen',
           'Programming Language :: Python :: 3.6',
       ],
       entry_points={
-          'console_scripts': ['toxygen=toxygen.main:main'],
+          'console_scripts': ['toxygen=toxygen.main:main']
       },
       cmdclass={
-          'install': InstallScript,
+          'install': InstallScript
       })

tests/tests.py

@@ -1,177 +1,18 @@
-from toxygen.profile import *
+from toxygen.middleware.tox_factory import *
-from toxygen.tox_dns import tox_dns
-from toxygen.history import History
-from toxygen.smileys import SmileyLoader
-from toxygen.messages import *
-import toxygen.toxes as encr
-import toxygen.util as util
-import time
 
 
+# TODO: add new tests
+
 class TestTox:
 
     def test_creation(self):
-        name = b'Toxygen User'
+        name = 'Toxygen User'
-        status_message = b'Toxing on Toxygen'
+        status_message = 'Toxing on Toxygen'
         tox = tox_factory()
         tox.self_set_name(name)
         tox.self_set_status_message(status_message)
         data = tox.get_savedata()
         del tox
         tox = tox_factory(data)
-        assert tox.self_get_name() == str(name, 'utf-8')
+        assert tox.self_get_name() == name
-        assert tox.self_get_status_message() == str(status_message, 'utf-8')
+        assert tox.self_get_status_message() == status_message
-
-
-class TestProfileHelper:
-
-    def test_creation(self):
-        file_name, path = 'test.tox', os.path.dirname(os.path.realpath(__file__)) + '/'
-        data = b'test'
-        with open(path + file_name, 'wb') as fl:
-            fl.write(data)
-        ph = ProfileHelper(path, file_name[:4])
-        assert ProfileHelper.get_path() == path
-        assert ph.open_profile() == data
-        assert os.path.exists(path + 'avatars/')
-
-
-class TestDNS:
-
-    def test_dns(self):
-        Settings._instance = Settings.get_default_settings()
-        bot_id = '56A1ADE4B65B86BCD51CC73E2CD4E542179F47959FE3E0E21B4B0ACDADE51855D34D34D37CB5'
-        tox_id = tox_dns('groupbot@toxme.io')
-        assert tox_id == bot_id
-
-    def test_dns2(self):
-        Settings._instance = Settings.get_default_settings()
-        bot_id = '76518406F6A9F2217E8DC487CC783C25CC16A15EB36FF32E335A235342C48A39218F515C39A6'
-        tox_id = tox_dns('echobot@toxme.io')
-        assert tox_id == bot_id
-
-
-class TestEncryption:
-
-    def test_encr_decr(self):
-        tox = tox_factory()
-        data = tox.get_savedata()
-        lib = encr.ToxES()
-        for password in ('easypassword', 'njvnFjfn7vaGGV6', 'toxygen'):
-            lib.set_password(password)
-            copy_data = data[:]
-            new_data = lib.pass_encrypt(data)
-            assert lib.is_data_encrypted(new_data)
-            new_data = lib.pass_decrypt(new_data)
-            assert copy_data == new_data
-
-
-class TestSmileys:
-
-    def test_loading(self):
-        settings = {'smiley_pack': 'default', 'smileys': True}
-        sm = SmileyLoader(settings)
-        assert sm.get_smileys_path() is not None
-        l = sm.get_packs_list()
-        assert len(l) == 4
-
-
-def create_singletons():
-    folder = util.curr_directory() + '/abc'
-    Settings._instance = Settings.get_default_settings()
-    if not os.path.exists(folder):
-        os.makedirs(folder)
-    ProfileHelper(folder, 'test')
-
-
-def create_friend(name, status_message, number, tox_id):
-    friend = Friend(None, number, name, status_message, None, tox_id)
-    return friend
-
-
-def create_random_friend():
-    name, status_message, number = 'Friend', 'I am friend!', 0
-    tox_id = '76518406F6A9F2217E8DC487CC783C25CC16A15EB36FF32E335A235342C48A39218F515C39A6'
-    friend = create_friend(name, status_message, number, tox_id)
-    return friend
-
-
-class TestFriend:
-
-    def test_friend_creation(self):
-        create_singletons()
-        name, status_message, number = 'Friend', 'I am friend!', 0
-        tox_id = '76518406F6A9F2217E8DC487CC783C25CC16A15EB36FF32E335A235342C48A39218F515C39A6'
-        friend = create_friend(name, status_message, number, tox_id)
-        assert friend.name == name
-        assert friend.tox_id == tox_id
-        assert friend.status_message == status_message
-        assert friend.number == number
-
-    def test_friend_corr(self):
-        create_singletons()
-        friend = create_random_friend()
-        t = time.time()
-        friend.append_message(InfoMessage('Info message', t))
-        friend.append_message(TextMessage('Hello! It is test!', MESSAGE_OWNER['ME'], t + 0.001, 0))
-        friend.append_message(TextMessage('Hello!', MESSAGE_OWNER['FRIEND'], t + 0.002, 0))
-        assert friend.get_last_message_text() == 'Hello! It is test!'
-        assert len(friend.get_corr()) == 3
-        assert len(friend.get_corr_for_saving()) == 2
-        friend.append_message(TextMessage('Not sent', MESSAGE_OWNER['NOT_SENT'], t + 0.002, 0))
-        arr = friend.get_unsent_messages_for_saving()
-        assert len(arr) == 1
-        assert arr[0][0] == 'Not sent'
-        tm = TransferMessage(MESSAGE_OWNER['FRIEND'],
-                             time.time(),
-                             TOX_FILE_TRANSFER_STATE['RUNNING'],
-                             100, 'file_name', friend.number, 0)
-        friend.append_message(tm)
-        friend.clear_corr()
-        assert len(friend.get_corr()) == 1
-        assert len(friend.get_corr_for_saving()) == 0
-        friend.append_message(TextMessage('Hello! It is test!', MESSAGE_OWNER['ME'], t, 0))
-        assert len(friend.get_corr()) == 2
-        assert len(friend.get_corr_for_saving()) == 1
-
-    def test_history_search(self):
-        create_singletons()
-        friend = create_random_friend()
-        message = 'Hello! It is test!'
-        friend.append_message(TextMessage(message, MESSAGE_OWNER['ME'], time.time(), 0))
-        last_message = friend.get_last_message_text()
-        assert last_message == message
-        result = friend.search_string('e[m|s]')
-        assert result is not None
-        result = friend.search_string('tox')
-        assert result is None
-
-
-class TestHistory:
-
-    def test_history(self):
-        create_singletons()
-        db_name = 'my_name'
-        name, status_message, number = 'Friend', 'I am friend!', 0
-        tox_id = '76518406F6A9F2217E8DC487CC783C25CC16A15EB36FF32E335A235342C48A39218F515C39A6'
-        friend = create_friend(name, status_message, number, tox_id)
-        history = History(db_name)
-        history.add_friend_to_db(friend.tox_id)
-        assert history.friend_exists_in_db(friend.tox_id)
-        text_message = 'Test!'
-        t = time.time()
-        friend.append_message(TextMessage(text_message, MESSAGE_OWNER['ME'], t, 0))
-        messages = friend.get_corr_for_saving()
-        history.save_messages_to_db(friend.tox_id, messages)
-        getter = history.messages_getter(friend.tox_id)
-        messages = getter.get_all()
-        assert len(messages) == 1
-        assert messages[0][0] == text_message
-        assert messages[0][1] == MESSAGE_OWNER['ME']
-        assert messages[0][-1] == 0
-        history.delete_message(friend.tox_id, t)
-        getter = history.messages_getter(friend.tox_id)
-        messages = getter.get_all()
-        assert len(messages) == 0
-        history.delete_friend_from_db(friend.tox_id)
-        assert not history.friend_exists_in_db(friend.tox_id)

toxygen/app.py

@@ -0,0 +1,424 @@
+from middleware import threads
+import middleware.callbacks as callbacks
+from PyQt5 import QtWidgets, QtGui, QtCore
+import ui.password_screen as password_screen
+import updater.updater as updater
+import os
+from middleware.tox_factory import tox_factory
+import wrapper.toxencryptsave as tox_encrypt_save
+import user_data.toxes
+from user_data.settings import Settings
+from ui.login_screen import LoginScreen
+from user_data.profile_manager import ProfileManager
+from plugin_support.plugin_support import PluginLoader
+from ui.main_screen import MainWindow
+from ui import tray
+import utils.ui as util_ui
+import utils.util as util
+from contacts.profile import Profile
+from file_transfers.file_transfers_handler import FileTransfersHandler
+from contacts.contact_provider import ContactProvider
+from contacts.friend_factory import FriendFactory
+from contacts.group_factory import GroupFactory
+from contacts.contacts_manager import ContactsManager
+from av.calls_manager import CallsManager
+from history.database import Database
+from ui.widgets_factory import WidgetsFactory
+from smileys.smileys import SmileyLoader
+from ui.items_factories import MessagesItemsFactory, ContactItemsFactory
+from messenger.messenger import Messenger
+from network.tox_dns import ToxDns
+from history.history import History
+from file_transfers.file_transfers_messages_service import FileTransfersMessagesService
+from groups.groups_service import GroupsService
+from ui.create_profile_screen import CreateProfileScreen
+from common.provider import Provider
+from contacts.group_peer_factory import GroupPeerFactory
+from user_data.backup_service import BackupService
+import styles.style  # TODO: dynamic loading
+
+
+class App:
+
+    def __init__(self, version, path_to_profile=None, uri=None):
+        self._version = version
+        self._app = self._settings = self._profile_manager = self._plugin_loader = self._messenger = None
+        self._tox = self._ms = self._init = self._main_loop = self._av_loop = None
+        self._uri = self._toxes = self._tray = self._file_transfer_handler = self._contacts_provider = None
+        self._friend_factory = self._calls_manager = self._contacts_manager = self._smiley_loader = None
+        self._group_peer_factory = self._tox_dns = self._backup_service = None
+        self._group_factory = self._groups_service = self._profile = None
+        if uri is not None and uri.startswith('tox:'):
+            self._uri = uri[4:]
+        self._path = path_to_profile
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Public methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def main(self):
+        """
+        Main function of app. loads login screen if needed and starts main screen
+        """
+        self._app = QtWidgets.QApplication([])
+        self._load_icon()
+
+        if util.get_platform() == 'Linux':
+            QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads)
+
+        self._load_base_style()
+
+        if not self._select_and_load_profile():
+            return
+
+        if self._try_to_update():
+            return
+
+        self._load_app_styles()
+        self._load_app_translations()
+
+        self._create_dependencies()
+        self._start_threads()
+
+        if self._uri is not None:
+            self._ms.add_contact(self._uri)
+
+        self._app.lastWindowClosed.connect(self._app.quit)
+
+        self._execute_app()
+
+        self._stop_app()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # App executing
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _execute_app(self):
+        while True:
+            try:
+                self._app.exec_()
+            except Exception as ex:
+                util.log('Unhandled exception: ' + str(ex))
+            else:
+                break
+
+    def _stop_app(self):
+        self._plugin_loader.stop()
+        self._stop_threads()
+        self._file_transfer_handler.stop()
+        self._tray.hide()
+        self._save_profile()
+        self._settings.close()
+        self._kill_toxav()
+        self._kill_tox()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # App loading
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _load_base_style(self):
+        with open(util.join_path(util.get_styles_directory(), 'dark_style.qss')) as fl:
+            style = fl.read()
+        self._app.setStyleSheet(style)
+
+    def _load_app_styles(self):
+        # application color scheme
+        if self._settings['theme'] == 'dark':
+            return
+        for theme in self._settings.built_in_themes().keys():
+            if self._settings['theme'] != theme:
+                continue
+            theme_path = self._settings.built_in_themes()[theme]
+            file_path = util.join_path(util.get_styles_directory(), theme_path)
+            with open(file_path) as fl:
+                style = fl.read()
+            self._app.setStyleSheet(style)
+            break
+
+    def _load_login_screen_translations(self):
+        current_language, supported_languages = self._get_languages()
+        if current_language not in supported_languages:
+            return
+        lang_path = supported_languages[current_language]
+        translator = QtCore.QTranslator()
+        translator.load(util.get_translations_directory() + lang_path)
+        self._app.installTranslator(translator)
+        self._app.translator = translator
+
+    def _load_icon(self):
+        icon_file = os.path.join(util.get_images_directory(), 'icon.png')
+        self._app.setWindowIcon(QtGui.QIcon(icon_file))
+
+    @staticmethod
+    def _get_languages():
+        current_locale = QtCore.QLocale()
+        curr_language = current_locale.languageToString(current_locale.language())
+        supported_languages = Settings.supported_languages()
+
+        return curr_language, supported_languages
+
+    def _load_app_translations(self):
+        lang = Settings.supported_languages()[self._settings['language']]
+        translator = QtCore.QTranslator()
+        translator.load(os.path.join(util.get_translations_directory(), lang))
+        self._app.installTranslator(translator)
+        self._app.translator = translator
+
+    def _select_and_load_profile(self):
+        encrypt_save = tox_encrypt_save.ToxEncryptSave()
+        self._toxes = user_data.toxes.ToxES(encrypt_save)
+
+        if self._path is not None:  # toxygen was started with path to profile
+            self._load_existing_profile(self._path)
+        else:
+            auto_profile = Settings.get_auto_profile()
+            if auto_profile is None:  # no default profile
+                result = self._select_profile()
+                if result is None:
+                    return False
+                if result.is_new_profile():  # create new profile
+                    if not self._create_new_profile(result.profile_path):
+                        return False
+                else:  # load existing profile
+                    self._load_existing_profile(result.profile_path)
+                self._path = result.profile_path
+            else:  # default profile
+                self._path = auto_profile
+                self._load_existing_profile(auto_profile)
+
+        if Settings.is_active_profile(self._path):  # profile is in use
+            profile_name = util.get_profile_name_from_path(self._path)
+            title = util_ui.tr('Profile {}').format(profile_name)
+            text = util_ui.tr(
+                'Other instance of Toxygen uses this profile or profile was not properly closed. Continue?')
+            reply = util_ui.question(text, title)
+            if not reply:
+                return False
+
+        self._settings.set_active_profile()
+
+        return True
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Threads
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _start_threads(self, initial_start=True):
+        # init thread
+        self._init = threads.InitThread(self._tox, self._plugin_loader, self._settings, initial_start)
+        self._init.start()
+
+        # starting threads for tox iterate and toxav iterate
+        self._main_loop = threads.ToxIterateThread(self._tox)
+        self._main_loop.start()
+        self._av_loop = threads.ToxAVIterateThread(self._tox.AV)
+        self._av_loop.start()
+
+        if initial_start:
+            threads.start_file_transfer_thread()
+
+    def _stop_threads(self, is_app_closing=True):
+        self._init.stop_thread()
+
+        self._av_loop.stop_thread()
+        self._main_loop.stop_thread()
+
+        if is_app_closing:
+            threads.stop_file_transfer_thread()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Profiles
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _select_profile(self):
+        self._load_login_screen_translations()
+        ls = LoginScreen()
+        profiles = ProfileManager.find_profiles()
+        ls.update_select(profiles)
+        ls.show()
+        self._app.exec_()
+
+        return ls.result
+
+    def _load_existing_profile(self, profile_path):
+        self._profile_manager = ProfileManager(self._toxes, profile_path)
+        data = self._profile_manager.open_profile()
+        if self._toxes.is_data_encrypted(data):
+            data = self._enter_password(data)
+        self._settings = Settings(self._toxes, profile_path.replace('.tox', '.json'))
+        self._tox = self._create_tox(data)
+
+    def _create_new_profile(self, profile_name):
+        result = self._get_create_profile_screen_result()
+        if result is None:
+            return False
+        if result.save_into_default_folder:
+            profile_path = util.join_path(Settings.get_default_path(), profile_name + '.tox')
+        else:
+            profile_path = util.join_path(util.curr_directory(__file__), profile_name + '.tox')
+        if os.path.isfile(profile_path):
+            util_ui.message_box(util_ui.tr('Profile with this name already exists'),
+                                util_ui.tr('Error'))
+            return False
+        name = profile_name or 'toxygen_user'
+        self._tox = tox_factory()
+        self._tox.self_set_name(name if name else 'Toxygen User')
+        self._tox.self_set_status_message('Toxing on Toxygen')
+        self._path = profile_path
+        if result.password:
+            self._toxes.set_password(result.password)
+        self._settings = Settings(self._toxes, self._path.replace('.tox', '.json'))
+        self._profile_manager = ProfileManager(self._toxes, profile_path)
+        try:
+            self._save_profile()
+        except Exception as ex:
+            print(ex)
+            util.log('Profile creation exception: ' + str(ex))
+            text = util_ui.tr('Profile saving error! Does Toxygen have permission to write to this directory?')
+            util_ui.message_box(text, util_ui.tr('Error'))
+
+            return False
+        current_language, supported_languages = self._get_languages()
+        if current_language in supported_languages:
+            self._settings['language'] = current_language
+        self._settings.save()
+
+        return True
+
+    def _get_create_profile_screen_result(self):
+        cps = CreateProfileScreen()
+        cps.show()
+        self._app.exec_()
+
+        return cps.result
+
+    def _save_profile(self, data=None):
+        data = data or self._tox.get_savedata()
+        self._profile_manager.save_profile(data)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Other private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _enter_password(self, data):
+        """
+        Show password screen
+        """
+        p = password_screen.PasswordScreen(self._toxes, data)
+        p.show()
+        self._app.lastWindowClosed.connect(self._app.quit)
+        self._app.exec_()
+        if p.result is not None:
+            return p.result
+        self._force_exit()
+
+    def _reset(self):
+        """
+        Create new tox instance (new network settings)
+        :return: tox instance
+        """
+        self._contacts_manager.reset_contacts_statuses()
+        self._stop_threads(False)
+        data = self._tox.get_savedata()
+        self._save_profile(data)
+        self._kill_toxav()
+        self._kill_tox()
+        # create new tox instance
+        self._tox = self._create_tox(data)
+        self._start_threads(False)
+
+        tox_savers = [self._friend_factory, self._group_factory, self._plugin_loader, self._contacts_manager,
+                      self._contacts_provider, self._messenger, self._file_transfer_handler, self._groups_service,
+                      self._profile]
+        for tox_saver in tox_savers:
+            tox_saver.set_tox(self._tox)
+
+        self._calls_manager.set_toxav(self._tox.AV)
+        self._contacts_manager.update_friends_numbers()
+        self._contacts_manager.update_groups_lists()
+        self._contacts_manager.update_groups_numbers()
+
+        self._init_callbacks()
+
+    def _create_dependencies(self):
+        self._backup_service = BackupService(self._settings, self._profile_manager)
+        self._smiley_loader = SmileyLoader(self._settings)
+        self._tox_dns = ToxDns(self._settings)
+        self._ms = MainWindow(self._settings, self._tray)
+        db = Database(self._path.replace('.tox', '.db'), self._toxes)
+
+        contact_items_factory = ContactItemsFactory(self._settings, self._ms)
+        self._friend_factory = FriendFactory(self._profile_manager, self._settings,
+                                             self._tox, db, contact_items_factory)
+        self._group_factory = GroupFactory(self._profile_manager, self._settings, self._tox, db, contact_items_factory)
+        self._group_peer_factory = GroupPeerFactory(self._tox, self._profile_manager, db, contact_items_factory)
+        self._contacts_provider = ContactProvider(self._tox, self._friend_factory, self._group_factory,
+                                                  self._group_peer_factory)
+        self._profile = Profile(self._profile_manager, self._tox, self._ms, self._contacts_provider, self._reset)
+        self._init_profile()
+        self._plugin_loader = PluginLoader(self._settings, self)
+        history = None
+        messages_items_factory = MessagesItemsFactory(self._settings, self._plugin_loader, self._smiley_loader,
+                                                      self._ms, lambda m: history.delete_message(m))
+        history = History(self._contacts_provider, db, self._settings, self._ms, messages_items_factory)
+        self._contacts_manager = ContactsManager(self._tox, self._settings, self._ms, self._profile_manager,
+                                                 self._contacts_provider, history, self._tox_dns,
+                                                 messages_items_factory)
+        history.set_contacts_manager(self._contacts_manager)
+        self._calls_manager = CallsManager(self._tox.AV, self._settings, self._ms, self._contacts_manager)
+        self._messenger = Messenger(self._tox, self._plugin_loader, self._ms, self._contacts_manager,
+                                    self._contacts_provider, messages_items_factory, self._profile,
+                                    self._calls_manager)
+        file_transfers_message_service = FileTransfersMessagesService(self._contacts_manager, messages_items_factory,
+                                                                      self._profile, self._ms)
+        self._file_transfer_handler = FileTransfersHandler(self._tox, self._settings, self._contacts_provider,
+                                                           file_transfers_message_service, self._profile)
+        messages_items_factory.set_file_transfers_handler(self._file_transfer_handler)
+        widgets_factory = None
+        widgets_factory_provider = Provider(lambda: widgets_factory)
+        self._groups_service = GroupsService(self._tox, self._contacts_manager, self._contacts_provider, self._ms,
+                                             widgets_factory_provider)
+        widgets_factory = WidgetsFactory(self._settings, self._profile, self._profile_manager, self._contacts_manager,
+                                         self._file_transfer_handler, self._smiley_loader, self._plugin_loader,
+                                         self._toxes, self._version, self._groups_service, history,
+                                         self._contacts_provider)
+        self._tray = tray.init_tray(self._profile, self._settings, self._ms, self._toxes)
+        self._ms.set_dependencies(widgets_factory, self._tray, self._contacts_manager, self._messenger, self._profile,
+                                  self._plugin_loader, self._file_transfer_handler, history, self._calls_manager,
+                                  self._groups_service, self._toxes)
+
+        self._tray.show()
+        self._ms.show()
+
+        self._init_callbacks()
+
+    def _try_to_update(self):
+        updating = updater.start_update_if_needed(self._version, self._settings)
+        if updating:
+            self._save_profile()
+            self._settings.close()
+            self._kill_toxav()
+            self._kill_tox()
+        return updating
+
+    def _create_tox(self, data):
+        return tox_factory(data, self._settings)
+
+    def _force_exit(self):
+        raise SystemExit()
+
+    def _init_callbacks(self):
+        callbacks.init_callbacks(self._tox, self._profile, self._settings, self._plugin_loader, self._contacts_manager,
+                                 self._calls_manager, self._file_transfer_handler, self._ms, self._tray,
+                                 self._messenger, self._groups_service, self._contacts_provider)
+
+    def _init_profile(self):
+        if not self._profile.has_avatar():
+            self._profile.reset_avatar(self._settings['identicons'])
+
+    def _kill_toxav(self):
+        self._calls_manager.set_toxav(None)
+        self._tox.AV.kill()
+
+    def _kill_tox(self):
+        self._tox.kill()

toxygen/av/call.py

@@ -0,0 +1,58 @@
+
+
+class Call:
+
+    def __init__(self, out_audio, out_video, in_audio=False, in_video=False):
+        self._in_audio = in_audio
+        self._in_video = in_video
+        self._out_audio = out_audio
+        self._out_video = out_video
+        self._is_active = False
+
+    def get_is_active(self):
+        return self._is_active
+
+    def set_is_active(self, value):
+        self._is_active = value
+
+    is_active = property(get_is_active, set_is_active)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Audio
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_in_audio(self):
+        return self._in_audio
+
+    def set_in_audio(self, value):
+        self._in_audio = value
+
+    in_audio = property(get_in_audio, set_in_audio)
+
+    def get_out_audio(self):
+        return self._out_audio
+
+    def set_out_audio(self, value):
+        self._out_audio = value
+
+    out_audio = property(get_out_audio, set_out_audio)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Video
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_in_video(self):
+        return self._in_video
+
+    def set_in_video(self, value):
+        self._in_video = value
+
+    in_video = property(get_in_video, set_in_video)
+
+    def get_out_video(self):
+        return self._out_video
+
+    def set_out_video(self, value):
+        self._out_video = value
+
+    out_video = property(get_out_video, set_out_video)

toxygen/av/calls.py

@@ -1,77 +1,20 @@
 import pyaudio
 import time
 import threading
-import settings
+from wrapper.toxav_enums import *
-from toxav_enums import *
 import cv2
 import itertools
 import numpy as np
-import screen_sharing
+from av import screen_sharing
-# TODO: play sound until outgoing call will be started or cancelled
+from av.call import Call
+import common.tox_save
 
 
-class Call:
+class AV(common.tox_save.ToxAvSave):
 
-    def __init__(self, out_audio, out_video, in_audio=False, in_video=False):
+    def __init__(self, toxav, settings):
-        self._in_audio = in_audio
+        super().__init__(toxav)
-        self._in_video = in_video
+        self._settings = settings
-        self._out_audio = out_audio
-        self._out_video = out_video
-        self._is_active = False
-
-    def get_is_active(self):
-        return self._is_active
-
-    def set_is_active(self, value):
-        self._is_active = value
-
-    is_active = property(get_is_active, set_is_active)
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Audio
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def get_in_audio(self):
-        return self._in_audio
-
-    def set_in_audio(self, value):
-        self._in_audio = value
-
-    in_audio = property(get_in_audio, set_in_audio)
-
-    def get_out_audio(self):
-        return self._out_audio
-
-    def set_out_audio(self, value):
-        self._out_audio = value
-
-    out_audio = property(get_out_audio, set_out_audio)
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Video
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def get_in_video(self):
-        return self._in_video
-
-    def set_in_video(self, value):
-        self._in_video = value
-
-    in_video = property(get_in_video, set_in_video)
-
-    def get_out_video(self):
-        return self._out_video
-
-    def set_out_video(self, value):
-        self._out_video = value
-
-    out_video = property(get_out_video, set_out_video)
-
-
-class AV:
-
-    def __init__(self, toxav):
-        self._toxav = toxav
         self._running = True
 
         self._calls = {}  # dict: key - friend number, value - Call instance
@@ -174,7 +117,7 @@ class AV:
                                               rate=self._audio_rate,
                                               channels=self._audio_channels,
                                               input=True,
-                                              input_device_index=settings.Settings.get_instance().audio['input'],
+                                              input_device_index=self._settings.audio['input'],
                                               frames_per_buffer=self._audio_sample_count * 10)
 
         self._audio_thread = threading.Thread(target=self.send_audio)
@@ -203,15 +146,14 @@ class AV:
             return
 
         self._video_running = True
-        s = settings.Settings.get_instance()
         self._video_width = s.video['width']
         self._video_height = s.video['height']
 
         if s.video['device'] == -1:
-            self._video = screen_sharing.DesktopGrabber(s.video['x'], s.video['y'],
+            self._video = screen_sharing.DesktopGrabber(self._settings.video['x'], self._settings.video['y'],
-                                                        s.video['width'], s.video['height'])
+                                                        self._settings.video['width'], self._settings.video['height'])
         else:
-            self._video = cv2.VideoCapture(s.video['device'])
+            self._video = cv2.VideoCapture(self._settings.video['device'])
             self._video.set(cv2.CAP_PROP_FPS, 25)
             self._video.set(cv2.CAP_PROP_FRAME_WIDTH, self._video_width)
             self._video.set(cv2.CAP_PROP_FRAME_HEIGHT, self._video_height)
@@ -241,7 +183,7 @@ class AV:
             self._out_stream = self._audio.open(format=pyaudio.paInt16,
                                                 channels=channels_count,
                                                 rate=rate,
-                                                output_device_index=settings.Settings.get_instance().audio['output'],
+                                                output_device_index=self._settings.audio['output'],
                                                 output=True)
         self._out_stream.write(samples)
 

toxygen/av/calls_manager.py

@@ -0,0 +1,116 @@
+import threading
+import cv2
+import av.calls
+from messenger.messages import *
+from ui import av_widgets
+import common.event as event
+
+
+class CallsManager:
+
+    def __init__(self, toxav, settings, screen, contacts_manager):
+        self._call = av.calls.AV(toxav, settings)  # object with data about calls
+        self._call_widgets = {}  # dict of incoming call widgets
+        self._incoming_calls = set()
+        self._settings = settings
+        self._screen = screen
+        self._contacts_manager = contacts_manager
+        self._call_started_event = event.Event()  # friend_number, audio, video, is_outgoing
+        self._call_finished_event = event.Event()  # friend_number, is_declined
+
+    def set_toxav(self, toxav):
+        self._call.set_toxav(toxav)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Events
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_call_started_event(self):
+        return self._call_started_event
+
+    call_started_event = property(get_call_started_event)
+
+    def get_call_finished_event(self):
+        return self._call_finished_event
+
+    call_finished_event = property(get_call_finished_event)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # AV support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def call_click(self, audio=True, video=False):
+        """User clicked audio button in main window"""
+        num = self._contacts_manager.get_active_number()
+        if not self._contacts_manager.is_active_a_friend():
+            return
+        if num not in self._call and self._contacts_manager.is_active_online():  # start call
+            if not self._settings.audio['enabled']:
+                return
+            self._call(num, audio, video)
+            self._screen.active_call()
+            self._call_started_event(num, audio, video, True)
+        elif num in self._call:  # finish or cancel call if you call with active friend
+            self.stop_call(num, False)
+
+    def incoming_call(self, audio, video, friend_number):
+        """
+        Incoming call from friend.
+        """
+        if not self._settings.audio['enabled']:
+            return
+        friend = self._contacts_manager.get_friend_by_number(friend_number)
+        self._call_started_event(friend_number, audio, video, False)
+        self._incoming_calls.add(friend_number)
+        if friend_number == self._contacts_manager.get_active_number():
+            self._screen.incoming_call()
+        else:
+            friend.actions = True
+        text = util_ui.tr("Incoming video call") if video else util_ui.tr("Incoming audio call")
+        self._call_widgets[friend_number] = self._get_incoming_call_widget(friend_number, text, friend.name)
+        self._call_widgets[friend_number].set_pixmap(friend.get_pixmap())
+        self._call_widgets[friend_number].show()
+
+    def accept_call(self, friend_number, audio, video):
+        """
+        Accept incoming call with audio or video
+        """
+        self._call.accept_call(friend_number, audio, video)
+        self._screen.active_call()
+        if friend_number in self._incoming_calls:
+            self._incoming_calls.remove(friend_number)
+        del self._call_widgets[friend_number]
+
+    def stop_call(self, friend_number, by_friend):
+        """
+        Stop call with friend
+        """
+        if friend_number in self._incoming_calls:
+            self._incoming_calls.remove(friend_number)
+            is_declined = True
+        else:
+            is_declined = False
+        self._screen.call_finished()
+        is_video = self._call.is_video_call(friend_number)
+        self._call.finish_call(friend_number, by_friend)  # finish or decline call
+        if friend_number in self._call_widgets:
+            self._call_widgets[friend_number].close()
+            del self._call_widgets[friend_number]
+
+        def destroy_window():
+            if is_video:
+                cv2.destroyWindow(str(friend_number))
+
+        threading.Timer(2.0, destroy_window).start()
+        self._call_finished_event(friend_number, is_declined)
+
+    def friend_exit(self, friend_number):
+        if friend_number in self._call:
+            self._call.finish_call(friend_number, True)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _get_incoming_call_widget(self, friend_number, text, friend_name):
+        return av_widgets.IncomingCallWidget(self._settings, self, friend_number, text, friend_name)

toxygen/bootstrap/bootstrap.py

@@ -1,11 +1,13 @@
 import random
 import urllib.request
-from util import log, curr_directory
+from utils.util import *
-import settings
 from PyQt5 import QtNetwork, QtCore
 import json
 
 
+DEFAULT_NODES_COUNT = 4
+
+
 class Node:
 
     def __init__(self, node):
@@ -18,48 +20,42 @@ class Node:
     priority = property(get_priority)
 
     def get_data(self):
-        return bytes(self._ip, 'utf-8'), self._port, self._tox_key
+        return self._ip, self._port, self._tox_key
 
 
-def generate_nodes():
+def generate_nodes(nodes_count=DEFAULT_NODES_COUNT):
-    with open(curr_directory() + '/nodes.json', 'rt') as fl:
+    with open(_get_nodes_path(), 'rt') as fl:
         json_nodes = json.loads(fl.read())['nodes']
     nodes = map(lambda json_node: Node(json_node), json_nodes)
-    sorted_nodes = sorted(nodes, key=lambda x: x.priority)[-4:]
+    nodes = filter(lambda n: n.priority > 0, nodes)
+    sorted_nodes = sorted(nodes, key=lambda x: x.priority)
+    if nodes_count is not None:
+        sorted_nodes = sorted_nodes[-DEFAULT_NODES_COUNT:]
     for node in sorted_nodes:
         yield node.get_data()
 
 
-def save_nodes(nodes):
+def download_nodes_list(settings):
-    if not nodes:
-        return
-    print('Saving nodes...')
-    with open(curr_directory() + '/nodes.json', 'wb') as fl:
-        fl.write(nodes)
-
-
-def download_nodes_list():
     url = 'https://nodes.tox.chat/json'
-    s = settings.Settings.get_instance()
+    if not settings['download_nodes_list']:
-    if not s['download_nodes_list']:
         return
 
-    if not s['proxy_type']:  # no proxy
+    if not settings['proxy_type']:  # no proxy
         try:
             req = urllib.request.Request(url)
             req.add_header('Content-Type', 'application/json')
             response = urllib.request.urlopen(req)
             result = response.read()
-            save_nodes(result)
+            _save_nodes(result)
         except Exception as ex:
             log('TOX nodes loading error: ' + str(ex))
     else:  # proxy
         netman = QtNetwork.QNetworkAccessManager()
         proxy = QtNetwork.QNetworkProxy()
         proxy.setType(
-            QtNetwork.QNetworkProxy.Socks5Proxy if s['proxy_type'] == 2 else QtNetwork.QNetworkProxy.HttpProxy)
+            QtNetwork.QNetworkProxy.Socks5Proxy if settings['proxy_type'] == 2 else QtNetwork.QNetworkProxy.HttpProxy)
-        proxy.setHostName(s['proxy_host'])
+        proxy.setHostName(settings['proxy_host'])
-        proxy.setPort(s['proxy_port'])
+        proxy.setPort(settings['proxy_port'])
         netman.setProxy(proxy)
         try:
             request = QtNetwork.QNetworkRequest()
@@ -70,6 +66,18 @@ def download_nodes_list():
                 QtCore.QThread.msleep(1)
                 QtCore.QCoreApplication.processEvents()
             data = bytes(reply.readAll().data())
-            save_nodes(data)
+            _save_nodes(data)
         except Exception as ex:
             log('TOX nodes loading error: ' + str(ex))
+
+
+def _get_nodes_path():
+    return join_path(curr_directory(__file__), 'nodes.json')
+
+
+def _save_nodes(nodes):
+    if not nodes:
+        return
+    print('Saving nodes...')
+    with open(_get_nodes_path(), 'wb') as fl:
+        fl.write(nodes)

toxygen/bootstrap/nodes.json

@@ -0,0 +1 @@
+{"nodes":[{"ipv4":"80.211.19.83","ipv6":"-","port":33445,"public_key":"A2D7BF17C10A12C339B9F4E8DD77DEEE8457D580535A6F0D0F9AF04B8B4C4420","status_udp":true,"status_tcp":true}]}

toxygen/callbacks.py

@@ -1,469 +0,0 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
-from notifications import *
-from settings import Settings
-from profile import Profile
-from toxcore_enums_and_consts import *
-from toxav_enums import *
-from tox import bin_to_string
-from plugin_support import PluginLoader
-import queue
-import threading
-import util
-import cv2
-import numpy as np
-
-# -----------------------------------------------------------------------------------------------------------------
-# Threads
-# -----------------------------------------------------------------------------------------------------------------
-
-
-class InvokeEvent(QtCore.QEvent):
-    EVENT_TYPE = QtCore.QEvent.Type(QtCore.QEvent.registerEventType())
-
-    def __init__(self, fn, *args, **kwargs):
-        QtCore.QEvent.__init__(self, InvokeEvent.EVENT_TYPE)
-        self.fn = fn
-        self.args = args
-        self.kwargs = kwargs
-
-
-class Invoker(QtCore.QObject):
-
-    def event(self, event):
-        event.fn(*event.args, **event.kwargs)
-        return True
-
-
-_invoker = Invoker()
-
-
-def invoke_in_main_thread(fn, *args, **kwargs):
-    QtCore.QCoreApplication.postEvent(_invoker, InvokeEvent(fn, *args, **kwargs))
-
-
-class FileTransfersThread(threading.Thread):
-
-    def __init__(self):
-        self._queue = queue.Queue()
-        self._timeout = 0.01
-        self._continue = True
-        super().__init__()
-
-    def execute(self, function, *args, **kwargs):
-        self._queue.put((function, args, kwargs))
-
-    def stop(self):
-        self._continue = False
-
-    def run(self):
-        while self._continue:
-            try:
-                function, args, kwargs = self._queue.get(timeout=self._timeout)
-                function(*args, **kwargs)
-            except queue.Empty:
-                pass
-            except queue.Full:
-                util.log('Queue is Full in _thread')
-            except Exception as ex:
-                util.log('Exception in _thread: ' + str(ex))
-
-
-_thread = FileTransfersThread()
-
-
-def start():
-    _thread.start()
-
-
-def stop():
-    _thread.stop()
-    _thread.join()
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - current user
-# -----------------------------------------------------------------------------------------------------------------
-
-
-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))
-        profile = Profile.get_instance()
-        if profile.status is None:
-            status = tox_link.self_get_status()
-            invoke_in_main_thread(profile.set_status, status)
-        elif connection == TOX_CONNECTION['NONE']:
-            invoke_in_main_thread(profile.set_status, None)
-    return wrapped
-
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - friends
-# -----------------------------------------------------------------------------------------------------------------
-
-
-def friend_status(tox, friend_num, new_status, user_data):
-    """
-    Check friend's status (none, busy, away)
-    """
-    print("Friend's #{} status changed!".format(friend_num))
-    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']:
-        sound_notification(SOUND_NOTIFICATION['FRIEND_CONNECTION_STATUS'])
-    invoke_in_main_thread(friend.set_status, new_status)
-    invoke_in_main_thread(QtCore.QTimer.singleShot, 5000, lambda: profile.send_files(friend_num))
-    invoke_in_main_thread(profile.update_filtration)
-
-
-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))
-    profile = Profile.get_instance()
-    friend = profile.get_friend_by_number(friend_num)
-    if new_status == TOX_CONNECTION['NONE']:
-        invoke_in_main_thread(profile.friend_exit, friend_num)
-        invoke_in_main_thread(profile.update_filtration)
-        if Settings.get_instance()['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
-            sound_notification(SOUND_NOTIFICATION['FRIEND_CONNECTION_STATUS'])
-    elif friend.status is None:
-        invoke_in_main_thread(profile.send_avatar, friend_num)
-        invoke_in_main_thread(PluginLoader.get_instance().friend_online, friend_num)
-
-
-def friend_name(tox, friend_num, name, size, user_data):
-    """
-    Friend changed his name
-    """
-    profile = Profile.get_instance()
-    print('New name friend #' + str(friend_num))
-    invoke_in_main_thread(profile.new_name, friend_num, name)
-
-
-def friend_status_message(tox, friend_num, status_message, size, user_data):
-    """
-    :return: function for callback friend_status_message. It updates friend's status message
-    and calls window repaint
-    """
-    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))
-    invoke_in_main_thread(profile.send_messages, friend_num)
-    if profile.get_active_number() == friend_num:
-        invoke_in_main_thread(profile.set_active)
-
-
-def friend_message(window, tray):
-    """
-    New message from friend
-    """
-    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'] and not settings.locked:
-                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'))
-    return wrapped
-
-
-def friend_request(tox, public_key, message, message_size, user_data):
-    """
-    Called when user get new 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, str(message, 'utf-8'))
-
-
-def friend_typing(tox, friend_number, typing, user_data):
-    invoke_in_main_thread(Profile.get_instance().friend_typing, friend_number, typing)
-
-
-def friend_read_receipt(tox, friend_number, message_id, user_data):
-    profile = Profile.get_instance()
-    profile.get_friend_by_number(friend_number).dec_receipt()
-    if friend_number == profile.get_active_number():
-        invoke_in_main_thread(profile.receipt)
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - file transfers
-# -----------------------------------------------------------------------------------------------------------------
-
-
-def tox_file_recv(window, tray):
-    """
-    New incoming file
-    """
-    def wrapped(tox, friend_number, file_number, file_type, size, file_name, file_name_size, user_data):
-        profile = Profile.get_instance()
-        settings = Settings.get_instance()
-        if file_type == TOX_FILE_KIND['DATA']:
-            print('File')
-            try:
-                file_name = str(file_name[:file_name_size], 'utf-8')
-            except:
-                file_name = 'toxygen_file'
-            invoke_in_main_thread(profile.incoming_file_transfer,
-                                  friend_number,
-                                  file_number,
-                                  size,
-                                  file_name)
-            if not window.isActiveWindow():
-                friend = profile.get_friend_by_number(friend_number)
-                if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
-                    file_from = QtWidgets.QApplication.translate("Callback", "File from")
-                    invoke_in_main_thread(tray_notification, file_from + ' ' + friend.name, file_name, tray, window)
-                if settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
-                    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')
-            invoke_in_main_thread(profile.incoming_avatar,
-                                  friend_number,
-                                  file_number,
-                                  size)
-    return wrapped
-
-
-def file_recv_chunk(tox, friend_number, file_number, position, chunk, length, user_data):
-    """
-    Incoming chunk
-    """
-    _thread.execute(Profile.get_instance().incoming_chunk, friend_number, file_number, position,
-                    chunk[:length] if length else None)
-
-
-def file_chunk_request(tox, friend_number, file_number, position, size, user_data):
-    """
-    Outgoing chunk
-    """
-    Profile.get_instance().outgoing_chunk(friend_number, file_number, position, size)
-
-
-def file_recv_control(tox, friend_number, file_number, file_control, user_data):
-    """
-    Friend cancelled, paused or resumed file transfer
-    """
-    if file_control == TOX_FILE_CONTROL['CANCEL']:
-        invoke_in_main_thread(Profile.get_instance().cancel_transfer, friend_number, file_number, True)
-    elif file_control == TOX_FILE_CONTROL['PAUSE']:
-        invoke_in_main_thread(Profile.get_instance().pause_transfer, friend_number, file_number, True)
-    elif file_control == TOX_FILE_CONTROL['RESUME']:
-        invoke_in_main_thread(Profile.get_instance().resume_transfer, friend_number, file_number, True)
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - custom packets
-# -----------------------------------------------------------------------------------------------------------------
-
-
-def lossless_packet(tox, friend_number, data, length, user_data):
-    """
-    Incoming lossless packet
-    """
-    data = data[:length]
-    plugin = PluginLoader.get_instance()
-    invoke_in_main_thread(plugin.callback_lossless, friend_number, data)
-
-
-def lossy_packet(tox, friend_number, data, length, user_data):
-    """
-    Incoming lossy packet
-    """
-    data = data[:length]
-    plugin = PluginLoader.get_instance()
-    invoke_in_main_thread(plugin.callback_lossy, friend_number, data)
-
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - audio
-# -----------------------------------------------------------------------------------------------------------------
-
-def call_state(toxav, friend_number, mask, user_data):
-    """
-    New call state
-    """
-    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:
-        Profile.get_instance().call.toxav_call_state_cb(friend_number, mask)
-
-
-def call(toxav, friend_number, audio, video, user_data):
-    """
-    Incoming call from friend
-    """
-    print(friend_number, audio, video)
-    invoke_in_main_thread(Profile.get_instance().incoming_call, audio, video, friend_number)
-
-
-def callback_audio(toxav, friend_number, samples, audio_samples_per_channel, audio_channels_count, rate, user_data):
-    """
-    New audio chunk
-    """
-    Profile.get_instance().call.audio_chunk(
-        bytes(samples[:audio_samples_per_channel * 2 * audio_channels_count]),
-        audio_channels_count,
-        rate)
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - video
-# -----------------------------------------------------------------------------------------------------------------
-
-
-def video_receive_frame(toxav, friend_number, width, height, y, u, v, ystride, ustride, vstride, user_data):
-    """
-    Creates yuv frame from y, u, v and shows it using OpenCV
-    For yuv => bgr we need this YUV420 frame:
-
-              width
-    -------------------------
-    |                       |
-    |          Y            |      height
-    |                       |
-    -------------------------
-    |           |           |
-    |  U even   |   U odd   |      height // 4
-    |           |           |
-    -------------------------
-    |           |           |
-    |  V even   |   V odd   |      height // 4
-    |           |           |
-    -------------------------
-
-     width // 2   width // 2
-
-    It can be created from initial y, u, v using slices
-    """
-    try:
-        y_size = abs(max(width, abs(ystride)))
-        u_size = abs(max(width // 2, abs(ustride)))
-        v_size = abs(max(width // 2, abs(vstride)))
-
-        y = np.asarray(y[:y_size * height], dtype=np.uint8).reshape(height, y_size)
-        u = np.asarray(u[:u_size * height // 2], dtype=np.uint8).reshape(height // 2, u_size)
-        v = np.asarray(v[:v_size * height // 2], dtype=np.uint8).reshape(height // 2, v_size)
-
-        width -= width % 4
-        height -= height % 4
-
-        frame = np.zeros((int(height * 1.5), width), dtype=np.uint8)
-
-        frame[:height, :] = y[:height, :width]
-        frame[height:height * 5 // 4, :width // 2] = u[:height // 2:2, :width // 2]
-        frame[height:height * 5 // 4, width // 2:] = u[1:height // 2:2, :width // 2]
-
-        frame[height * 5 // 4:, :width // 2] = v[:height // 2:2, :width // 2]
-        frame[height * 5 // 4:, width // 2:] = v[1:height // 2:2, :width // 2]
-
-        frame = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)
-
-        invoke_in_main_thread(cv2.imshow, str(friend_number), frame)
-    except Exception as ex:
-        print(ex)
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - groups
-# -----------------------------------------------------------------------------------------------------------------
-
-
-def group_invite(tox, friend_number, gc_type, data, length,  user_data):
-    invoke_in_main_thread(Profile.get_instance().group_invite, friend_number, gc_type,
-                          bytes(data[:length]))
-
-
-def show_gc_notification(window, tray, message, group_number, peer_number):
-    profile = Profile.get_instance()
-    settings = Settings.get_instance()
-    chat = profile.get_group_by_number(group_number)
-    peer_name = chat.get_peer_name(peer_number)
-    if not window.isActiveWindow() and (profile.name in message or settings['group_notifications']):
-        if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
-            invoke_in_main_thread(tray_notification, chat.name + ' ' + peer_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'))
-
-
-def group_message(window, tray):
-    def wrapped(tox, group_number, peer_number, message, length, user_data):
-        message = str(message[:length], 'utf-8')
-        invoke_in_main_thread(Profile.get_instance().new_gc_message, group_number,
-                              peer_number, TOX_MESSAGE_TYPE['NORMAL'], message)
-        show_gc_notification(window, tray, message, group_number, peer_number)
-    return wrapped
-
-
-def group_action(window, tray):
-    def wrapped(tox, group_number, peer_number, message, length, user_data):
-        message = str(message[:length], 'utf-8')
-        invoke_in_main_thread(Profile.get_instance().new_gc_message, group_number,
-                              peer_number, TOX_MESSAGE_TYPE['ACTION'], message)
-        show_gc_notification(window, tray, message, group_number, peer_number)
-    return wrapped
-
-
-def group_title(tox, group_number, peer_number, title, length, user_data):
-    invoke_in_main_thread(Profile.get_instance().new_gc_title, group_number,
-                          title[:length])
-
-
-def group_namelist_change(tox, group_number, peer_number, change, user_data):
-    invoke_in_main_thread(Profile.get_instance().update_gc, group_number)
-
-# -----------------------------------------------------------------------------------------------------------------
-# Callbacks - initialization
-# -----------------------------------------------------------------------------------------------------------------
-
-
-def init_callbacks(tox, window, tray):
-    """
-    Initialization of all callbacks.
-    :param tox: tox instance
-    :param window: main window
-    :param tray: tray (for notifications)
-    """
-    tox.callback_self_connection_status(self_connection_status(tox), 0)
-
-    tox.callback_friend_status(friend_status, 0)
-    tox.callback_friend_message(friend_message(window, tray), 0)
-    tox.callback_friend_connection_status(friend_connection_status, 0)
-    tox.callback_friend_name(friend_name, 0)
-    tox.callback_friend_status_message(friend_status_message, 0)
-    tox.callback_friend_request(friend_request, 0)
-    tox.callback_friend_typing(friend_typing, 0)
-    tox.callback_friend_read_receipt(friend_read_receipt, 0)
-
-    tox.callback_file_recv(tox_file_recv(window, tray), 0)
-    tox.callback_file_recv_chunk(file_recv_chunk, 0)
-    tox.callback_file_chunk_request(file_chunk_request, 0)
-    tox.callback_file_recv_control(file_recv_control, 0)
-
-    toxav = tox.AV
-    toxav.callback_call_state(call_state, 0)
-    toxav.callback_call(call, 0)
-    toxav.callback_audio_receive_frame(callback_audio, 0)
-    toxav.callback_video_receive_frame(video_receive_frame, 0)
-
-    tox.callback_friend_lossless_packet(lossless_packet, 0)
-    tox.callback_friend_lossy_packet(lossy_packet, 0)
-
-    tox.callback_group_invite(group_invite)
-    tox.callback_group_message(group_message(window, tray))
-    tox.callback_group_action(group_action(window, tray))
-    tox.callback_group_title(group_title)
-    tox.callback_group_namelist_change(group_namelist_change)

toxygen/common/event.py

@@ -0,0 +1,26 @@
+
+
+class Event:
+
+    def __init__(self):
+        self._callbacks = set()
+
+    def __iadd__(self, callback):
+        self.add_callback(callback)
+
+        return self
+
+    def __isub__(self, callback):
+        self.remove_callback(callback)
+
+        return self
+
+    def __call__(self, *args, **kwargs):
+        for callback in self._callbacks:
+            callback(*args, **kwargs)
+
+    def add_callback(self, callback):
+        self._callbacks.add(callback)
+
+    def remove_callback(self, callback):
+        self._callbacks.discard(callback)

toxygen/common/provider.py

@@ -0,0 +1,13 @@
+
+
+class Provider:
+
+    def __init__(self, get_item_action):
+        self._get_item_action = get_item_action
+        self._item = None
+
+    def get_item(self):
+        if self._item is None:
+            self._item = self._get_item_action()
+
+        return self._item

toxygen/common/tox_save.py

@@ -0,0 +1,18 @@
+
+
+class ToxSave:
+
+    def __init__(self, tox):
+        self._tox = tox
+
+    def set_tox(self, tox):
+        self._tox = tox
+
+
+class ToxAvSave:
+
+    def __init__(self, toxav):
+        self._toxav = toxav
+
+    def set_toxav(self, toxav):
+        self._toxav = toxav

toxygen/contacts/basecontact.py

@@ -1,6 +1,9 @@
-from settings import *
+from user_data.settings import *
 from PyQt5 import QtCore, QtGui
-from toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE
+from wrapper.toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE
+import utils.util as util
+import common.event as event
+import contacts.common as common
 
 
 class BaseContact:
@@ -11,16 +14,21 @@ class BaseContact:
     Base class for all contacts.
     """
 
-    def __init__(self, name, status_message, widget, tox_id):
+    def __init__(self, profile_manager, name, status_message, widget, tox_id):
         """
         :param name: name, example: 'Toxygen user'
         :param status_message: status message, example: 'Toxing on Toxygen'
         :param widget: ContactItem instance
         :param tox_id: tox id of contact
         """
+        self._profile_manager = profile_manager
         self._name, self._status_message = name, status_message
         self._status, self._widget = None, widget
         self._tox_id = tox_id
+        self._name_changed_event = event.Event()
+        self._status_message_changed_event = event.Event()
+        self._status_changed_event = event.Event()
+        self._avatar_changed_event = event.Event()
         self.init_widget()
 
     # -----------------------------------------------------------------------------------------------------------------
@@ -31,12 +39,20 @@ class BaseContact:
         return self._name
 
     def set_name(self, value):
-        self._name = str(value, 'utf-8')
+        if self._name == value:
+            return
+        self._name = value
         self._widget.name.setText(self._name)
         self._widget.name.repaint()
+        self._name_changed_event(self._name)
 
     name = property(get_name, set_name)
 
+    def get_name_changed_event(self):
+        return self._name_changed_event
+
+    name_changed_event = property(get_name_changed_event)
+
     # -----------------------------------------------------------------------------------------------------------------
     # Status message
     # -----------------------------------------------------------------------------------------------------------------
@@ -45,12 +61,20 @@ class BaseContact:
         return self._status_message
 
     def set_status_message(self, value):
-        self._status_message = str(value, 'utf-8')
+        if self._status_message == value:
+            return
+        self._status_message = value
         self._widget.status_message.setText(self._status_message)
         self._widget.status_message.repaint()
+        self._status_message_changed_event(self._status_message)
 
     status_message = property(get_status_message, set_status_message)
 
+    def get_status_message_changed_event(self):
+        return self._status_message_changed_event
+
+    status_message_changed_event = property(get_status_message_changed_event)
+
     # -----------------------------------------------------------------------------------------------------------------
     # Status
     # -----------------------------------------------------------------------------------------------------------------
@@ -59,11 +83,19 @@ class BaseContact:
         return self._status
 
     def set_status(self, value):
+        if self._status == value:
+            return
         self._status = value
         self._widget.connection_status.update(value)
+        self._status_changed_event(self._status)
 
     status = property(get_status, set_status)
 
+    def get_status_changed_event(self):
+        return self._status_changed_event
+
+    status_changed_event = property(get_status_changed_event)
+
     # -----------------------------------------------------------------------------------------------------------------
     # TOX ID. WARNING: for friend it will return public key, for profile - full address
     # -----------------------------------------------------------------------------------------------------------------
@@ -81,24 +113,25 @@ class BaseContact:
         """
         Tries to load avatar of contact or uses default avatar
         """
-        prefix = ProfileHelper.get_path() + 'avatars/'
+        avatar_path = self.get_avatar_path()
-        avatar_path = prefix + '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
-        if not os.path.isfile(avatar_path) or not os.path.getsize(avatar_path):  # load default image
-            avatar_path = curr_directory() + '/images/avatar.png'
         width = self._widget.avatar_label.width()
         pixmap = QtGui.QPixmap(avatar_path)
         self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio,
                                                           QtCore.Qt.SmoothTransformation))
         self._widget.avatar_label.repaint()
+        self._avatar_changed_event(avatar_path)
 
-    def reset_avatar(self):
+    def reset_avatar(self, generate_new):
-        avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
+        avatar_path = self.get_avatar_path()
-        if os.path.isfile(avatar_path):
+        if os.path.isfile(avatar_path) and not avatar_path == self._get_default_avatar_path():
             os.remove(avatar_path)
+        if generate_new:
+            self.set_avatar(common.generate_avatar(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2]))
+        else:
             self.load_avatar()
 
     def set_avatar(self, avatar):
-        avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
+        avatar_path = self.get_contact_avatar_path()
         with open(avatar_path, 'wb') as f:
             f.write(avatar)
         self.load_avatar()
@@ -106,13 +139,42 @@ class BaseContact:
     def get_pixmap(self):
         return self._widget.avatar_label.pixmap()
 
+    def get_avatar_path(self):
+        avatar_path = self.get_contact_avatar_path()
+        if not os.path.isfile(avatar_path) or not os.path.getsize(avatar_path):  # load default image
+            avatar_path = self._get_default_avatar_path()
+
+        return avatar_path
+
+    def get_contact_avatar_path(self):
+        directory = util.join_path(self._profile_manager.get_dir(), 'avatars')
+
+        return util.join_path(directory, '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2]))
+
+    def has_avatar(self):
+        path = self.get_contact_avatar_path()
+
+        return util.file_exists(path)
+
+    def get_avatar_changed_event(self):
+        return self._avatar_changed_event
+
+    avatar_changed_event = property(get_avatar_changed_event)
+
     # -----------------------------------------------------------------------------------------------------------------
     # Widgets
     # -----------------------------------------------------------------------------------------------------------------
 
     def init_widget(self):
-        if self._widget is not None:
         self._widget.name.setText(self._name)
         self._widget.status_message.setText(self._status_message)
         self._widget.connection_status.update(self._status)
         self.load_avatar()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    @staticmethod
+    def _get_default_avatar_path():
+        return util.join_path(util.get_images_directory(), 'avatar.png')

toxygen/contacts/common.py

@@ -0,0 +1,50 @@
+from pydenticon import Generator
+import hashlib
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Typing notifications
+# -----------------------------------------------------------------------------------------------------------------
+
+class BaseTypingNotificationHandler:
+
+    DEFAULT_HANDLER = None
+
+    def __init__(self):
+        pass
+
+    def send(self, tox, is_typing):
+        pass
+
+
+class FriendTypingNotificationHandler(BaseTypingNotificationHandler):
+
+    def __init__(self, friend_number):
+        super().__init__()
+        self._friend_number = friend_number
+
+    def send(self, tox, is_typing):
+        tox.self_set_typing(self._friend_number, is_typing)
+
+
+BaseTypingNotificationHandler.DEFAULT_HANDLER = BaseTypingNotificationHandler()
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Identicons support
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def generate_avatar(public_key):
+    foreground = ['rgb(45,79,255)', 'rgb(185, 66, 244)', 'rgb(185, 66, 244)',
+                  'rgb(254,180,44)', 'rgb(252, 2, 2)', 'rgb(109, 198, 0)',
+                  'rgb(226,121,234)', 'rgb(130, 135, 124)',
+                  'rgb(30,179,253)', 'rgb(160, 157, 0)',
+                  'rgb(232,77,65)', 'rgb(102, 4, 4)',
+                  'rgb(49,203,115)',
+                  'rgb(141,69,170)']
+    generator = Generator(5, 5, foreground=foreground, background='rgba(42,42,42,0)')
+    digest = hashlib.sha256(public_key.encode('utf-8')).hexdigest()
+    identicon = generator.generate(digest, 220, 220, padding=(10, 10, 10, 10))
+
+    return identicon

toxygen/contacts/contact.py

@@ -1,9 +1,8 @@
-from PyQt5 import QtCore, QtGui
+from history.database import *
-from history import *
+from contacts import basecontact, common
-import basecontact
+from messenger.messages import *
-import util
+from contacts.contact_menu import *
-from messages import *
+from file_transfers import file_transfers as ft
-import file_transfers as ft
 import re
 
 
@@ -13,12 +12,12 @@ class Contact(basecontact.BaseContact):
     Properties: number, message getter, history etc. Base class for friend and gc classes
     """
 
-    def __init__(self, message_getter, number, name, status_message, widget, tox_id):
+    def __init__(self, profile_manager, message_getter, number, name, status_message, widget, tox_id):
         """
         :param message_getter: gets messages from db
         :param number: number of friend.
         """
-        super().__init__(name, status_message, widget, tox_id)
+        super().__init__(profile_manager, name, status_message, widget, tox_id)
         self._number = number
         self._new_messages = False
         self._visible = True
@@ -44,6 +43,7 @@ class Contact(basecontact.BaseContact):
         """
         :param first_time: friend became active, load first part of messages
         """
+        try:
             if (first_time and self._history_loaded) or (not hasattr(self, '_message_getter')):
                 return
             if self._message_getter is None:
@@ -53,8 +53,11 @@ class Contact(basecontact.BaseContact):
                 data.reverse()
             else:
                 return
-        data = list(map(lambda tupl: TextMessage(*tupl), data))
+            data = list(map(lambda p: self._get_text_message(p), data))
             self._corr = data + self._corr
+        except:
+            pass
+        finally:
             self._history_loaded = True
 
     def load_all_corr(self):
@@ -66,7 +69,7 @@ class Contact(basecontact.BaseContact):
         data = list(self._message_getter.get_all())
         if data is not None and len(data):
             data.reverse()
-            data = list(map(lambda tupl: TextMessage(*tupl), data))
+            data = list(map(lambda p: self._get_text_message(p), data))
             self._corr = data + self._corr
             self._history_loaded = True
 
@@ -75,8 +78,8 @@ class Contact(basecontact.BaseContact):
         Get data to save in db
         :return: list of unsaved messages or []
         """
-        messages = list(filter(lambda x: x.get_type() <= 1, self._corr))
+        messages = list(filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr))
-        return list(map(lambda x: x.get_data(), messages[-self._unsaved_messages:])) if self._unsaved_messages else []
+        return messages[-self._unsaved_messages:] if self._unsaved_messages else []
 
     def get_corr(self):
         return self._corr[:]
@@ -86,16 +89,31 @@ class Contact(basecontact.BaseContact):
         :param message: text or file transfer message
         """
         self._corr.append(message)
-        if message.get_type() <= 1:
+        if message.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):
             self._unsaved_messages += 1
 
     def get_last_message_text(self):
-        messages = list(filter(lambda x: x.get_type() <= 1 and x.get_owner() != MESSAGE_OWNER['FRIEND'], self._corr))
+        messages = list(filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION'])
+                                         and m.author.type != MESSAGE_AUTHOR['FRIEND'], self._corr))
         if messages:
-            return messages[-1].get_data()[0]
+            return messages[-1].text
         else:
             return ''
 
+    def remove_messages_widgets(self):
+        for message in self._corr:
+            message.remove_widget()
+
+    def get_message(self, _filter):
+        return list(filter(lambda m: _filter(m), self._corr))[0]
+
+    @staticmethod
+    def _get_text_message(params):
+        (message, author_type, author_name, unix_time, message_type, unique_id) = params
+        author = MessageAuthor(author_name, author_type)
+
+        return TextMessage(message, author, unix_time, message_type, unique_id)
+
     # -----------------------------------------------------------------------------------------------------------------
     # Unsent messages
     # -----------------------------------------------------------------------------------------------------------------
@@ -104,19 +122,21 @@ class Contact(basecontact.BaseContact):
         """
         :return list of unsent messages
         """
-        messages = filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
+        messages = filter(lambda m: m.author is not None and m.author.type == MESSAGE_AUTHOR['NOT_SENT'], self._corr)
         return list(messages)
 
     def get_unsent_messages_for_saving(self):
         """
         :return list of unsent messages for saving
         """
-        messages = filter(lambda x: x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
+        messages = filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION'])
-        return list(map(lambda x: x.get_data(), messages))
+                                    and m.author.type == MESSAGE_AUTHOR['NOT_SENT'], self._corr)
+        return list(messages)
 
-    def mark_as_sent(self):
+    def mark_as_sent(self, tox_message_id):
         try:
-            message = list(filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr))[0]
+            message = list(filter(lambda m: m.author is not None and m.author.type == MESSAGE_AUTHOR['NOT_SENT']
+                                            and m.tox_message_id == tox_message_id, self._corr))[0]
             message.mark_as_sent()
         except Exception as ex:
             util.log('Mark as sent ex: ' + str(ex))
@@ -125,9 +145,9 @@ class Contact(basecontact.BaseContact):
     # Message deletion
     # -----------------------------------------------------------------------------------------------------------------
 
-    def delete_message(self, time):
+    def delete_message(self, message_id):
-        elem = list(filter(lambda x: type(x) in (TextMessage, GroupChatMessage) and x.get_data()[2] == time, self._corr))[0]
+        elem = list(filter(lambda m: m.message_id == message_id, self._corr))[0]
-        tmp = list(filter(lambda x: x.get_type() <= 1, self._corr))
+        tmp = list(filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr))
         if elem in tmp[-self._unsaved_messages:] and self._unsaved_messages:
             self._unsaved_messages -= 1
         self._corr.remove(elem)
@@ -138,14 +158,14 @@ class Contact(basecontact.BaseContact):
         """
         Delete old messages (reduces RAM usage if messages saving is not enabled)
         """
-        def save_message(x):
+        def save_message(m):
-            if x.get_type() == 2 and (x.get_status() >= 2 or x.get_status() is None):
+            if m.type == MESSAGE_TYPE['FILE_TRANSFER'] and (m.state not in ACTIVE_FILE_TRANSFERS):
                 return True
-            return x.get_owner() == MESSAGE_OWNER['NOT_SENT']
+            return m.author is not None and m.author.type == MESSAGE_AUTHOR['NOT_SENT']
 
         old = filter(save_message, self._corr[:-SAVE_MESSAGES])
         self._corr = list(old) + self._corr[-SAVE_MESSAGES:]
-        text_messages = filter(lambda x: x.get_type() <= 1, self._corr)
+        text_messages = filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr)
         self._unsaved_messages = min(self._unsaved_messages, len(list(text_messages)))
         self._search_index = 0
 
@@ -158,12 +178,14 @@ class Contact(basecontact.BaseContact):
         self._search_index = 0
         # don't delete data about active file transfer
         if not save_unsent:
-            self._corr = list(filter(lambda x: x.get_type() == 2 and
+            self._corr = list(filter(lambda m: m.type == MESSAGE_TYPE['FILE_TRANSFER'] and
-                                               x.get_status() in ft.ACTIVE_FILE_TRANSFERS, self._corr))
+                                               m.state in ft.ACTIVE_FILE_TRANSFERS, self._corr))
             self._unsaved_messages = 0
         else:
-            self._corr = list(filter(lambda x: (x.get_type() == 2 and x.get_status() in ft.ACTIVE_FILE_TRANSFERS)
+            self._corr = list(filter(lambda m: (m.type == MESSAGE_TYPE['FILE_TRANSFER']
-                                               or (x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT']),
+                                                and m.state in ft.ACTIVE_FILE_TRANSFERS)
+                                               or (m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION'])
+                                                   and m.author.type == MESSAGE_AUTHOR['NOT_SENT']),
                                      self._corr))
             self._unsaved_messages = len(self.get_unsent_messages())
 
@@ -179,9 +201,9 @@ class Contact(basecontact.BaseContact):
         while True:
             l = len(self._corr)
             for i in range(self._search_index - 1, -l - 1, -1):
-                if self._corr[i].get_type() > 1:
+                if self._corr[i].type not in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):
                     continue
-                message = self._corr[i].get_data()[0]
+                message = self._corr[i].text
                 if re.search(self._search_string, message, re.IGNORECASE) is not None:
                     self._search_index = i
                     return i
@@ -194,9 +216,9 @@ class Contact(basecontact.BaseContact):
         if not self._search_index:
             return None
         for i in range(self._search_index + 1, 0):
-            if self._corr[i].get_type() > 1:
+            if self._corr[i].type not in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):
                 continue
-            message = self._corr[i].get_data()[0]
+            message = self._corr[i].text
             if re.search(self._search_string, message, re.IGNORECASE) is not None:
                 self._search_index = i
                 return i
@@ -229,6 +251,9 @@ class Contact(basecontact.BaseContact):
     def set_alias(self, alias):
         self._alias = bool(alias)
 
+    def has_alias(self):
+        return self._alias
+
     # -----------------------------------------------------------------------------------------------------------------
     # Visibility in friends' list
     # -----------------------------------------------------------------------------------------------------------------
@@ -241,10 +266,6 @@ class Contact(basecontact.BaseContact):
 
     visibility = property(get_visibility, set_visibility)
 
-    def set_widget(self, widget):
-        self._widget = widget
-        self.init_widget()
-
     # -----------------------------------------------------------------------------------------------------------------
     # Unread messages and other actions from friend
     # -----------------------------------------------------------------------------------------------------------------
@@ -276,7 +297,7 @@ class Contact(basecontact.BaseContact):
     messages = property(get_messages)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Friend's number (can be used in toxcore)
+    # Friend's or group's number (can be used in toxcore)
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_number(self):
@@ -286,3 +307,27 @@ class Contact(basecontact.BaseContact):
         self._number = value
 
     number = property(get_number, set_number)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Typing notifications
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_typing_notification_handler(self):
+        return common.BaseTypingNotificationHandler.DEFAULT_HANDLER
+
+    typing_notification_handler = property(get_typing_notification_handler)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Context menu support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_context_menu_generator(self):
+        return BaseContactMenuGenerator(self)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Filtration support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def set_widget(self, widget):
+        self._widget = widget
+        self.init_widget()

toxygen/contacts/contact_menu.py

@@ -0,0 +1,229 @@
+from PyQt5 import QtWidgets
+import utils.ui as util_ui
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Builder
+# -----------------------------------------------------------------------------------------------------------------
+
+def _create_menu(menu_name, parent):
+    menu_name = menu_name or ''
+
+    return QtWidgets.QMenu(menu_name) if parent is None else parent.addMenu(menu_name)
+
+
+class ContactMenuBuilder:
+
+    def __init__(self):
+        self._actions = {}
+        self._submenus = {}
+        self._name = None
+        self._index = 0
+
+    def with_name(self, name):
+        self._name = name
+
+        return self
+
+    def with_action(self, text, handler):
+        self._add_action(text, handler)
+
+        return self
+
+    def with_optional_action(self, text, handler, show_action):
+        if show_action:
+            self._add_action(text, handler)
+
+        return self
+
+    def with_actions(self, actions):
+        for action in actions:
+            (text, handler) = action
+            self._add_action(text, handler)
+
+        return self
+
+    def with_submenu(self, submenu_builder):
+        self._add_submenu(submenu_builder)
+
+        return self
+
+    def with_optional_submenu(self, submenu_builder):
+        if submenu_builder is not None:
+            self._add_submenu(submenu_builder)
+
+        return self
+
+    def build(self, parent=None):
+        menu = _create_menu(self._name, parent)
+
+        for i in range(self._index):
+            if i in self._actions:
+                text, handler = self._actions[i]
+                action = menu.addAction(text)
+                action.triggered.connect(handler)
+            else:
+                submenu_builder = self._submenus[i]
+                submenu = submenu_builder.build(menu)
+                menu.addMenu(submenu)
+
+        return menu
+
+    def _add_submenu(self, submenu):
+        self._submenus[self._index] = submenu
+        self._index += 1
+
+    def _add_action(self, text, handler):
+        self._actions[self._index] = (text, handler)
+        self._index += 1
+
+# -----------------------------------------------------------------------------------------------------------------
+# Generators
+# -----------------------------------------------------------------------------------------------------------------
+
+
+class BaseContactMenuGenerator:
+
+    def __init__(self, contact):
+        self._contact = contact
+
+    def generate(self, plugin_loader, contacts_manager, main_screen, settings, number, groups_service, history_loader):
+        return ContactMenuBuilder().build()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _generate_copy_menu_builder(self, main_screen):
+        copy_menu_builder = ContactMenuBuilder()
+        (copy_menu_builder
+         .with_name(util_ui.tr('Copy'))
+         .with_action(util_ui.tr('Name'), lambda: main_screen.copy_text(self._contact.name))
+         .with_action(util_ui.tr('Status message'), lambda: main_screen.copy_text(self._contact.status_message))
+         .with_action(util_ui.tr('Public key'), lambda: main_screen.copy_text(self._contact.tox_id))
+         )
+
+        return copy_menu_builder
+
+    def _generate_history_menu_builder(self, history_loader, main_screen):
+        history_menu_builder = ContactMenuBuilder()
+        (history_menu_builder
+         .with_name(util_ui.tr('Chat history'))
+         .with_action(util_ui.tr('Clear history'), lambda: history_loader.clear_history(self._contact)
+                                                           or main_screen.messages.clear())
+         .with_action(util_ui.tr('Export as text'), lambda: history_loader.export_history(self._contact))
+         .with_action(util_ui.tr('Export as HTML'), lambda: history_loader.export_history(self._contact, False))
+         )
+
+        return history_menu_builder
+
+
+class FriendMenuGenerator(BaseContactMenuGenerator):
+
+    def generate(self, plugin_loader, contacts_manager, main_screen, settings, number, groups_service, history_loader):
+        history_menu_builder = self._generate_history_menu_builder(history_loader, main_screen)
+        copy_menu_builder = self._generate_copy_menu_builder(main_screen)
+        plugins_menu_builder = self._generate_plugins_menu_builder(plugin_loader, number)
+        groups_menu_builder = self._generate_groups_menu(contacts_manager, groups_service)
+
+        allowed = self._contact.tox_id in settings['auto_accept_from_friends']
+        auto = util_ui.tr('Disallow auto accept') if allowed else util_ui.tr('Allow auto accept')
+
+        builder = ContactMenuBuilder()
+        menu = (builder
+                .with_action(util_ui.tr('Set alias'), lambda: main_screen.set_alias(number))
+                .with_submenu(history_menu_builder)
+                .with_submenu(copy_menu_builder)
+                .with_action(auto, lambda: main_screen.auto_accept(number, not allowed))
+                .with_action(util_ui.tr('Remove friend'), lambda: main_screen.remove_friend(number))
+                .with_action(util_ui.tr('Block friend'), lambda: main_screen.block_friend(number))
+                .with_action(util_ui.tr('Notes'), lambda: main_screen.show_note(self._contact))
+                .with_optional_submenu(plugins_menu_builder)
+                .with_optional_submenu(groups_menu_builder)
+                ).build()
+
+        return menu
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    @staticmethod
+    def _generate_plugins_menu_builder(plugin_loader, number):
+        if plugin_loader is None:
+            return None
+        plugins_actions = plugin_loader.get_menu(number)
+        if not len(plugins_actions):
+            return None
+        plugins_menu_builder = ContactMenuBuilder()
+        (plugins_menu_builder
+         .with_name(util_ui.tr('Plugins'))
+         .with_actions(plugins_actions)
+         )
+
+        return plugins_menu_builder
+
+    def _generate_groups_menu(self, contacts_manager, groups_service):
+        chats = contacts_manager.get_group_chats()
+        if not len(chats) or self._contact.status is None:
+            return None
+        groups_menu_builder = ContactMenuBuilder()
+        (groups_menu_builder
+         .with_name(util_ui.tr('Invite to group'))
+         .with_actions([(g.name, lambda: groups_service.invite_friend(self._contact.number, g.number)) for g in chats])
+         )
+
+        return groups_menu_builder
+
+
+class GroupMenuGenerator(BaseContactMenuGenerator):
+
+    def generate(self, plugin_loader, contacts_manager, main_screen, settings, number, groups_service, history_loader):
+        copy_menu_builder = self._generate_copy_menu_builder(main_screen)
+        history_menu_builder = self._generate_history_menu_builder(history_loader, main_screen)
+
+        builder = ContactMenuBuilder()
+        menu = (builder
+                .with_action(util_ui.tr('Set alias'), lambda: main_screen.set_alias(number))
+                .with_submenu(copy_menu_builder)
+                .with_submenu(history_menu_builder)
+                .with_optional_action(util_ui.tr('Manage group'),
+                                      lambda: groups_service.show_group_management_screen(self._contact),
+                                      self._contact.is_self_founder())
+                .with_optional_action(util_ui.tr('Group settings'),
+                                      lambda: groups_service.show_group_settings_screen(self._contact),
+                                      not self._contact.is_self_founder())
+                .with_optional_action(util_ui.tr('Set topic'),
+                                      lambda: groups_service.set_group_topic(self._contact),
+                                      self._contact.is_self_moderator_or_founder())
+                .with_action(util_ui.tr('Bans list'),
+                             lambda: groups_service.show_bans_list(self._contact))
+                .with_action(util_ui.tr('Reconnect to group'),
+                             lambda: groups_service.reconnect_to_group(self._contact.number))
+                .with_optional_action(util_ui.tr('Disconnect from group'),
+                                      lambda: groups_service.disconnect_from_group(self._contact.number),
+                                      self._contact.status is not None)
+                .with_action(util_ui.tr('Leave group'), lambda: groups_service.leave_group(self._contact.number))
+                .with_action(util_ui.tr('Notes'), lambda: main_screen.show_note(self._contact))
+                ).build()
+
+        return menu
+
+
+class GroupPeerMenuGenerator(BaseContactMenuGenerator):
+
+    def generate(self, plugin_loader, contacts_manager, main_screen, settings, number, groups_service, history_loader):
+        copy_menu_builder = self._generate_copy_menu_builder(main_screen)
+        history_menu_builder = self._generate_history_menu_builder(history_loader, main_screen)
+
+        builder = ContactMenuBuilder()
+        menu = (builder
+                .with_action(util_ui.tr('Set alias'), lambda: main_screen.set_alias(number))
+                .with_submenu(copy_menu_builder)
+                .with_submenu(history_menu_builder)
+                .with_action(util_ui.tr('Quit chat'),
+                             lambda: contacts_manager.remove_group_peer(self._contact))
+                .with_action(util_ui.tr('Notes'), lambda: main_screen.show_note(self._contact))
+                ).build()
+
+        return menu

toxygen/contacts/contact_provider.py

@@ -0,0 +1,107 @@
+import common.tox_save as tox_save
+
+
+class ContactProvider(tox_save.ToxSave):
+
+    def __init__(self, tox, friend_factory, group_factory, group_peer_factory):
+        super().__init__(tox)
+        self._friend_factory = friend_factory
+        self._group_factory = group_factory
+        self._group_peer_factory = group_peer_factory
+        self._cache = {}  # key - contact's public key, value - contact instance
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Friends
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_friend_by_number(self, friend_number):
+        public_key = self._tox.friend_get_public_key(friend_number)
+
+        return self.get_friend_by_public_key(public_key)
+
+    def get_friend_by_public_key(self, public_key):
+        friend = self._get_contact_from_cache(public_key)
+        if friend is not None:
+            return friend
+        friend = self._friend_factory.create_friend_by_public_key(public_key)
+        self._add_to_cache(public_key, friend)
+
+        return friend
+
+    def get_all_friends(self):
+        friend_numbers = self._tox.self_get_friend_list()
+        friends = map(lambda n: self.get_friend_by_number(n), friend_numbers)
+
+        return list(friends)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Groups
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_all_groups(self):
+        group_numbers = range(self._tox.group_get_number_groups())
+        groups = map(lambda n: self.get_group_by_number(n), group_numbers)
+
+        return list(groups)
+
+    def get_group_by_number(self, group_number):
+        public_key = self._tox.group_get_chat_id(group_number)
+
+        return self.get_group_by_public_key(public_key)
+
+    def get_group_by_public_key(self, public_key):
+        group = self._get_contact_from_cache(public_key)
+        if group is not None:
+            return group
+        group = self._group_factory.create_group_by_public_key(public_key)
+        self._add_to_cache(public_key, group)
+
+        return group
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group peers
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_all_group_peers(self):
+        return list()
+
+    def get_group_peer_by_id(self, group, peer_id):
+        peer = group.get_peer_by_id(peer_id)
+
+        return self._get_group_peer(group, peer)
+
+    def get_group_peer_by_public_key(self, group, public_key):
+        peer = group.get_peer_by_public_key(public_key)
+
+        return self._get_group_peer(group, peer)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # All contacts
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_all(self):
+        return self.get_all_friends() + self.get_all_groups() + self.get_all_group_peers()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Caching
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def clear_cache(self):
+        self._cache.clear()
+
+    def remove_contact_from_cache(self, contact_public_key):
+        if contact_public_key in self._cache:
+            del self._cache[contact_public_key]
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _get_contact_from_cache(self, public_key):
+        return self._cache[public_key] if public_key in self._cache else None
+
+    def _add_to_cache(self, public_key, contact):
+        self._cache[public_key] = contact
+
+    def _get_group_peer(self, group, peer):
+        return self._group_peer_factory.create_group_peer(group, peer)

toxygen/contacts/contacts_manager.py

@@ -0,0 +1,575 @@
+from contacts.friend import Friend
+from contacts.group_chat import GroupChat
+from messenger.messages import *
+from common.tox_save import ToxSave
+from contacts.group_peer_contact import GroupPeerContact
+
+
+class ContactsManager(ToxSave):
+    """
+    Represents contacts list.
+    """
+
+    def __init__(self, tox, settings, screen, profile_manager, contact_provider, history, tox_dns,
+                 messages_items_factory):
+        super().__init__(tox)
+        self._settings = settings
+        self._screen = screen
+        self._profile_manager = profile_manager
+        self._contact_provider = contact_provider
+        self._tox_dns = tox_dns
+        self._messages_items_factory = messages_items_factory
+        self._messages = screen.messages
+        self._contacts, self._active_contact = [], -1
+        self._active_contact_changed = Event()
+        self._sorting = settings['sorting']
+        self._filter_string = ''
+        screen.contacts_filter.setCurrentIndex(int(self._sorting))
+        self._history = history
+        self._load_contacts()
+
+    def get_contact(self, num):
+        if num < 0 or num >= len(self._contacts):
+            return None
+        return self._contacts[num]
+
+    def get_curr_contact(self):
+        return self._contacts[self._active_contact] if self._active_contact + 1 else None
+
+    def save_profile(self):
+        data = self._tox.get_savedata()
+        self._profile_manager.save_profile(data)
+
+    def is_friend_active(self, friend_number):
+        if not self.is_active_a_friend():
+            return False
+
+        return self.get_curr_contact().number == friend_number
+
+    def is_group_active(self, group_number):
+        if self.is_active_a_friend():
+            return False
+
+        return self.get_curr_contact().number == group_number
+
+    def is_contact_active(self, contact):
+        return self._contacts[self._active_contact].tox_id == contact.tox_id
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Reconnection support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def reset_contacts_statuses(self):
+        for contact in self._contacts:
+            contact.status = None
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Work with active friend
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_active(self):
+        return self._active_contact
+
+    def set_active(self, value):
+        """
+        Change current active friend or update info
+        :param value: number of new active friend in friend's list
+        """
+        if value is None and self._active_contact == -1:  # nothing to update
+            return
+        if value == -1:  # all friends were deleted
+            self._screen.account_name.setText('')
+            self._screen.account_status.setText('')
+            self._screen.account_status.setToolTip('')
+            self._active_contact = -1
+            self._screen.account_avatar.setHidden(True)
+            self._messages.clear()
+            self._screen.messageEdit.clear()
+            return
+        try:
+            self._screen.typing.setVisible(False)
+            current_contact = self.get_curr_contact()
+            if current_contact is not None:
+                # TODO: send when needed
+                current_contact.typing_notification_handler.send(self._tox, False)
+                current_contact.remove_messages_widgets()  # TODO: if required
+                self._unsubscribe_from_events(current_contact)
+
+            if self._active_contact + 1 and self._active_contact != value:
+                try:
+                    current_contact.curr_text = self._screen.messageEdit.toPlainText()
+                except:
+                    pass
+            contact = self._contacts[value]
+            self._subscribe_to_events(contact)
+            contact.remove_invalid_unsent_files()
+            if self._active_contact != value:
+                self._screen.messageEdit.setPlainText(contact.curr_text)
+            self._active_contact = value
+            contact.reset_messages()
+            if not self._settings['save_history']:
+                contact.delete_old_messages()
+            self._messages.clear()
+            contact.load_corr()
+            corr = contact.get_corr()[-PAGE_SIZE:]
+            for message in corr:
+                if message.type == MESSAGE_TYPE['FILE_TRANSFER']:
+                    self._messages_items_factory.create_file_transfer_item(message)
+                elif message.type == MESSAGE_TYPE['INLINE']:
+                    self._messages_items_factory.create_inline_item(message)
+                else:
+                    self._messages_items_factory.create_message_item(message)
+            self._messages.scrollToBottom()
+            # if value in self._call:
+            #     self._screen.active_call()
+            # elif value in self._incoming_calls:
+            #     self._screen.incoming_call()
+            # else:
+            #     self._screen.call_finished()
+            self._set_current_contact_data(contact)
+            self._active_contact_changed(contact)
+        except Exception as ex:  # no friend found. ignore
+            util.log('Friend value: ' + str(value))
+            util.log('Error in set active: ' + str(ex))
+            raise
+
+    active_contact = property(get_active, set_active)
+
+    def get_active_contact_changed(self):
+        return self._active_contact_changed
+
+    active_contact_changed = property(get_active_contact_changed)
+
+    def update(self):
+        if self._active_contact + 1:
+            self.set_active(self._active_contact)
+
+    def is_active_a_friend(self):
+        return type(self.get_curr_contact()) is Friend
+
+    def is_active_a_group(self):
+        return type(self.get_curr_contact()) is GroupChat
+
+    def is_active_a_group_chat_peer(self):
+        return type(self.get_curr_contact()) is GroupPeerContact
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Filtration
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def filtration_and_sorting(self, sorting=0, filter_str=''):
+        """
+        Filtration of friends list
+        :param sorting: 0 - no sorting, 1 - online only, 2 - online first, 3 - by name,
+        4 - online and by name, 5 - online first and by name
+        :param filter_str: show contacts which name contains this substring
+        """
+        filter_str = filter_str.lower()
+        current_contact = self.get_curr_contact()
+
+        if sorting > 5 or sorting < 0:
+            sorting = 0
+
+        if sorting in (1, 2, 4, 5):  # online first
+            self._contacts = sorted(self._contacts, key=lambda x: int(x.status is not None), reverse=True)
+            sort_by_name = sorting in (4, 5)
+            # save results of previous sorting
+            online_friends = filter(lambda x: x.status is not None, self._contacts)
+            online_friends_count = len(list(online_friends))
+            part1 = self._contacts[:online_friends_count]
+            part2 = self._contacts[online_friends_count:]
+            key_lambda = lambda x: x.name.lower() if sort_by_name else x.number
+            part1 = sorted(part1, key=key_lambda)
+            part2 = sorted(part2, key=key_lambda)
+            self._contacts = part1 + part2
+        elif sorting == 0:
+            contacts = sorted(self._contacts, key=lambda c: c.number)
+            friends = filter(lambda c: type(c) is Friend, contacts)
+            groups = filter(lambda c: type(c) is GroupChat, contacts)
+            group_peers = filter(lambda c: type(c) is GroupPeerContact, contacts)
+            self._contacts = list(friends) + list(groups) + list(group_peers)
+        else:
+            self._contacts = sorted(self._contacts, key=lambda x: x.name.lower())
+
+        # change item widgets
+        for index, contact in enumerate(self._contacts):
+            list_item = self._screen.friends_list.item(index)
+            item_widget = self._screen.friends_list.itemWidget(list_item)
+            contact.set_widget(item_widget)
+
+        for index, friend in enumerate(self._contacts):
+            filtered_by_name = filter_str in friend.name.lower()
+            friend.visibility = (friend.status is not None or sorting not in (1, 4)) and filtered_by_name
+            # show friend even if it's hidden when there any unread messages/actions
+            friend.visibility = friend.visibility or friend.messages or friend.actions
+            item = self._screen.friends_list.item(index)
+            item_widget = self._screen.friends_list.itemWidget(item)
+            item.setSizeHint(QtCore.QSize(250, item_widget.height() if friend.visibility else 0))
+
+        # save soring results
+        self._sorting, self._filter_string = sorting, filter_str
+        self._settings['sorting'] = self._sorting
+        self._settings.save()
+
+        # update active contact
+        if current_contact is not None:
+            index = self._contacts.index(current_contact)
+            self.set_active(index)
+
+    def update_filtration(self):
+        """
+        Update list of contacts when 1 of friends change connection status
+        """
+        self.filtration_and_sorting(self._sorting, self._filter_string)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Contact getters
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_friend_by_number(self, number):
+        return list(filter(lambda c: c.number == number and type(c) is Friend, self._contacts))[0]
+
+    def get_group_by_number(self, number):
+        return list(filter(lambda c: c.number == number and type(c) is GroupChat, self._contacts))[0]
+
+    def get_or_create_group_peer_contact(self, group_number, peer_id):
+        group = self.get_group_by_number(group_number)
+        peer = group.get_peer_by_id(peer_id)
+        if not self.check_if_contact_exists(peer.public_key):
+            self.add_group_peer(group, peer)
+
+        return self.get_contact_by_tox_id(peer.public_key)
+
+    def check_if_contact_exists(self, tox_id):
+        return any(filter(lambda c: c.tox_id == tox_id, self._contacts))
+
+    def get_contact_by_tox_id(self, tox_id):
+        return list(filter(lambda c: c.tox_id == tox_id, self._contacts))[0]
+
+    def get_active_number(self):
+        return self.get_curr_contact().number if self._active_contact + 1 else -1
+
+    def get_active_name(self):
+        return self.get_curr_contact().name if self._active_contact + 1 else ''
+
+    def is_active_online(self):
+        return self._active_contact + 1 and self.get_curr_contact().status is not None
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Work with friends (remove, block, set alias, get public key)
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def set_alias(self, num):
+        """
+        Set new alias for friend
+        """
+        friend = self._contacts[num]
+        name = friend.name
+        text = util_ui.tr("Enter new alias for friend {} or leave empty to use friend's name:").format(name)
+        title = util_ui.tr('Set alias')
+        text, ok = util_ui.text_dialog(text, title, name)
+        if not ok:
+            return
+        aliases = self._settings['friends_aliases']
+        if text:
+            friend.name = text
+            try:
+                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)
+            friend.set_alias('')
+            try:
+                index = list(map(lambda x: x[0], aliases)).index(friend.tox_id)
+                del aliases[index]
+            except:
+                pass
+        self._settings.save()
+
+    def friend_public_key(self, num):
+        return self._contacts[num].tox_id
+
+    def delete_friend(self, num):
+        """
+        Removes friend from contact list
+        :param num: number of friend in list
+        """
+        friend = self._contacts[num]
+        self._cleanup_contact_data(friend)
+        self._tox.friend_delete(friend.number)
+        self._delete_contact(num)
+
+    def add_friend(self, tox_id):
+        """
+        Adds friend to list
+        """
+        self._tox.friend_add_norequest(tox_id)
+        self._add_friend(tox_id)
+        self.update_filtration()
+
+    def block_user(self, tox_id):
+        """
+        Block user with specified tox id (or public key) - delete from friends list and ignore friend requests
+        """
+        tox_id = tox_id[:TOX_PUBLIC_KEY_SIZE * 2]
+        if tox_id == self._tox.self_get_address[:TOX_PUBLIC_KEY_SIZE * 2]:
+            return
+        if tox_id not in self._settings['blocked']:
+            self._settings['blocked'].append(tox_id)
+            self._settings.save()
+        try:
+            num = self._tox.friend_by_public_key(tox_id)
+            self.delete_friend(num)
+            self.save_profile()
+        except:  # not in friend list
+            pass
+
+    def unblock_user(self, tox_id, add_to_friend_list):
+        """
+        Unblock user
+        :param tox_id: tox id of contact
+        :param add_to_friend_list: add this contact to friend list or not
+        """
+        self._settings['blocked'].remove(tox_id)
+        self._settings.save()
+        if add_to_friend_list:
+            self.add_friend(tox_id)
+            self.save_profile()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Groups support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_group_chats(self):
+        return list(filter(lambda c: type(c) is GroupChat, self._contacts))
+
+    def add_group(self, group_number):
+        group = self._contact_provider.get_group_by_number(group_number)
+        index = len(self._contacts)
+        self._contacts.append(group)
+        group.reset_avatar(self._settings['identicons'])
+        self._save_profile()
+        self.set_active(index)
+        self.update_filtration()
+
+    def delete_group(self, group_number):
+        group = self.get_group_by_number(group_number)
+        self._cleanup_contact_data(group)
+        num = self._contacts.index(group)
+        self._delete_contact(num)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Groups private messaging
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def add_group_peer(self, group, peer):
+        contact = self._contact_provider.get_group_peer_by_id(group, peer.id)
+        if self.check_if_contact_exists(contact.tox_id):
+            return
+        self._contacts.append(contact)
+        contact.reset_avatar(self._settings['identicons'])
+        self._save_profile()
+
+    def remove_group_peer_by_id(self, group, peer_id):
+        peer = group.get_peer_by_id(peer_id)
+        if not self.check_if_contact_exists(peer.public_key):
+            return
+        contact = self.get_contact_by_tox_id(peer.public_key)
+        self.remove_group_peer(contact)
+
+    def remove_group_peer(self, group_peer_contact):
+        contact = self.get_contact_by_tox_id(group_peer_contact.tox_id)
+        self._cleanup_contact_data(contact)
+        num = self._contacts.index(contact)
+        self._delete_contact(num)
+
+    def get_gc_peer_name(self, name):
+        group = self.get_curr_contact()
+
+        names = sorted(group.get_peers_names())
+        if name in names:  # return next nick
+            index = names.index(name)
+            index = (index + 1) % len(names)
+
+            return names[index]
+
+        suggested_names = list(filter(lambda x: x.startswith(name), names))
+        if not len(suggested_names):
+            return '\t'
+
+        return suggested_names[0]
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Friend requests
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def send_friend_request(self, tox_id, message):
+        """
+        Function tries to send request to contact with specified id
+        :param tox_id: id of new contact or tox dns 4 value
+        :param message: additional message
+        :return: True on success else error string
+        """
+        try:
+            message = message or 'Hello! Add me to your contact list please'
+            if '@' in tox_id:  # value like groupbot@toxme.io
+                tox_id = self._tox_dns.lookup(tox_id)
+                if tox_id is None:
+                    raise Exception('TOX DNS lookup failed')
+            if len(tox_id) == TOX_PUBLIC_KEY_SIZE * 2:  # public key
+                self.add_friend(tox_id)
+                title = util_ui.tr('Friend added')
+                text = util_ui.tr('Friend added without sending friend request')
+                util_ui.message_box(text, title)
+            else:
+                self._tox.friend_add(tox_id, message.encode('utf-8'))
+                tox_id = tox_id[:TOX_PUBLIC_KEY_SIZE * 2]
+                self._add_friend(tox_id)
+                self.update_filtration()
+            self.save_profile()
+            return True
+        except Exception as ex:  # wrong data
+            util.log('Friend request failed with ' + str(ex))
+            return str(ex)
+
+    def process_friend_request(self, tox_id, message):
+        """
+        Accept or ignore friend request
+        :param tox_id: tox id of contact
+        :param message: message
+        """
+        if tox_id in self._settings['blocked']:
+            return
+        try:
+            text = util_ui.tr('User {} wants to add you to contact list. Message:\n{}')
+            reply = util_ui.question(text.format(tox_id, message), util_ui.tr('Friend request'))
+            if reply:  # accepted
+                self.add_friend(tox_id)
+                data = self._tox.get_savedata()
+                self._profile_manager.save_profile(data)
+        except Exception as ex:  # something is wrong
+            util.log('Accept friend request failed! ' + str(ex))
+
+    def can_send_typing_notification(self):
+        return self._settings['typing_notifications'] and not self.is_active_a_group_chat_peer()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Contacts numbers update
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def update_friends_numbers(self):
+        for friend in self._contact_provider.get_all_friends():
+            friend.number = self._tox.friend_by_public_key(friend.tox_id)
+        self.update_filtration()
+
+    def update_groups_numbers(self):
+        groups = self._contact_provider.get_all_groups()
+        for i in range(len(groups)):
+            chat_id = self._tox.group_get_chat_id(i)
+            group = self.get_contact_by_tox_id(chat_id)
+            group.number = i
+        self.update_filtration()
+
+    def update_groups_lists(self):
+        groups = self._contact_provider.get_all_groups()
+        for group in groups:
+            group.remove_all_peers_except_self()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _load_contacts(self):
+        self._load_friends()
+        self._load_groups()
+        if len(self._contacts):
+            self.set_active(0)
+        for contact in filter(lambda c: not c.has_avatar(), self._contacts):
+            contact.reset_avatar(self._settings['identicons'])
+        self.update_filtration()
+
+    def _load_friends(self):
+        self._contacts.extend(self._contact_provider.get_all_friends())
+
+    def _load_groups(self):
+        self._contacts.extend(self._contact_provider.get_all_groups())
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Current contact subscriptions
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _subscribe_to_events(self, contact):
+        contact.name_changed_event.add_callback(self._current_contact_name_changed)
+        contact.status_changed_event.add_callback(self._current_contact_status_changed)
+        contact.status_message_changed_event.add_callback(self._current_contact_status_message_changed)
+        contact.avatar_changed_event.add_callback(self._current_contact_avatar_changed)
+
+    def _unsubscribe_from_events(self, contact):
+        contact.name_changed_event.remove_callback(self._current_contact_name_changed)
+        contact.status_changed_event.remove_callback(self._current_contact_status_changed)
+        contact.status_message_changed_event.remove_callback(self._current_contact_status_message_changed)
+        contact.avatar_changed_event.remove_callback(self._current_contact_avatar_changed)
+
+    def _current_contact_name_changed(self, name):
+        self._screen.account_name.setText(name)
+
+    def _current_contact_status_changed(self, status):
+        pass
+
+    def _current_contact_status_message_changed(self, status_message):
+        self._screen.account_status.setText(status_message)
+
+    def _current_contact_avatar_changed(self, avatar_path):
+        self._set_current_contact_avatar(avatar_path)
+
+    def _set_current_contact_data(self, contact):
+        self._screen.account_name.setText(contact.name)
+        self._screen.account_status.setText(contact.status_message)
+        self._set_current_contact_avatar(contact.get_avatar_path())
+
+    def _set_current_contact_avatar(self, avatar_path):
+        width = self._screen.account_avatar.width()
+        pixmap = QtGui.QPixmap(avatar_path)
+        self._screen.account_avatar.setPixmap(pixmap.scaled(width, width,
+                                                            QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation))
+
+    def _add_friend(self, tox_id):
+        self._history.add_friend_to_db(tox_id)
+        friend = self._contact_provider.get_friend_by_public_key(tox_id)
+        index = len(self._contacts)
+        self._contacts.append(friend)
+        if not friend.has_avatar():
+            friend.reset_avatar(self._settings['identicons'])
+        self._save_profile()
+        self.set_active(index)
+
+    def _save_profile(self):
+        data = self._tox.get_savedata()
+        self._profile_manager.save_profile(data)
+
+    def _cleanup_contact_data(self, contact):
+        try:
+            index = list(map(lambda x: x[0], self._settings['friends_aliases'])).index(contact.tox_id)
+            del self._settings['friends_aliases'][index]
+        except:
+            pass
+        if contact.tox_id in self._settings['notes']:
+            del self._settings['notes'][contact.tox_id]
+        self._settings.save()
+        self._history.delete_history(contact)
+        if contact.has_avatar():
+            avatar_path = contact.get_contact_avatar_path()
+            remove(avatar_path)
+
+    def _delete_contact(self, num):
+        self.set_active(-1 if len(self._contacts) == 1 else 0)
+
+        self._contact_provider.remove_contact_from_cache(self._contacts[num].tox_id)
+        del self._contacts[num]
+        self._screen.friends_list.takeItem(num)
+        self._save_profile()
+
+        self.update_filtration()

toxygen/contacts/friend.py

@@ -0,0 +1,74 @@
+from contacts import contact, common
+from messenger.messages import *
+import os
+from contacts.contact_menu import *
+
+
+class Friend(contact.Contact):
+    """
+    Friend in list of friends.
+    """
+
+    def __init__(self, profile_manager, message_getter, number, name, status_message, widget, tox_id):
+        super().__init__(profile_manager, message_getter, number, name, status_message, widget, tox_id)
+        self._receipts = 0
+        self._typing_notification_handler = common.FriendTypingNotificationHandler(number)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # File transfers support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def insert_inline(self, before_message_id, inline):
+        """
+        Update status of active transfer and load inline if needed
+        """
+        try:
+            tr = list(filter(lambda m: m.message_id == before_message_id, self._corr))[0]
+            i = self._corr.index(tr)
+            if inline:  # inline was loaded
+                self._corr.insert(i, inline)
+            return i - len(self._corr)
+        except:
+            pass
+
+    def get_unsent_files(self):
+        messages = filter(lambda m: type(m) is UnsentFileMessage, self._corr)
+        return list(messages)
+
+    def clear_unsent_files(self):
+        self._corr = list(filter(lambda m: type(m) is not UnsentFileMessage, self._corr))
+
+    def remove_invalid_unsent_files(self):
+        def is_valid(message):
+            if type(message) is not UnsentFileMessage:
+                return True
+            if message.data is not None:
+                return True
+            return os.path.exists(message.path)
+
+        self._corr = list(filter(is_valid, self._corr))
+
+    def delete_one_unsent_file(self, message_id):
+        self._corr = list(filter(lambda m: not (type(m) is UnsentFileMessage and m.message_id == message_id),
+                                 self._corr))
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Full status
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_full_status(self):
+        return self._status_message
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Typing notifications
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_typing_notification_handler(self):
+        return self._typing_notification_handler
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Context menu support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_context_menu_generator(self):
+        return FriendMenuGenerator(self)

toxygen/contacts/friend_factory.py

@@ -0,0 +1,44 @@
+from contacts.friend import Friend
+from common.tox_save import ToxSave
+
+
+class FriendFactory(ToxSave):
+
+    def __init__(self, profile_manager, settings, tox, db, items_factory):
+        super().__init__(tox)
+        self._profile_manager = profile_manager
+        self._settings = settings
+        self._db = db
+        self._items_factory = items_factory
+
+    def create_friend_by_public_key(self, public_key):
+        friend_number = self._tox.friend_by_public_key(public_key)
+
+        return self.create_friend_by_number(friend_number)
+
+    def create_friend_by_number(self, friend_number):
+        aliases = self._settings['friends_aliases']
+        tox_id = self._tox.friend_get_public_key(friend_number)
+        try:
+            alias = list(filter(lambda x: x[0] == tox_id, aliases))[0][1]
+        except:
+            alias = ''
+        item = self._create_friend_item()
+        name = alias or self._tox.friend_get_name(friend_number) or tox_id
+        status_message = self._tox.friend_get_status_message(friend_number)
+        message_getter = self._db.messages_getter(tox_id)
+        friend = Friend(self._profile_manager, message_getter, friend_number, name, status_message, item, tox_id)
+        friend.set_alias(alias)
+
+        return friend
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _create_friend_item(self):
+        """
+        Method-factory
+        :return: new widget for friend instance
+        """
+        return self._items_factory.create_contact_item()

toxygen/contacts/group_chat.py

@@ -0,0 +1,137 @@
+from contacts import contact
+from contacts.contact_menu import GroupMenuGenerator
+import utils.util as util
+from groups.group_peer import GroupChatPeer
+from wrapper import toxcore_enums_and_consts as constants
+from common.tox_save import ToxSave
+from groups.group_ban import GroupBan
+
+
+class GroupChat(contact.Contact, ToxSave):
+
+    def __init__(self, tox, profile_manager, message_getter, number, name, status_message, widget, tox_id, is_private):
+        super().__init__(profile_manager, message_getter, number, name, status_message, widget, tox_id)
+        ToxSave.__init__(self, tox)
+
+        self._is_private = is_private
+        self._password = str()
+        self._peers_limit = 512
+        self._peers = []
+        self._add_self_to_gc()
+
+    def remove_invalid_unsent_files(self):
+        pass
+
+    def get_context_menu_generator(self):
+        return GroupMenuGenerator(self)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Properties
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_is_private(self):
+        return self._is_private
+
+    def set_is_private(self, is_private):
+        self._is_private = is_private
+
+    is_private = property(get_is_private, set_is_private)
+
+    def get_password(self):
+        return self._password
+
+    def set_password(self, password):
+        self._password = password
+
+    password = property(get_password, set_password)
+
+    def get_peers_limit(self):
+        return self._peers_limit
+
+    def set_peers_limit(self, peers_limit):
+        self._peers_limit = peers_limit
+
+    peers_limit = property(get_peers_limit, set_peers_limit)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Peers methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_self_peer(self):
+        return self._peers[0]
+
+    def get_self_name(self):
+        return self._peers[0].name
+
+    def get_self_role(self):
+        return self._peers[0].role
+
+    def is_self_moderator_or_founder(self):
+        return self.get_self_role() <= constants.TOX_GROUP_ROLE['MODERATOR']
+
+    def is_self_founder(self):
+        return self.get_self_role() == constants.TOX_GROUP_ROLE['FOUNDER']
+
+    def add_peer(self, peer_id, is_current_user=False):
+        peer = GroupChatPeer(peer_id,
+                             self._tox.group_peer_get_name(self._number, peer_id),
+                             self._tox.group_peer_get_status(self._number, peer_id),
+                             self._tox.group_peer_get_role(self._number, peer_id),
+                             self._tox.group_peer_get_public_key(self._number, peer_id),
+                             is_current_user)
+        self._peers.append(peer)
+
+    def remove_peer(self, peer_id):
+        if peer_id == self.get_self_peer().id:  # we were kicked or banned
+            self.remove_all_peers_except_self()
+        else:
+            peer = self.get_peer_by_id(peer_id)
+            self._peers.remove(peer)
+
+    def get_peer_by_id(self, peer_id):
+        peers = list(filter(lambda p: p.id == peer_id, self._peers))
+
+        return peers[0]
+
+    def get_peer_by_public_key(self, public_key):
+        peers = list(filter(lambda p: p.public_key == public_key, self._peers))
+
+        return peers[0]
+
+    def remove_all_peers_except_self(self):
+        self._peers = self._peers[:1]
+
+    def get_peers_names(self):
+        peers_names = map(lambda p: p.name, self._peers)
+
+        return list(peers_names)
+
+    def get_peers(self):
+        return self._peers[:]
+
+    peers = property(get_peers)
+
+    def get_bans(self):
+        ban_ids = self._tox.group_ban_get_list(self._number)
+        bans = []
+        for ban_id in ban_ids:
+            ban = GroupBan(ban_id,
+                           self._tox.group_ban_get_target(self._number, ban_id),
+                           self._tox.group_ban_get_time_set(self._number, ban_id))
+            bans.append(ban)
+
+        return bans
+
+    bans = property(get_bans)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    @staticmethod
+    def _get_default_avatar_path():
+        return util.join_path(util.get_images_directory(), 'group.png')
+
+    def _add_self_to_gc(self):
+        peer_id = self._tox.group_self_get_peer_id(self._number)
+        self.add_peer(peer_id, True)

toxygen/contacts/group_factory.py

@@ -0,0 +1,53 @@
+from contacts.group_chat import GroupChat
+from common.tox_save import ToxSave
+import wrapper.toxcore_enums_and_consts as constants
+
+
+class GroupFactory(ToxSave):
+
+    def __init__(self, profile_manager, settings, tox, db, items_factory):
+        super().__init__(tox)
+        self._profile_manager = profile_manager
+        self._settings = settings
+        self._db = db
+        self._items_factory = items_factory
+
+    def create_group_by_public_key(self, public_key):
+        group_number = self._get_group_number_by_chat_id(public_key)
+
+        return self.create_group_by_number(group_number)
+
+    def create_group_by_number(self, group_number):
+        aliases = self._settings['friends_aliases']
+        tox_id = self._tox.group_get_chat_id(group_number)
+        try:
+            alias = list(filter(lambda x: x[0] == tox_id, aliases))[0][1]
+        except:
+            alias = ''
+        item = self._create_group_item()
+        name = alias or self._tox.group_get_name(group_number) or tox_id
+        status_message = self._tox.group_get_topic(group_number)
+        message_getter = self._db.messages_getter(tox_id)
+        is_private = self._tox.group_get_privacy_state(group_number) == constants.TOX_GROUP_PRIVACY_STATE['PRIVATE']
+        group = GroupChat(self._tox, self._profile_manager, message_getter, group_number, name, status_message,
+                          item, tox_id, is_private)
+        group.set_alias(alias)
+
+        return group
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _create_group_item(self):
+        """
+        Method-factory
+        :return: new widget for group instance
+        """
+        return self._items_factory.create_contact_item()
+
+    def _get_group_number_by_chat_id(self, chat_id):
+        for i in range(self._tox.group_get_number_groups()):
+            if self._tox.group_get_chat_id(i) == chat_id:
+                return i
+        return -1

toxygen/contacts/group_peer_contact.py

@@ -0,0 +1,20 @@
+import contacts.contact
+from contacts.contact_menu import GroupPeerMenuGenerator
+
+
+class GroupPeerContact(contacts.contact.Contact):
+
+    def __init__(self, profile_manager, message_getter, peer_number, name, widget, tox_id, group_pk):
+        super().__init__(profile_manager, message_getter, peer_number, name, str(), widget, tox_id)
+        self._group_pk = group_pk
+
+    def get_group_pk(self):
+        return self._group_pk
+
+    group_pk = property(get_group_pk)
+
+    def remove_invalid_unsent_files(self):
+        pass
+
+    def get_context_menu_generator(self):
+        return GroupPeerMenuGenerator(self)

toxygen/contacts/group_peer_factory.py

@@ -0,0 +1,23 @@
+from common.tox_save import ToxSave
+from contacts.group_peer_contact import GroupPeerContact
+
+
+class GroupPeerFactory(ToxSave):
+
+    def __init__(self, tox, profile_manager, db, items_factory):
+        super().__init__(tox)
+        self._profile_manager = profile_manager
+        self._db = db
+        self._items_factory = items_factory
+
+    def create_group_peer(self, group, peer):
+        item = self._create_group_peer_item()
+        message_getter = self._db.messages_getter(peer.public_key)
+        group_peer_contact = GroupPeerContact(self._profile_manager, message_getter, peer.id, peer.name,
+                                              item, peer.public_key, group.tox_id)
+        group_peer_contact.status = peer.status
+
+        return group_peer_contact
+
+    def _create_group_peer_item(self):
+        return self._items_factory.create_contact_item()

toxygen/contacts/profile.py

@@ -0,0 +1,87 @@
+from contacts import basecontact
+import random
+import threading
+import common.tox_save as tox_save
+from middleware.threads import invoke_in_main_thread
+
+
+class Profile(basecontact.BaseContact, tox_save.ToxSave):
+    """
+    Profile of current toxygen user.
+    """
+    def __init__(self, profile_manager, tox, screen, contacts_provider, reset_action):
+        """
+        :param tox: tox instance
+        :param screen: ref to main screen
+        """
+        basecontact.BaseContact.__init__(self,
+                                         profile_manager,
+                                         tox.self_get_name(),
+                                         tox.self_get_status_message(),
+                                         screen,
+                                         tox.self_get_address())
+        tox_save.ToxSave.__init__(self, tox)
+        self._screen = screen
+        self._messages = screen.messages
+        self._contacts_provider = contacts_provider
+        self._reset_action = reset_action
+        self._waiting_for_reconnection = False
+        self._timer = None
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Edit current user's data
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def change_status(self):
+        """
+        Changes status of user (online, away, busy)
+        """
+        if self._status is not None:
+            self.set_status((self._status + 1) % 3)
+
+    def set_status(self, status):
+        super().set_status(status)
+        if status is not None:
+            self._tox.self_set_status(status)
+        elif not self._waiting_for_reconnection:
+            self._waiting_for_reconnection = True
+            self._timer = threading.Timer(50, self._reconnect)
+            self._timer.start()
+
+    def set_name(self, value):
+        if self.name == value:
+            return
+        super().set_name(value)
+        self._tox.self_set_name(self._name)
+
+    def set_status_message(self, value):
+        super().set_status_message(value)
+        self._tox.self_set_status_message(self._status_message)
+
+    def set_new_nospam(self):
+        """Sets new nospam part of tox id"""
+        self._tox.self_set_nospam(random.randint(0, 4294967295))  # no spam - uint32
+        self._tox_id = self._tox.self_get_address()
+
+        return self._tox_id
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Reset
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def restart(self):
+        """
+        Recreate tox instance
+        """
+        self.status = None
+        invoke_in_main_thread(self._reset_action)
+
+    def _reconnect(self):
+        self._waiting_for_reconnection = False
+        contacts = self._contacts_provider.get_all_friends()
+        all_friends_offline = all(list(map(lambda x: x.status is None, contacts)))
+        if self.status is None or (all_friends_offline and len(contacts)):
+            self._waiting_for_reconnection = True
+            self.restart()
+            self._timer = threading.Timer(50, self._reconnect)
+            self._timer.start()

toxygen/file_transfers/file_transfers.py

@@ -1,20 +1,21 @@
-from toxcore_enums_and_consts import TOX_FILE_KIND, TOX_FILE_CONTROL
+from wrapper.toxcore_enums_and_consts import TOX_FILE_KIND, TOX_FILE_CONTROL
 from os.path import basename, getsize, exists, dirname
 from os import remove, rename, chdir
-from time import time, sleep
+from time import time
-from tox import Tox
+from wrapper.tox import Tox
-import settings
+from common.event import Event
-from PyQt5 import QtCore
+from middleware.threads import invoke_in_main_thread
 
 
-TOX_FILE_TRANSFER_STATE = {
+FILE_TRANSFER_STATE = {
     'RUNNING': 0,
     'PAUSED_BY_USER': 1,
     'CANCELLED': 2,
     'FINISHED': 3,
     'PAUSED_BY_FRIEND': 4,
     'INCOMING_NOT_STARTED': 5,
-    'OUTGOING_NOT_STARTED': 6
+    'OUTGOING_NOT_STARTED': 6,
+    'UNSENT': 7
 }
 
 ACTIVE_FILE_TRANSFERS = (0, 1, 4, 5, 6)
@@ -25,102 +26,106 @@ DO_NOT_SHOW_ACCEPT_BUTTON = (2, 3, 4, 6)
 
 SHOW_PROGRESS_BAR = (0, 1, 4)
 
-ALLOWED_FILES = ('toxygen_inline.png', 'utox-inline.png', 'sticker.png')
-
 
 def is_inline(file_name):
-    return file_name in ALLOWED_FILES or file_name.startswith('qTox_Screenshot_')
+    allowed_inlines = ('toxygen_inline.png', 'utox-inline.png', 'sticker.png')
+
+    return file_name in allowed_inlines or file_name.startswith('qTox_Image_')
 
 
-class StateSignal(QtCore.QObject):
+class FileTransfer:
-
-    signal = QtCore.pyqtSignal(int, float, int)  # state, progress, time in sec
-
-
-class TransferFinishedSignal(QtCore.QObject):
-
-    signal = QtCore.pyqtSignal(int, int)  # friend number, file number
-
-
-class FileTransfer(QtCore.QObject):
     """
     Superclass for file transfers
     """
 
     def __init__(self, path, tox, friend_number, size, file_number=None):
-        QtCore.QObject.__init__(self)
         self._path = path
         self._tox = tox
         self._friend_number = friend_number
-        self.state = TOX_FILE_TRANSFER_STATE['RUNNING']
+        self._state = FILE_TRANSFER_STATE['RUNNING']
         self._file_number = file_number
         self._creation_time = None
         self._size = float(size)
         self._done = 0
-        self._state_changed = StateSignal()
+        self._state_changed_event = Event()
-        self._finished = TransferFinishedSignal()
+        self._finished_event = Event()
-        self._file_id = None
+        self._file_id = self._file = None
-
-    def set_tox(self, tox):
-        self._tox = tox
 
     def set_state_changed_handler(self, handler):
-        self._state_changed.signal.connect(handler)
+        self._state_changed_event += lambda *args: invoke_in_main_thread(handler, *args)
 
     def set_transfer_finished_handler(self, handler):
-        self._finished.signal.connect(handler)
+        self._finished_event += lambda *args: invoke_in_main_thread(handler, *args)
-
-    def signal(self):
-        percentage = self._done / self._size if self._size else 0
-        if self._creation_time is None or not percentage:
-            t = -1
-        else:
-            t = ((time() - self._creation_time) / percentage) * (1 - percentage)
-        self._state_changed.signal.emit(self.state, percentage, int(t))
-
-    def finished(self):
-        self._finished.signal.emit(self._friend_number, self._file_number)
 
     def get_file_number(self):
         return self._file_number
 
+    file_number = property(get_file_number)
+
+    def get_state(self):
+        return self._state
+
+    def set_state(self, value):
+        self._state = value
+        self._signal()
+
+    state = property(get_state, set_state)
+
     def get_friend_number(self):
         return self._friend_number
 
-    def get_id(self):
+    friend_number = property(get_friend_number)
+
+    def get_file_id(self):
         return self._file_id
 
+    file_id = property(get_file_id)
+
     def get_path(self):
         return self._path
 
+    path = property(get_path)
+
+    def get_size(self):
+        return self._size
+
+    size = property(get_size)
+
     def cancel(self):
         self.send_control(TOX_FILE_CONTROL['CANCEL'])
-        if hasattr(self, '_file'):
+        if self._file is not None:
             self._file.close()
-        self.signal()
+        self._signal()
 
     def cancelled(self):
-        if hasattr(self, '_file'):
+        if self._file is not None:
-            sleep(0.1)
             self._file.close()
-        self.state = TOX_FILE_TRANSFER_STATE['CANCELLED']
+        self.set_state(FILE_TRANSFER_STATE['CANCELLED'])
-        self.signal()
 
     def pause(self, by_friend):
         if not by_friend:
             self.send_control(TOX_FILE_CONTROL['PAUSE'])
         else:
-            self.state = TOX_FILE_TRANSFER_STATE['PAUSED_BY_FRIEND']
+            self.set_state(FILE_TRANSFER_STATE['PAUSED_BY_FRIEND'])
-        self.signal()
 
     def send_control(self, control):
         if self._tox.file_control(self._friend_number, self._file_number, control):
-            self.state = control
+            self.set_state(control)
-            self.signal()
 
     def get_file_id(self):
         return self._tox.file_get_file_id(self._friend_number, self._file_number)
 
+    def _signal(self):
+        percentage = self._done / self._size if self._size else 0
+        if self._creation_time is None or not percentage:
+            t = -1
+        else:
+            t = ((time() - self._creation_time) / percentage) * (1 - percentage)
+        self._state_changed_event(self.state, percentage, int(t))
+
+    def _finished(self):
+        self._finished_event(self._friend_number, self._file_number)
+
 # -----------------------------------------------------------------------------------------------------------------
 # Send file
 # -----------------------------------------------------------------------------------------------------------------
@@ -130,12 +135,14 @@ class SendTransfer(FileTransfer):
 
     def __init__(self, path, tox, friend_number, kind=TOX_FILE_KIND['DATA'], file_id=None):
         if path is not None:
-            self._file = open(path, 'rb')
+            fl = open(path, 'rb')
             size = getsize(path)
         else:
+            fl = None
             size = 0
-        super(SendTransfer, self).__init__(path, tox, friend_number, size)
+        super().__init__(path, tox, friend_number, size)
-        self.state = TOX_FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
+        self._file = fl
+        self.state = FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
         self._file_number = tox.file_send(friend_number, kind, size, file_id,
                                           bytes(basename(path), 'utf-8') if path else b'')
         self._file_id = self.get_file_id()
@@ -153,12 +160,12 @@ class SendTransfer(FileTransfer):
             data = self._file.read(size)
             self._tox.file_send_chunk(self._friend_number, self._file_number, position, data)
             self._done += size
+            self._signal()
         else:
-            if hasattr(self, '_file'):
+            if self._file is not None:
                 self._file.close()
-            self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
+            self.state = FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self._finished()
-        self.signal()
 
 
 class SendAvatar(SendTransfer):
@@ -168,11 +175,11 @@ class SendAvatar(SendTransfer):
 
     def __init__(self, path, tox, friend_number):
         if path is None:
-            hash = None
+            avatar_hash = None
         else:
             with open(path, 'rb') as fl:
-                hash = Tox.hash(fl.read())
+                avatar_hash = Tox.hash(fl.read())
-        super(SendAvatar, self).__init__(path, tox, friend_number, TOX_FILE_KIND['AVATAR'], hash)
+        super().__init__(path, tox, friend_number, TOX_FILE_KIND['AVATAR'], avatar_hash)
 
 
 class SendFromBuffer(FileTransfer):
@@ -181,8 +188,8 @@ class SendFromBuffer(FileTransfer):
     """
 
     def __init__(self, tox, friend_number, data, file_name):
-        super(SendFromBuffer, self).__init__(None, tox, friend_number, len(data))
+        super().__init__(None, tox, friend_number, len(data))
-        self.state = TOX_FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
+        self.state = FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
         self._data = data
         self._file_number = tox.file_send(friend_number, TOX_FILE_KIND['DATA'],
                                           len(data), None, bytes(file_name, 'utf-8'))
@@ -190,6 +197,8 @@ class SendFromBuffer(FileTransfer):
     def get_data(self):
         return self._data
 
+    data = property(get_data)
+
     def send_chunk(self, position, size):
         if self._creation_time is None:
             self._creation_time = time()
@@ -198,18 +207,18 @@ class SendFromBuffer(FileTransfer):
             self._tox.file_send_chunk(self._friend_number, self._file_number, position, data)
             self._done += size
         else:
-            self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
+            self.state = FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self._finished()
-        self.signal()
+        self._signal()
 
 
 class SendFromFileBuffer(SendTransfer):
 
     def __init__(self, *args):
-        super(SendFromFileBuffer, self).__init__(*args)
+        super().__init__(*args)
 
     def send_chunk(self, position, size):
-        super(SendFromFileBuffer, self).send_chunk(position, size)
+        super().send_chunk(position, size)
         if not size:
             chdir(dirname(self._path))
             remove(self._path)
@@ -222,7 +231,7 @@ class SendFromFileBuffer(SendTransfer):
 class ReceiveTransfer(FileTransfer):
 
     def __init__(self, path, tox, friend_number, size, file_number, position=0):
-        super(ReceiveTransfer, self).__init__(path, tox, friend_number, size, file_number)
+        super().__init__(path, tox, friend_number, size, file_number)
         self._file = open(self._path, 'wb')
         self._file_size = position
         self._file.truncate(position)
@@ -231,11 +240,12 @@ class ReceiveTransfer(FileTransfer):
         self._done = position
 
     def cancel(self):
-        super(ReceiveTransfer, self).cancel()
+        super().cancel()
         remove(self._path)
 
     def total_size(self):
         self._missed.add(self._file_size)
+
         return min(self._missed)
 
     def write_chunk(self, position, data):
@@ -248,8 +258,8 @@ class ReceiveTransfer(FileTransfer):
             self._creation_time = time()
         if data is None:
             self._file.close()
-            self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
+            self.state = FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self._finished()
         else:
             data = bytearray(data)
             if self._file_size < position:
@@ -264,7 +274,7 @@ class ReceiveTransfer(FileTransfer):
             if position + l > self._file_size:
                 self._file_size = position + l
             self._done += l
-        self.signal()
+        self._signal()
 
 
 class ReceiveToBuffer(FileTransfer):
@@ -273,19 +283,21 @@ class ReceiveToBuffer(FileTransfer):
     """
 
     def __init__(self, tox, friend_number, size, file_number):
-        super(ReceiveToBuffer, self).__init__(None, tox, friend_number, size, file_number)
+        super().__init__(None, tox, friend_number, size, file_number)
         self._data = bytes()
         self._data_size = 0
 
     def get_data(self):
         return self._data
 
+    data = property(get_data)
+
     def write_chunk(self, position, data):
         if self._creation_time is None:
             self._creation_time = time()
         if data is None:
-            self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
+            self.state = FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self._finished()
         else:
             data = bytes(data)
             l = len(data)
@@ -295,7 +307,7 @@ class ReceiveToBuffer(FileTransfer):
             if position + l > self._data_size:
                 self._data_size = position + l
             self._done += l
-        self.signal()
+        self._signal()
 
 
 class ReceiveAvatar(ReceiveTransfer):
@@ -304,20 +316,17 @@ class ReceiveAvatar(ReceiveTransfer):
     """
     MAX_AVATAR_SIZE = 512 * 1024
 
-    def __init__(self, tox, friend_number, size, file_number):
+    def __init__(self, path, tox, friend_number, size, file_number):
-        path = settings.ProfileHelper.get_path() + 'avatars/{}.png'.format(tox.friend_get_public_key(friend_number))
+        full_path = path + '.tmp'
-        super(ReceiveAvatar, self).__init__(path + '.tmp', tox, friend_number, size, file_number)
+        super().__init__(full_path, 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')
+            remove(full_path)
         elif not size:
             self.send_control(TOX_FILE_CONTROL['CANCEL'])
             self._file.close()
-            if exists(path):
+            remove(full_path)
-                remove(path)
-            self._file.close()
-            remove(path + '.tmp')
         elif exists(path):
             hash = self.get_file_id()
             with open(path, 'rb') as fl:
@@ -326,22 +335,17 @@ class ReceiveAvatar(ReceiveTransfer):
             if hash == existing_hash:
                 self.send_control(TOX_FILE_CONTROL['CANCEL'])
                 self._file.close()
-                remove(path + '.tmp')
+                remove(full_path)
             else:
                 self.send_control(TOX_FILE_CONTROL['RESUME'])
         else:
             self.send_control(TOX_FILE_CONTROL['RESUME'])
 
     def write_chunk(self, position, data):
-        super(ReceiveAvatar, self).write_chunk(position, data)
+        if data is None:
-        if self.state:
             avatar_path = self._path[:-4]
             if exists(avatar_path):
                 chdir(dirname(avatar_path))
                 remove(avatar_path)
             rename(self._path, avatar_path)
-            self.finished(True)
+        super().write_chunk(position, data)
-
-    def finished(self, emit=False):
-        if emit:
-            super().finished()

toxygen/file_transfers/file_transfers_handler.py

@@ -0,0 +1,304 @@
+from messenger.messages import *
+from ui.contact_items import *
+import utils.util as util
+from common.tox_save import ToxSave
+
+
+class FileTransfersHandler(ToxSave):
+
+    def __init__(self, tox, settings, contact_provider, file_transfers_message_service, profile):
+        super().__init__(tox)
+        self._settings = settings
+        self._contact_provider = contact_provider
+        self._file_transfers_message_service = file_transfers_message_service
+        self._file_transfers = {}
+        # key = (friend number, file number), value - transfer instance
+        self._paused_file_transfers = dict(settings['paused_file_transfers'])
+        # key - file id, value: [path, friend number, is incoming, start position]
+        self._insert_inline_before = {}
+        # key = (friend number, file number), value - message id
+
+        profile.avatar_changed_event.add_callback(self._send_avatar_to_contacts)
+        
+    def stop(self):
+        self._settings['paused_file_transfers'] = self._paused_file_transfers if self._settings['resend_files'] else {}
+        self._settings.save()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # File transfers support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def incoming_file_transfer(self, friend_number, file_number, size, file_name):
+        """
+        New transfer
+        :param friend_number: number of friend who sent file
+        :param file_number: file number
+        :param size: file size in bytes
+        :param file_name: file name without path
+        """
+        friend = self._get_friend_by_number(friend_number)
+        auto = self._settings['allow_auto_accept'] and friend.tox_id in self._settings['auto_accept_from_friends']
+        inline = is_inline(file_name) and self._settings['allow_inline']
+        file_id = self._tox.file_get_file_id(friend_number, file_number)
+        accepted = True
+        if file_id in self._paused_file_transfers:
+            (path, ft_friend_number, is_incoming, start_position) = self._paused_file_transfers[file_id]
+            pos = start_position if os.path.exists(path) else 0
+            if pos >= size:
+                self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL'])
+                return
+            self._tox.file_seek(friend_number, file_number, pos)
+            self._file_transfers_message_service.add_incoming_transfer_message(
+                friend, accepted, size, file_name, file_number)
+            self.accept_transfer(path, friend_number, file_number, size, False, pos)
+        elif inline and size < 1024 * 1024:
+            self._file_transfers_message_service.add_incoming_transfer_message(
+                friend, accepted, size, file_name, file_number)
+            self.accept_transfer('', friend_number, file_number, size, True)
+        elif auto:
+            path = self._settings['auto_accept_path'] or util.curr_directory()
+            self._file_transfers_message_service.add_incoming_transfer_message(
+                friend, accepted, size, file_name, file_number)
+            self.accept_transfer(path + '/' + file_name, friend_number, file_number, size)
+        else:
+            accepted = False
+            self._file_transfers_message_service.add_incoming_transfer_message(
+                friend, accepted, size, file_name, file_number)
+
+    def cancel_transfer(self, friend_number, file_number, already_cancelled=False):
+        """
+        Stop transfer
+        :param friend_number: number of friend
+        :param file_number: file number
+        :param already_cancelled: was cancelled by friend
+        """
+        if (friend_number, file_number) in self._file_transfers:
+            tr = self._file_transfers[(friend_number, file_number)]
+            if not already_cancelled:
+                tr.cancel()
+            else:
+                tr.cancelled()
+            if (friend_number, file_number) in self._file_transfers:
+                del tr
+                del self._file_transfers[(friend_number, file_number)]
+        elif not already_cancelled:
+            self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL'])
+
+    def cancel_not_started_transfer(self, friend_number, message_id):
+        self._get_friend_by_number(friend_number).delete_one_unsent_file(message_id)
+
+    def pause_transfer(self, friend_number, file_number, by_friend=False):
+        """
+        Pause transfer with specified data
+        """
+        tr = self._file_transfers[(friend_number, file_number)]
+        tr.pause(by_friend)
+
+    def resume_transfer(self, friend_number, file_number, by_friend=False):
+        """
+        Resume transfer with specified data
+        """
+        tr = self._file_transfers[(friend_number, file_number)]
+        if by_friend:
+            tr.state = FILE_TRANSFER_STATE['RUNNING']
+        else:
+            tr.send_control(TOX_FILE_CONTROL['RESUME'])
+
+    def accept_transfer(self, path, friend_number, file_number, size, inline=False, from_position=0):
+        """
+        :param path: path for saving
+        :param friend_number: friend number
+        :param file_number: file number
+        :param size: file size
+        :param inline: is inline image
+        :param from_position: position for start
+        """
+        path = self._generate_valid_path(path, from_position)
+        friend = self._get_friend_by_number(friend_number)
+        if not inline:
+            rt = ReceiveTransfer(path, self._tox, friend_number, size, file_number, from_position)
+        else:
+            rt = ReceiveToBuffer(self._tox, friend_number, size, file_number)
+        rt.set_transfer_finished_handler(self.transfer_finished)
+        message = friend.get_message(lambda m: m.type == MESSAGE_TYPE['FILE_TRANSFER']
+                                               and m.state in (FILE_TRANSFER_STATE['INCOMING_NOT_STARTED'],
+                                                               FILE_TRANSFER_STATE['RUNNING'])
+                                               and m.file_number == file_number)
+        rt.set_state_changed_handler(message.transfer_updated)
+        self._file_transfers[(friend_number, file_number)] = rt
+        rt.send_control(TOX_FILE_CONTROL['RESUME'])
+        if inline:
+            self._insert_inline_before[(friend_number, file_number)] = message.message_id
+
+    def send_screenshot(self, data, friend_number):
+        """
+        Send screenshot
+        :param data: raw data - png format
+        :param friend_number: friend number
+        """
+        self.send_inline(data, 'toxygen_inline.png', friend_number)
+
+    def send_sticker(self, path, friend_number):
+        with open(path, 'rb') as fl:
+            data = fl.read()
+        self.send_inline(data, 'sticker.png', friend_number)
+
+    def send_inline(self, data, file_name, friend_number, is_resend=False):
+        friend = self._get_friend_by_number(friend_number)
+        if friend.status is None and not is_resend:
+            self._file_transfers_message_service.add_unsent_file_message(friend, file_name, data)
+            return
+        elif friend.status is None and is_resend:
+            raise RuntimeError()
+        st = SendFromBuffer(self._tox, friend.number, data, file_name)
+        self._send_file_add_set_handlers(st, friend, file_name, True)
+
+    def send_file(self, path, friend_number, is_resend=False, file_id=None):
+        """
+        Send file to current active friend
+        :param path: file path
+        :param friend_number: friend_number
+        :param is_resend: is 'offline' message
+        :param file_id: file id of transfer
+        """
+        friend = self._get_friend_by_number(friend_number)
+        if friend.status is None and not is_resend:
+            self._file_transfers_message_service.add_unsent_file_message(friend, path, None)
+            return
+        elif friend.status is None and is_resend:
+            print('Error in sending')
+            return
+        st = SendTransfer(path, self._tox, friend_number, TOX_FILE_KIND['DATA'], file_id)
+        file_name = os.path.basename(path)
+        self._send_file_add_set_handlers(st, friend, file_name)
+
+    def incoming_chunk(self, friend_number, file_number, position, data):
+        """
+        Incoming chunk
+        """
+        self._file_transfers[(friend_number, file_number)].write_chunk(position, data)
+
+    def outgoing_chunk(self, friend_number, file_number, position, size):
+        """
+        Outgoing chunk
+        """
+        self._file_transfers[(friend_number, file_number)].send_chunk(position, size)
+
+    def transfer_finished(self, friend_number, file_number):
+        transfer = self._file_transfers[(friend_number, file_number)]
+        t = type(transfer)
+        if t is ReceiveAvatar:
+            self._get_friend_by_number(friend_number).load_avatar()
+        elif t is ReceiveToBuffer or (t is SendFromBuffer and self._settings['allow_inline']):  # inline image
+            print('inline')
+            inline = InlineImageMessage(transfer.data)
+            message_id = self._insert_inline_before[(friend_number, file_number)]
+            del self._insert_inline_before[(friend_number, file_number)]
+            index = self._get_friend_by_number(friend_number).insert_inline(message_id, inline)
+            self._file_transfers_message_service.add_inline_message(transfer, index)
+        del self._file_transfers[(friend_number, file_number)]
+
+    def send_files(self, friend_number):
+        friend = self._get_friend_by_number(friend_number)
+        friend.remove_invalid_unsent_files()
+        files = friend.get_unsent_files()
+        try:
+            for fl in files:
+                data, path = fl.data, fl.path
+                if data is not None:
+                    self.send_inline(data, path, friend_number, True)
+                else:
+                    self.send_file(path, friend_number, True)
+            friend.clear_unsent_files()
+            for key in self._paused_file_transfers.keys():
+                (path, ft_friend_number, is_incoming, start_position) = self._paused_file_transfers[key]
+                if not os.path.exists(path):
+                    del self._paused_file_transfers[key]
+                elif ft_friend_number == friend_number and not is_incoming:
+                    self.send_file(path, friend_number, True, key)
+                    del self._paused_file_transfers[key]
+        except Exception as ex:
+            print('Exception in file sending: ' + str(ex))
+
+    def friend_exit(self, friend_number):
+        for friend_num, file_num in self._file_transfers.keys():
+            if friend_num != friend_number:
+                continue
+            ft = self._file_transfers[(friend_num, file_num)]
+            if type(ft) is SendTransfer:
+                self._paused_file_transfers[ft.file_id] = [ft.path, friend_num, False, -1]
+            elif type(ft) is ReceiveTransfer and ft.state != FILE_TRANSFER_STATE['INCOMING_NOT_STARTED']:
+                self._paused_file_transfers[ft.file_id] = [ft.path, friend_num, True, ft.total_size()]
+            self.cancel_transfer(friend_num, file_num, True)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Avatars support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def send_avatar(self, friend_number, avatar_path=None):
+        """
+        :param friend_number: number of friend who should get new avatar
+        :param avatar_path: path to avatar or None if reset
+        """
+        sa = SendAvatar(avatar_path, self._tox, friend_number)
+        self._file_transfers[(friend_number, sa.file_number)] = sa
+
+    def incoming_avatar(self, friend_number, file_number, size):
+        """
+        Friend changed avatar
+        :param friend_number: friend number
+        :param file_number: file number
+        :param size: size of avatar or 0 (default avatar)
+        """
+        friend = self._get_friend_by_number(friend_number)
+        ra = ReceiveAvatar(friend.get_contact_avatar_path(), self._tox, friend_number, size, file_number)
+        if ra.state != FILE_TRANSFER_STATE['CANCELLED']:
+            self._file_transfers[(friend_number, file_number)] = ra
+            ra.set_transfer_finished_handler(self.transfer_finished)
+        elif not size:
+            friend.reset_avatar(self._settings['identicons'])
+
+    def _send_avatar_to_contacts(self, _):
+        friends = self._get_all_friends()
+        for friend in filter(self._is_friend_online, friends):
+            self.send_avatar(friend.number)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _is_friend_online(self, friend_number):
+        friend = self._get_friend_by_number(friend_number)
+
+        return friend.status is not None
+
+    def _get_friend_by_number(self, friend_number):
+        return self._contact_provider.get_friend_by_number(friend_number)
+
+    def _get_all_friends(self):
+        return self._contact_provider.get_all_friends()
+
+    def _send_file_add_set_handlers(self, st, friend, file_name, inline=False):
+        st.set_transfer_finished_handler(self.transfer_finished)
+        file_number = st.get_file_number()
+        self._file_transfers[(friend.number, file_number)] = st
+        tm = self._file_transfers_message_service.add_outgoing_transfer_message(friend, st.size, file_name, file_number)
+        st.set_state_changed_handler(tm.transfer_updated)
+        if inline:
+            self._insert_inline_before[(friend.number, file_number)] = tm.message_id
+
+    @staticmethod
+    def _generate_valid_path(path, from_position):
+        path, file_name = os.path.split(path)
+        new_file_name, i = file_name, 1
+        if not from_position:
+            while os.path.isfile(join_path(path, new_file_name)):  # file with same name already exists
+                if '.' in file_name:  # has extension
+                    d = file_name.rindex('.')
+                else:  # no extension
+                    d = len(file_name)
+                new_file_name = file_name[:d] + ' ({})'.format(i) + file_name[d:]
+                i += 1
+        path = join_path(path, new_file_name)
+
+        return path

toxygen/file_transfers/file_transfers_messages_service.py

@@ -0,0 +1,78 @@
+from messenger.messenger import *
+import utils.util as util
+from file_transfers.file_transfers import *
+
+
+class FileTransfersMessagesService:
+
+    def __init__(self, contacts_manager, messages_items_factory, profile, main_screen):
+        self._contacts_manager = contacts_manager
+        self._messages_items_factory = messages_items_factory
+        self._profile = profile
+        self._messages = main_screen.messages
+
+    def add_incoming_transfer_message(self, friend, accepted, size, file_name, file_number):
+        author = MessageAuthor(friend.name, MESSAGE_AUTHOR['FRIEND'])
+        status = FILE_TRANSFER_STATE['RUNNING'] if accepted else FILE_TRANSFER_STATE['INCOMING_NOT_STARTED']
+        tm = TransferMessage(author, util.get_unix_time(), status, size, file_name, friend.number, file_number)
+
+        if self._is_friend_active(friend.number):
+            self._create_file_transfer_item(tm)
+            self._messages.scrollToBottom()
+        else:
+            friend.actions = True
+
+        friend.append_message(tm)
+
+        return tm
+
+    def add_outgoing_transfer_message(self, friend, size, file_name, file_number):
+        author = MessageAuthor(self._profile.name, MESSAGE_AUTHOR['ME'])
+        status = FILE_TRANSFER_STATE['OUTGOING_NOT_STARTED']
+        tm = TransferMessage(author, util.get_unix_time(), status, size, file_name, friend.number, file_number)
+
+        if self._is_friend_active(friend.number):
+            self._create_file_transfer_item(tm)
+            self._messages.scrollToBottom()
+
+        friend.append_message(tm)
+
+        return tm
+
+    def add_inline_message(self, transfer, index):
+        if not self._is_friend_active(transfer.friend_number):
+            return
+        count = self._messages.count()
+        if count + index + 1 >= 0:
+            self._create_inline_item(transfer.data, count + index + 1)
+
+    def add_unsent_file_message(self, friend, file_path, data):
+        author = MessageAuthor(self._profile.name, MESSAGE_AUTHOR['ME'])
+        size = os.path.getsize(file_path) if data is None else len(data)
+        tm = UnsentFileMessage(file_path, data, util.get_unix_time(), author, size, friend.number)
+        friend.append_message(tm)
+
+        if self._is_friend_active(friend.number):
+            self._create_unsent_file_item(tm)
+            self._messages.scrollToBottom()
+
+        return tm
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _is_friend_active(self, friend_number):
+        if not self._contacts_manager.is_active_a_friend():
+            return False
+
+        return friend_number == self._contacts_manager.get_active_number()
+
+    def _create_file_transfer_item(self, tm):
+        return self._messages_items_factory.create_file_transfer_item(tm)
+
+    def _create_inline_item(self, data, position):
+        return self._messages_items_factory.create_inline_item(data, False, position)
+
+    def _create_unsent_file_item(self, tm):
+        return self._messages_items_factory.create_unsent_file_item(tm)

toxygen/friend.py

@@ -1,75 +0,0 @@
-import contact
-from messages import *
-import os
-
-
-class Friend(contact.Contact):
-    """
-    Friend in list of friends.
-    """
-
-    def __init__(self, message_getter, number, name, status_message, widget, tox_id):
-        super().__init__(message_getter, number, name, status_message, widget, tox_id)
-        self._receipts = 0
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # File transfers support
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def update_transfer_data(self, file_number, status, inline=None):
-        """
-        Update status of active transfer and load inline if needed
-        """
-        try:
-            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
-                self._corr.insert(i, inline)
-            return i - len(self._corr)
-        except:
-            pass
-
-    def get_unsent_files(self):
-        messages = filter(lambda x: type(x) is UnsentFile, self._corr)
-        return messages
-
-    def clear_unsent_files(self):
-        self._corr = list(filter(lambda x: type(x) is not UnsentFile, self._corr))
-
-    def remove_invalid_unsent_files(self):
-        def is_valid(message):
-            if type(message) is not UnsentFile:
-                return True
-            if message.get_data()[1] is not None:
-                return True
-            return os.path.exists(message.get_data()[0])
-        self._corr = list(filter(is_valid, self._corr))
-
-    def delete_one_unsent_file(self, time):
-        self._corr = list(filter(lambda x: not (type(x) is UnsentFile and x.get_data()[2] == time), self._corr))
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # History support
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def get_receipts(self):
-        return self._receipts
-
-    receipts = property(get_receipts)  # read receipts
-
-    def inc_receipts(self):
-        self._receipts += 1
-
-    def dec_receipt(self):
-        if self._receipts:
-            self._receipts -= 1
-            self.mark_as_sent()
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Full status
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def get_full_status(self):
-        return self._status_message

toxygen/group_chat.py

@@ -1,49 +0,0 @@
-import contact
-import util
-from PyQt5 import QtGui, QtCore
-import toxcore_enums_and_consts as constants
-
-
-class GroupChat(contact.Contact):
-
-    def __init__(self, name, status_message, widget, tox, group_number):
-        super().__init__(None, group_number, name, status_message, widget, None)
-        self._tox = tox
-        self.set_status(constants.TOX_USER_STATUS['NONE'])
-
-    def set_name(self, name):
-        self._tox.group_set_title(self._number, name)
-        super().set_name(name)
-
-    def send_message(self, message):
-        self._tox.group_message_send(self._number, message.encode('utf-8'))
-
-    def new_title(self, title):
-        super().set_name(title)
-
-    def load_avatar(self):
-        path = util.curr_directory() + '/images/group.png'
-        width = self._widget.avatar_label.width()
-        pixmap = QtGui.QPixmap(path)
-        self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio,
-                                                          QtCore.Qt.SmoothTransformation))
-        self._widget.avatar_label.repaint()
-
-    def remove_invalid_unsent_files(self):
-        pass
-
-    def get_names(self):
-        peers_count = self._tox.group_number_peers(self._number)
-        names = []
-        for i in range(peers_count):
-            name = self._tox.group_peername(self._number, i)
-            names.append(name)
-        names = sorted(names, key=lambda n: n.lower())
-        return names
-
-    def get_full_status(self):
-        names = self.get_names()
-        return '\n'.join(names)
-
-    def get_peer_name(self, peer_number):
-        return self._tox.group_peername(self._number, peer_number)

toxygen/groups/group_ban.py

@@ -0,0 +1,23 @@
+
+
+class GroupBan:
+
+    def __init__(self, ban_id, ban_target, ban_time):
+        self._ban_id = ban_id
+        self._ban_target = ban_target
+        self._ban_time = ban_time
+
+    def get_ban_id(self):
+        return self._ban_id
+
+    ban_id = property(get_ban_id)
+
+    def get_ban_target(self):
+        return self._ban_target
+
+    ban_target = property(get_ban_target)
+
+    def get_ban_time(self):
+        return self._ban_time
+
+    ban_time = property(get_ban_time)

toxygen/groups/group_invite.py

@@ -0,0 +1,23 @@
+
+
+class GroupInvite:
+
+    def __init__(self, friend_public_key, chat_name, invite_data):
+        self._friend_public_key = friend_public_key
+        self._chat_name = chat_name
+        self._invite_data = invite_data[:]
+
+    def get_friend_public_key(self):
+        return self._friend_public_key
+
+    friend_public_key = property(get_friend_public_key)
+
+    def get_chat_name(self):
+        return self._chat_name
+
+    chat_name = property(get_chat_name)
+
+    def get_invite_data(self):
+        return self._invite_data[:]
+
+    invite_data = property(get_invite_data)

toxygen/groups/group_peer.py

@@ -0,0 +1,70 @@
+
+
+class GroupChatPeer:
+    """
+    Represents peer in group chat.
+    """
+
+    def __init__(self, peer_id, name, status, role, public_key, is_current_user=False, is_muted=False):
+        self._peer_id = peer_id
+        self._name = name
+        self._status = status
+        self._role = role
+        self._public_key = public_key
+        self._is_current_user = is_current_user
+        self._is_muted = is_muted
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Readonly properties
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_id(self):
+        return self._peer_id
+
+    id = property(get_id)
+
+    def get_public_key(self):
+        return self._public_key
+
+    public_key = property(get_public_key)
+
+    def get_is_current_user(self):
+        return self._is_current_user
+
+    is_current_user = property(get_is_current_user)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Read-write properties
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_name(self):
+        return self._name
+
+    def set_name(self, name):
+        self._name = name
+
+    name = property(get_name, set_name)
+
+    def get_status(self):
+        return self._status
+
+    def set_status(self, status):
+        self._status = status
+
+    status = property(get_status, set_status)
+
+    def get_role(self):
+        return self._role
+
+    def set_role(self, role):
+        self._role = role
+
+    role = property(get_role, set_role)
+
+    def get_is_muted(self):
+        return self._is_muted
+
+    def set_is_muted(self, is_muted):
+        self._is_muted = is_muted
+
+    is_muted = property(get_is_muted, set_is_muted)

toxygen/groups/groups_service.py

@@ -0,0 +1,242 @@
+import common.tox_save as tox_save
+import utils.ui as util_ui
+from groups.peers_list import PeersListGenerator
+from groups.group_invite import GroupInvite
+import wrapper.toxcore_enums_and_consts as constants
+
+
+class GroupsService(tox_save.ToxSave):
+
+    def __init__(self, tox, contacts_manager, contacts_provider, main_screen, widgets_factory_provider):
+        super().__init__(tox)
+        self._contacts_manager = contacts_manager
+        self._contacts_provider = contacts_provider
+        self._main_screen = main_screen
+        self._peers_list_widget = main_screen.peers_list
+        self._widgets_factory_provider = widgets_factory_provider
+        self._group_invites = []
+        self._screen = None
+
+    def set_tox(self, tox):
+        super().set_tox(tox)
+        for group in self._get_all_groups():
+            group.set_tox(tox)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Groups creation
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def create_new_gc(self, name, privacy_state, nick, status):
+        group_number = self._tox.group_new(privacy_state, name, nick, status)
+        if group_number == -1:
+            return
+
+        self._add_new_group_by_number(group_number)
+        group = self._get_group_by_number(group_number)
+        group.status = constants.TOX_USER_STATUS['NONE']
+        self._contacts_manager.update_filtration()
+
+    def join_gc_by_id(self, chat_id, password, nick, status):
+        group_number = self._tox.group_join(chat_id, password, nick, status)
+        self._add_new_group_by_number(group_number)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Groups reconnect and leaving
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def leave_group(self, group_number):
+        self._tox.group_leave(group_number)
+        self._contacts_manager.delete_group(group_number)
+
+    def disconnect_from_group(self, group_number):
+        self._tox.group_disconnect(group_number)
+        group = self._get_group_by_number(group_number)
+        group.status = None
+        self._clear_peers_list(group)
+
+    def reconnect_to_group(self, group_number):
+        self._tox.group_reconnect(group_number)
+        group = self._get_group_by_number(group_number)
+        group.status = constants.TOX_USER_STATUS['NONE']
+        self._clear_peers_list(group)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group invites
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def invite_friend(self, friend_number, group_number):
+        self._tox.group_invite_friend(group_number, friend_number)
+
+    def process_group_invite(self, friend_number, group_name, invite_data):
+        friend = self._get_friend_by_number(friend_number)
+        invite = GroupInvite(friend.tox_id, group_name, invite_data)
+        self._group_invites.append(invite)
+        self._update_invites_button_state()
+
+    def accept_group_invite(self, invite, name, status, password):
+        pk = invite.friend_public_key
+        friend = self._get_friend_by_public_key(pk)
+        self._join_gc_via_invite(invite.invite_data, friend.number, name, status, password)
+        self._delete_group_invite(invite)
+        self._update_invites_button_state()
+
+    def decline_group_invite(self, invite):
+        self._delete_group_invite(invite)
+        self._main_screen.update_gc_invites_button_state()
+
+    def get_group_invites(self):
+        return self._group_invites[:]
+
+    group_invites = property(get_group_invites)
+
+    def get_group_invites_count(self):
+        return len(self._group_invites)
+
+    group_invites_count = property(get_group_invites_count)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group info methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def update_group_info(self, group):
+        group.name = self._tox.group_get_name(group.number)
+        group.status_message = self._tox.group_get_topic(group.number)
+
+    def set_group_topic(self, group):
+        if not group.is_self_moderator_or_founder():
+            return
+        text = util_ui.tr('New topic for group "{}":'.format(group.name))
+        title = util_ui.tr('Set group topic')
+        topic, ok = util_ui.text_dialog(text, title, group.status_message)
+        if not ok or not topic:
+            return
+        self._tox.group_set_topic(group.number, topic)
+        group.status_message = topic
+
+    def show_group_management_screen(self, group):
+        widgets_factory = self._get_widgets_factory()
+        self._screen = widgets_factory.create_group_management_screen(group)
+        self._screen.show()
+
+    def show_group_settings_screen(self, group):
+        widgets_factory = self._get_widgets_factory()
+        self._screen = widgets_factory.create_group_settings_screen(group)
+        self._screen.show()
+
+    def set_group_password(self, group, password):
+        if group.password == password:
+            return
+        self._tox.group_founder_set_password(group.number, password)
+        group.password = password
+
+    def set_group_peers_limit(self, group, peers_limit):
+        if group.peers_limit == peers_limit:
+            return
+        self._tox.group_founder_set_peer_limit(group.number, peers_limit)
+        group.peers_limit = peers_limit
+
+    def set_group_privacy_state(self, group, privacy_state):
+        is_private = privacy_state == constants.TOX_GROUP_PRIVACY_STATE['PRIVATE']
+        if group.is_private == is_private:
+            return
+        self._tox.group_founder_set_privacy_state(group.number, privacy_state)
+        group.is_private = is_private
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Peers list
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def generate_peers_list(self):
+        if not self._contacts_manager.is_active_a_group():
+            return
+        group = self._contacts_manager.get_curr_contact()
+        PeersListGenerator().generate(group.peers, self, self._peers_list_widget, group.tox_id)
+
+    def peer_selected(self, chat_id, peer_id):
+        widgets_factory = self._get_widgets_factory()
+        group = self._get_group_by_public_key(chat_id)
+        self_peer = group.get_self_peer()
+        if self_peer.id != peer_id:
+            self._screen = widgets_factory.create_peer_screen_window(group, peer_id)
+        else:
+            self._screen = widgets_factory.create_self_peer_screen_window(group)
+        self._screen.show()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Peers actions
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def set_new_peer_role(self, group, peer, role):
+        self._tox.group_mod_set_role(group.number, peer.id, role)
+        peer.role = role
+        self.generate_peers_list()
+
+    def toggle_ignore_peer(self, group, peer, ignore):
+        self._tox.group_toggle_ignore(group.number, peer.id, ignore)
+        peer.is_muted = ignore
+
+    def set_self_info(self, group, name, status):
+        self._tox.group_self_set_name(group.number, name)
+        self._tox.group_self_set_status(group.number, status)
+        self_peer = group.get_self_peer()
+        self_peer.name = name
+        self_peer.status = status
+        self.generate_peers_list()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Bans support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def show_bans_list(self, group):
+        widgets_factory = self._get_widgets_factory()
+        self._screen = widgets_factory.create_groups_bans_screen(group)
+        self._screen.show()
+
+    def ban_peer(self, group, peer_id, ban_type):
+        self._tox.group_mod_ban_peer(group.number, peer_id, ban_type)
+
+    def kick_peer(self, group, peer_id):
+        self._tox.group_mod_remove_peer(group.number, peer_id)
+
+    def cancel_ban(self, group_number, ban_id):
+        self._tox.group_mod_remove_ban(group_number, ban_id)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _add_new_group_by_number(self, group_number):
+        self._contacts_manager.add_group(group_number)
+
+    def _get_group_by_number(self, group_number):
+        return self._contacts_provider.get_group_by_number(group_number)
+
+    def _get_group_by_public_key(self, public_key):
+        return self._contacts_provider.get_group_by_public_key(public_key)
+
+    def _get_all_groups(self):
+        return self._contacts_provider.get_all_groups()
+
+    def _get_friend_by_number(self, friend_number):
+        return self._contacts_provider.get_friend_by_number(friend_number)
+
+    def _get_friend_by_public_key(self, public_key):
+        return self._contacts_provider.get_friend_by_public_key(public_key)
+
+    def _clear_peers_list(self, group):
+        group.remove_all_peers_except_self()
+        self.generate_peers_list()
+
+    def _delete_group_invite(self, invite):
+        if invite in self._group_invites:
+            self._group_invites.remove(invite)
+
+    def _join_gc_via_invite(self, invite_data, friend_number, nick, status, password):
+        group_number = self._tox.group_invite_accept(invite_data, friend_number, nick, status, password)
+        self._add_new_group_by_number(group_number)
+
+    def _update_invites_button_state(self):
+        self._main_screen.update_gc_invites_button_state()
+
+    def _get_widgets_factory(self):
+        return self._widgets_factory_provider.get_item()

toxygen/groups/peers_list.py

@@ -0,0 +1,104 @@
+from ui.group_peers_list import PeerItem, PeerTypeItem
+from wrapper.toxcore_enums_and_consts import *
+from ui.widgets import *
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Builder
+# -----------------------------------------------------------------------------------------------------------------
+
+
+class PeerListBuilder:
+
+    def __init__(self):
+        self._peers = {}
+        self._titles = {}
+        self._index = 0
+        self._handler = None
+
+    def with_click_handler(self, handler):
+        self._handler = handler
+
+        return self
+
+    def with_title(self, title):
+        self._titles[self._index] = title
+        self._index += 1
+
+        return self
+
+    def with_peers(self, peers):
+        for peer in peers:
+            self._add_peer(peer)
+
+        return self
+
+    def build(self, list_widget):
+        list_widget.clear()
+
+        for i in range(self._index):
+            if i in self._peers:
+                peer = self._peers[i]
+                self._add_peer_item(peer, list_widget)
+            else:
+                title = self._titles[i]
+                self._add_peer_type_item(title, list_widget)
+
+    def _add_peer_item(self, peer, parent):
+        item = PeerItem(peer, self._handler, parent.width(), parent)
+        self._add_item(parent, item)
+
+    def _add_peer_type_item(self, text, parent):
+        item = PeerTypeItem(text, parent.width(), parent)
+        self._add_item(parent, item)
+
+    @staticmethod
+    def _add_item(parent, item):
+        elem = QtWidgets.QListWidgetItem(parent)
+        elem.setSizeHint(QtCore.QSize(parent.width(), item.height()))
+        parent.addItem(elem)
+        parent.setItemWidget(elem, item)
+
+    def _add_peer(self, peer):
+        self._peers[self._index] = peer
+        self._index += 1
+
+# -----------------------------------------------------------------------------------------------------------------
+# Generators
+# -----------------------------------------------------------------------------------------------------------------
+
+
+class PeersListGenerator:
+
+    @staticmethod
+    def generate(peers_list, groups_service, list_widget, chat_id):
+        admin_title = util_ui.tr('Administrator')
+        moderators_title = util_ui.tr('Moderators')
+        users_title = util_ui.tr('Users')
+        observers_title = util_ui.tr('Observers')
+
+        admins = list(filter(lambda p: p.role == TOX_GROUP_ROLE['FOUNDER'], peers_list))
+        moderators = list(filter(lambda p: p.role == TOX_GROUP_ROLE['MODERATOR'], peers_list))
+        users = list(filter(lambda p: p.role == TOX_GROUP_ROLE['USER'], peers_list))
+        observers = list(filter(lambda p: p.role == TOX_GROUP_ROLE['OBSERVER'], peers_list))
+
+        builder = (PeerListBuilder()
+                   .with_click_handler(lambda peer_id: groups_service.peer_selected(chat_id, peer_id)))
+        if len(admins):
+            (builder
+             .with_title(admin_title)
+             .with_peers(admins))
+        if len(moderators):
+            (builder
+             .with_title(moderators_title)
+             .with_peers(moderators))
+        if len(users):
+            (builder
+             .with_title(users_title)
+             .with_peers(users))
+        if len(observers):
+            (builder
+             .with_title(observers_title)
+             .with_peers(observers))
+
+        builder.build(list_widget)

toxygen/history.py

@@ -1,215 +0,0 @@
-from sqlite3 import connect
-import settings
-from os import chdir
-import os.path
-from toxes import ToxES
-
-
-PAGE_SIZE = 42
-
-TIMEOUT = 11
-
-SAVE_MESSAGES = 250
-
-MESSAGE_OWNER = {
-    'ME': 0,
-    'FRIEND': 1,
-    'NOT_SENT': 2
-}
-
-
-class History:
-
-    def __init__(self, name):
-        self._name = name
-        chdir(settings.ProfileHelper.get_path())
-        path = settings.ProfileHelper.get_path() + self._name + '.hstr'
-        if os.path.exists(path):
-            decr = ToxES.get_instance()
-            try:
-                with open(path, 'rb') as fin:
-                    data = fin.read()
-                if decr.is_data_encrypted(data):
-                    data = decr.pass_decrypt(data)
-                    with open(path, 'wb') as fout:
-                        fout.write(data)
-            except:
-                os.remove(path)
-        db = connect(name + '.hstr', timeout=TIMEOUT)
-        cursor = db.cursor()
-        cursor.execute('CREATE TABLE IF NOT EXISTS friends('
-                       '    tox_id TEXT PRIMARY KEY'
-                       ')')
-        db.close()
-
-    def save(self):
-        encr = ToxES.get_instance()
-        if encr.has_password():
-            path = settings.ProfileHelper.get_path() + self._name + '.hstr'
-            with open(path, 'rb') as fin:
-                data = fin.read()
-            data = encr.pass_encrypt(bytes(data))
-            with open(path, 'wb') as fout:
-                fout.write(data)
-
-    def export(self, directory):
-        path = settings.ProfileHelper.get_path() + self._name + '.hstr'
-        new_path = directory + self._name + '.hstr'
-        with open(path, 'rb') as fin:
-            data = fin.read()
-        encr = ToxES.get_instance()
-        if encr.has_password():
-            data = encr.pass_encrypt(data)
-        with open(new_path, 'wb') as fout:
-            fout.write(data)
-
-    def add_friend_to_db(self, tox_id):
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        try:
-            cursor = db.cursor()
-            cursor.execute('INSERT INTO friends VALUES (?);', (tox_id, ))
-            cursor.execute('CREATE TABLE id' + tox_id + '('
-                           '    id INTEGER PRIMARY KEY,'
-                           '    message TEXT,'
-                           '    owner INTEGER,'
-                           '    unix_time REAL,'
-                           '    message_type INTEGER'
-                           ')')
-            db.commit()
-        except:
-            print('Database is locked!')
-            db.rollback()
-        finally:
-            db.close()
-
-    def delete_friend_from_db(self, tox_id):
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        try:
-            cursor = db.cursor()
-            cursor.execute('DELETE FROM friends WHERE tox_id=?;', (tox_id, ))
-            cursor.execute('DROP TABLE id' + tox_id + ';')
-            db.commit()
-        except:
-            print('Database is locked!')
-            db.rollback()
-        finally:
-            db.close()
-
-    def friend_exists_in_db(self, tox_id):
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        cursor = db.cursor()
-        cursor.execute('SELECT 0 FROM friends WHERE tox_id=?', (tox_id, ))
-        result = cursor.fetchone()
-        db.close()
-        return result is not None
-
-    def save_messages_to_db(self, tox_id, messages_iter):
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        try:
-            cursor = db.cursor()
-            cursor.executemany('INSERT INTO id' + tox_id + '(message, owner, unix_time, message_type) '
-                               'VALUES (?, ?, ?, ?);', messages_iter)
-            db.commit()
-        except:
-            print('Database is locked!')
-            db.rollback()
-        finally:
-            db.close()
-
-    def update_messages(self, tox_id, unsent_time):
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        try:
-            cursor = db.cursor()
-            cursor.execute('UPDATE id' + tox_id + ' SET owner = 0 '
-                           'WHERE unix_time < ' + str(unsent_time) + ' AND owner = 2;')
-            db.commit()
-        except:
-            print('Database is locked!')
-            db.rollback()
-        finally:
-            db.close()
-
-    def delete_message(self, tox_id, time):
-        start, end = str(time - 0.01), str(time + 0.01)
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        try:
-            cursor = db.cursor()
-            cursor.execute('DELETE FROM id' + tox_id + ' WHERE unix_time < ' + end + ' AND unix_time > ' +
-                           start + ';')
-            db.commit()
-        except:
-            print('Database is locked!')
-            db.rollback()
-        finally:
-            db.close()
-
-    def delete_messages(self, tox_id):
-        chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
-        try:
-            cursor = db.cursor()
-            cursor.execute('DELETE FROM id' + tox_id + ';')
-            db.commit()
-        except:
-            print('Database is locked!')
-            db.rollback()
-        finally:
-            db.close()
-
-    def messages_getter(self, tox_id):
-        return History.MessageGetter(self._name, tox_id)
-
-    class MessageGetter:
-
-        def __init__(self, name, tox_id):
-            self._count = 0
-            self._name = name
-            self._tox_id = tox_id
-            self._db = self._cursor = None
-
-        def connect(self):
-            chdir(settings.ProfileHelper.get_path())
-            self._db = connect(self._name + '.hstr', timeout=TIMEOUT)
-            self._cursor = self._db.cursor()
-            self._cursor.execute('SELECT message, owner, unix_time, message_type FROM id' + self._tox_id +
-                                 ' ORDER BY unix_time DESC;')
-
-        def disconnect(self):
-            self._db.close()
-
-        def get_one(self):
-            self.connect()
-            self.skip()
-            data = self._cursor.fetchone()
-            self._count += 1
-            self.disconnect()
-            return data
-
-        def get_all(self):
-            self.connect()
-            data = self._cursor.fetchall()
-            self.disconnect()
-            self._count = len(data)
-            return data
-
-        def get(self, count):
-            self.connect()
-            self.skip()
-            data = self._cursor.fetchmany(count)
-            self.disconnect()
-            self._count += len(data)
-            return data
-
-        def skip(self):
-            if self._count:
-                self._cursor.fetchmany(self._count)
-
-        def delete_one(self):
-            if self._count:
-                self._count -= 1

toxygen/history/database.py

@@ -0,0 +1,201 @@
+from sqlite3 import connect
+import os.path
+import utils.util as util
+
+
+TIMEOUT = 11
+
+SAVE_MESSAGES = 500
+
+MESSAGE_AUTHOR = {
+    'ME': 0,
+    'FRIEND': 1,
+    'NOT_SENT': 2,
+    'GC_PEER': 3
+}
+
+CONTACT_TYPE = {
+    'FRIEND': 0,
+    'GC_PEER': 1,
+    'GC_PEER_PRIVATE': 2
+}
+
+
+class Database:
+
+    def __init__(self, path, toxes):
+        self._path, self._toxes = path, toxes
+        self._name = os.path.basename(path)
+        if os.path.exists(path):
+            try:
+                with open(path, 'rb') as fin:
+                    data = fin.read()
+                if toxes.is_data_encrypted(data):
+                    data = toxes.pass_decrypt(data)
+                    with open(path, 'wb') as fout:
+                        fout.write(data)
+            except Exception as ex:
+                util.log('Db reading error: ' + str(ex))
+                os.remove(path)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Public methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def save(self):
+        if self._toxes.has_password():
+            with open(self._path, 'rb') as fin:
+                data = fin.read()
+            data = self._toxes.pass_encrypt(bytes(data))
+            with open(self._path, 'wb') as fout:
+                fout.write(data)
+
+    def export(self, directory):
+        new_path = util.join_path(directory, self._name)
+        with open(self._path, 'rb') as fin:
+            data = fin.read()
+        if self._toxes.has_password():
+            data = self._toxes.pass_encrypt(data)
+        with open(new_path, 'wb') as fout:
+            fout.write(data)
+
+    def add_friend_to_db(self, tox_id):
+        db = self._connect()
+        try:
+            cursor = db.cursor()
+            cursor.execute('CREATE TABLE IF NOT EXISTS id' + tox_id + '('
+                           '    id INTEGER PRIMARY KEY,'
+                           '    author_name TEXT,'
+                           '    message TEXT,'
+                           '    author_type INTEGER,'
+                           '    unix_time REAL,'
+                           '    message_type INTEGER'
+                           ')')
+            db.commit()
+        except:
+            print('Database is locked!')
+            db.rollback()
+        finally:
+            db.close()
+
+    def delete_friend_from_db(self, tox_id):
+        db = self._connect()
+        try:
+            cursor = db.cursor()
+            cursor.execute('DROP TABLE id' + tox_id + ';')
+            db.commit()
+        except:
+            print('Database is locked!')
+            db.rollback()
+        finally:
+            db.close()
+
+    def save_messages_to_db(self, tox_id, messages_iter):
+        db = self._connect()
+        try:
+            cursor = db.cursor()
+            cursor.executemany('INSERT INTO id' + tox_id +
+                               '(message, author_name, author_type, unix_time, message_type) ' +
+                               'VALUES (?, ?, ?, ?, ?, ?);', messages_iter)
+            db.commit()
+        except:
+            print('Database is locked!')
+            db.rollback()
+        finally:
+            db.close()
+
+    def update_messages(self, tox_id, message_id):
+        db = self._connect()
+        try:
+            cursor = db.cursor()
+            cursor.execute('UPDATE id' + tox_id + ' SET author = 0 '
+                           'WHERE id = ' + str(message_id) + ' AND author = 2;')
+            db.commit()
+        except:
+            print('Database is locked!')
+            db.rollback()
+        finally:
+            db.close()
+
+    def delete_message(self, tox_id, unique_id):
+        db = self._connect()
+        try:
+            cursor = db.cursor()
+            cursor.execute('DELETE FROM id' + tox_id + ' WHERE id = ' + str(unique_id) + ';')
+            db.commit()
+        except:
+            print('Database is locked!')
+            db.rollback()
+        finally:
+            db.close()
+
+    def delete_messages(self, tox_id):
+        db = self._connect()
+        try:
+            cursor = db.cursor()
+            cursor.execute('DELETE FROM id' + tox_id + ';')
+            db.commit()
+        except:
+            print('Database is locked!')
+            db.rollback()
+        finally:
+            db.close()
+
+    def messages_getter(self, tox_id):
+        self.add_friend_to_db(tox_id)
+
+        return Database.MessageGetter(self._path, tox_id)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Messages loading
+    # -----------------------------------------------------------------------------------------------------------------
+
+    class MessageGetter:
+
+        def __init__(self, path, tox_id):
+            self._count = 0
+            self._path = path
+            self._tox_id = tox_id
+            self._db = self._cursor = None
+
+        def get_one(self):
+            return self.get(1)
+
+        def get_all(self):
+            self._connect()
+            data = self._cursor.fetchall()
+            self._disconnect()
+            self._count = len(data)
+            return data
+
+        def get(self, count):
+            self._connect()
+            self.skip()
+            data = self._cursor.fetchmany(count)
+            self._disconnect()
+            self._count += len(data)
+            return data
+
+        def skip(self):
+            if self._count:
+                self._cursor.fetchmany(self._count)
+
+        def delete_one(self):
+            if self._count:
+                self._count -= 1
+
+        def _connect(self):
+            self._db = connect(self._path, timeout=TIMEOUT)
+            self._cursor = self._db.cursor()
+            self._cursor.execute('SELECT message, author_type, author_name, unix_time, message_type, id FROM id' +
+                                 self._tox_id + ' ORDER BY unix_time DESC;')
+
+        def _disconnect(self):
+            self._db.close()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _connect(self):
+        return connect(self._path, timeout=TIMEOUT)

toxygen/history/history.py

@@ -0,0 +1,138 @@
+from history.history_logs_generators import *
+
+
+class History:
+
+    def __init__(self, contact_provider, db, settings, main_screen, messages_items_factory):
+        self._contact_provider = contact_provider
+        self._db = db
+        self._settings = settings
+        self._messages = main_screen.messages
+        self._messages_items_factory = messages_items_factory
+        self._is_loading = False
+        self._contacts_manager = None
+           
+    def __del__(self):
+        del self._db
+
+    def set_contacts_manager(self, contacts_manager):
+        self._contacts_manager = contacts_manager
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # History support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def save_history(self):
+        """
+        Save history to db
+        """
+        if self._settings['save_db']:
+            for friend in self._contact_provider.get_all_friends():
+                self._db.add_friend_to_db(friend.tox_id)
+                if not self._settings['save_unsent_only']:
+                    messages = friend.get_corr_for_saving()
+                else:
+                    messages = friend.get_unsent_messages_for_saving()
+                    self._db.delete_messages(friend.tox_id)
+                messages = map(lambda m: (m.text, m.author.name, m.author.type, m.time, m.type), messages)
+                self._db.save_messages_to_db(friend.tox_id, messages)
+
+        self._db.save()
+
+    def clear_history(self, friend, save_unsent=False):
+        """
+        Clear chat history
+        """
+        friend.clear_corr(save_unsent)
+        self._db.delete_friend_from_db(friend.tox_id)
+
+    def export_history(self, contact, as_text=True):
+        extension = 'txt' if as_text else 'html'
+        file_name, _ = util_ui.save_file_dialog(util_ui.tr('Choose file name'), extension)
+
+        if not file_name:
+            return
+
+        if not file_name.endswith('.' + extension):
+            file_name += '.' + extension
+
+        history = self.generate_history(contact, as_text)
+        with open(file_name, 'wt') as fl:
+            fl.write(history)
+
+    def delete_message(self, message):
+        contact = self._contacts_manager.get_curr_contact()
+        if message.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):
+            if message.is_saved():
+                self._db.delete_message(contact.tox_id, message.id)
+        contact.delete_message(message.message_id)
+
+    def load_history(self, friend):
+        """
+        Tries to load next part of messages
+        """
+        if self._is_loading:
+            return
+        self._is_loading = True
+        friend.load_corr(False)
+        messages = friend.get_corr()
+        if not messages:
+            self._is_loading = False
+            return
+        messages.reverse()
+        messages = messages[self._messages.count():self._messages.count() + PAGE_SIZE]
+        for message in messages:
+            message_type = message.get_type()
+            if message_type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):  # text message
+                self._create_message_item(message)
+            elif message_type == MESSAGE_TYPE['FILE_TRANSFER']:  # file transfer
+                if message.state == FILE_TRANSFER_STATE['UNSENT']:
+                    self._create_unsent_file_item(message)
+                else:
+                    self._create_file_transfer_item(message)
+            elif message_type == MESSAGE_TYPE['INLINE']:  # inline image
+                self._create_inline_item(message)
+            else:  # info message
+                self._create_message_item(message)
+        self._is_loading = False
+
+    def get_message_getter(self, friend_public_key):
+        self._db.add_friend_to_db(friend_public_key)
+
+        return self._db.messages_getter(friend_public_key)
+
+    def delete_history(self, friend):
+        self._db.delete_friend_from_db(friend.tox_id)
+
+    def add_friend_to_db(self, tox_id):
+        self._db.add_friend_to_db(tox_id)
+
+    @staticmethod
+    def generate_history(contact, as_text=True, _range=None):
+        if _range is None:
+            contact.load_all_corr()
+            corr = contact.get_corr()
+        elif _range[1] + 1:
+            corr = contact.get_corr()[_range[0]:_range[1] + 1]
+        else:
+            corr = contact.get_corr()[_range[0]:]
+
+        generator = TextHistoryGenerator(corr, contact.name) if as_text else HtmlHistoryGenerator(corr, contact.name)
+
+        return generator.generate()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Items creation
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def _create_message_item(self, message):
+        return self._messages_items_factory.create_message_item(message, False)
+
+    def _create_unsent_file_item(self, message):
+        return self._messages_items_factory.create_unsent_file_item(message, False)
+
+    def _create_file_transfer_item(self, message):
+        return self._messages_items_factory.create_file_transfer_item(message, False)
+
+    def _create_inline_item(self, message):
+        return self._messages_items_factory.create_inline_item(message, False)

toxygen/history/history_logs_generators.py

@@ -0,0 +1,48 @@
+from messenger.messages import *
+import utils.util as util
+
+
+class HistoryLogsGenerator:
+
+    def __init__(self, history, contact_name):
+        self._history = history
+        self._contact_name = contact_name
+
+    def generate(self):
+        return str()
+
+    @staticmethod
+    def _get_message_time(message):
+        return util.convert_time(message.time) if message.author.type != MESSAGE_AUTHOR['NOT_SENT'] else 'Unsent'
+
+
+class HtmlHistoryGenerator(HistoryLogsGenerator):
+
+    def __init__(self, history, contact_name):
+        super().__init__(history, contact_name)
+
+    def generate(self):
+        arr = []
+        for message in self._history:
+            if type(message) is TextMessage:
+                x = '[{}] <b>{}:</b> {}<br>'
+                arr.append(x.format(self._get_message_time(message), message.author.name, message.text))
+        s = '<br>'.join(arr)
+        html = '<html><head><meta charset="UTF-8"><title>{}</title></head><body>{}</body></html>'
+
+        return html.format(self._contact_name, s)
+
+
+class TextHistoryGenerator(HistoryLogsGenerator):
+
+    def __init__(self, history, contact_name):
+        super().__init__(history, contact_name)
+
+    def generate(self):
+        arr = [self._contact_name]
+        for message in self._history:
+            if type(message) is TextMessage:
+                x = '[{}] {}: {}\n'
+                arr.append(x.format(self._get_message_time(message), message.author.name, message.text))
+
+        return '\n'.join(arr)

toxygen/items_factory.py

@@ -1,68 +0,0 @@
-from PyQt5 import QtWidgets, QtCore
-from list_items import *
-
-
-class ItemsFactory:
-
-    def __init__(self, friends_list, messages):
-        self._friends = friends_list
-        self._messages = messages
-
-    def friend_item(self):
-        item = ContactItem()
-        elem = QtWidgets.QListWidgetItem(self._friends)
-        elem.setSizeHint(QtCore.QSize(250, item.height()))
-        self._friends.addItem(elem)
-        self._friends.setItemWidget(elem, item)
-        return item
-
-    def message_item(self, text, time, name, sent, message_type, append, pixmap):
-        item = MessageItem(text, time, name, sent, message_type, self._messages)
-        if pixmap is not None:
-            item.set_avatar(pixmap)
-        elem = QtWidgets.QListWidgetItem()
-        elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height()))
-        if append:
-            self._messages.addItem(elem)
-        else:
-            self._messages.insertItem(0, elem)
-        self._messages.setItemWidget(elem, item)
-        return item
-
-    def inline_item(self, data, append):
-        elem = QtWidgets.QListWidgetItem()
-        item = InlineImageItem(data, self._messages.width(), elem)
-        elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height()))
-        if append:
-            self._messages.addItem(elem)
-        else:
-            self._messages.insertItem(0, elem)
-        self._messages.setItemWidget(elem, item)
-        return item
-
-    def unsent_file_item(self, file_name, size, name, time, append):
-        item = UnsentFileItem(file_name,
-                              size,
-                              name,
-                              time,
-                              self._messages.width())
-        elem = QtWidgets.QListWidgetItem()
-        elem.setSizeHint(QtCore.QSize(self._messages.width() - 30, 34))
-        if append:
-            self._messages.addItem(elem)
-        else:
-            self._messages.insertItem(0, elem)
-        self._messages.setItemWidget(elem, item)
-        return item
-
-    def file_transfer_item(self, data, append):
-        data.append(self._messages.width())
-        item = FileTransferItem(*data)
-        elem = QtWidgets.QListWidgetItem()
-        elem.setSizeHint(QtCore.QSize(self._messages.width() - 30, 34))
-        if append:
-            self._messages.addItem(elem)
-        else:
-            self._messages.insertItem(0, elem)
-        self._messages.setItemWidget(elem, item)
-        return item

toxygen/libtox.py

@@ -1,59 +0,0 @@
-from platform import system
-from ctypes import CDLL
-import util
-
-
-class LibToxCore:
-
-    def __init__(self):
-        if system() == 'Windows':
-            self._libtoxcore = CDLL(util.curr_directory() + '/libs/libtox.dll')
-        elif system() == 'Darwin':
-            self._libtoxcore = CDLL('libtoxcore.dylib')
-        else:
-            # libtoxcore and libsodium must be installed in your os
-            try:
-                self._libtoxcore = CDLL('libtoxcore.so')
-            except:
-                self._libtoxcore = CDLL(util.curr_directory() + '/libs/libtoxcore.so')
-
-    def __getattr__(self, item):
-        return self._libtoxcore.__getattr__(item)
-
-
-class LibToxAV:
-
-    def __init__(self):
-        if system() == 'Windows':
-            # on Windows av api is in libtox.dll
-            self._libtoxav = CDLL(util.curr_directory() + '/libs/libtox.dll')
-        elif system() == 'Darwin':
-            self._libtoxav = CDLL('libtoxav.dylib')
-        else:
-            # /usr/lib/libtoxav.so must exists
-            try:
-                self._libtoxav = CDLL('libtoxav.so')
-            except:
-                self._libtoxav = CDLL(util.curr_directory() + '/libs/libtoxav.so')
-
-    def __getattr__(self, item):
-        return self._libtoxav.__getattr__(item)
-
-
-class LibToxEncryptSave:
-
-    def __init__(self):
-        if system() == 'Windows':
-            # on Windows profile encryption api is in libtox.dll
-            self._lib_tox_encrypt_save = CDLL(util.curr_directory() + '/libs/libtox.dll')
-        elif system() == 'Darwin':
-            self._lib_tox_encrypt_save = CDLL('libtoxencryptsave.dylib')
-        else:
-            # /usr/lib/libtoxencryptsave.so must exists
-            try:
-                self._lib_tox_encrypt_save = CDLL('libtoxencryptsave.so')
-            except:
-                self._lib_tox_encrypt_save = CDLL(util.curr_directory() + '/libs/libtoxencryptsave.so')
-
-    def __getattr__(self, item):
-        return self._lib_tox_encrypt_save.__getattr__(item)

toxygen/loginscreen.py

@@ -1,103 +0,0 @@
-from PyQt5 import QtWidgets, QtCore
-from widgets import *
-
-
-class NickEdit(LineEdit):
-
-    def __init__(self, parent):
-        super(NickEdit, self).__init__(parent)
-        self.parent = parent
-
-    def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_Return:
-            self.parent.create_profile()
-        else:
-            super(NickEdit, self).keyPressEvent(event)
-
-
-class LoginScreen(CenteredWidget):
-
-    def __init__(self):
-        super(LoginScreen, self).__init__()
-        self.initUI()
-        self.center()
-
-    def initUI(self):
-        self.resize(400, 200)
-        self.setMinimumSize(QtCore.QSize(400, 200))
-        self.setMaximumSize(QtCore.QSize(400, 200))
-        self.new_profile = QtWidgets.QPushButton(self)
-        self.new_profile.setGeometry(QtCore.QRect(20, 150, 171, 27))
-        self.new_profile.clicked.connect(self.create_profile)
-        self.label = QtWidgets.QLabel(self)
-        self.label.setGeometry(QtCore.QRect(20, 70, 101, 17))
-        self.new_name = NickEdit(self)
-        self.new_name.setGeometry(QtCore.QRect(20, 100, 171, 31))
-        self.load_profile = QtWidgets.QPushButton(self)
-        self.load_profile.setGeometry(QtCore.QRect(220, 150, 161, 27))
-        self.load_profile.clicked.connect(self.load_ex_profile)
-        self.default = QtWidgets.QCheckBox(self)
-        self.default.setGeometry(QtCore.QRect(220, 110, 131, 22))
-        self.groupBox = QtWidgets.QGroupBox(self)
-        self.groupBox.setGeometry(QtCore.QRect(210, 40, 181, 151))
-        self.comboBox = QtWidgets.QComboBox(self.groupBox)
-        self.comboBox.setGeometry(QtCore.QRect(10, 30, 161, 27))
-        self.groupBox_2 = QtWidgets.QGroupBox(self)
-        self.groupBox_2.setGeometry(QtCore.QRect(10, 40, 191, 151))
-        self.toxygen = QtWidgets.QLabel(self)
-        self.groupBox.raise_()
-        self.groupBox_2.raise_()
-        self.comboBox.raise_()
-        self.default.raise_()
-        self.load_profile.raise_()
-        self.new_name.raise_()
-        self.new_profile.raise_()
-        self.toxygen.setGeometry(QtCore.QRect(160, 8, 90, 25))
-        font = QtGui.QFont()
-        font.setFamily("Impact")
-        font.setPointSize(16)
-        self.toxygen.setFont(font)
-        self.toxygen.setObjectName("toxygen")
-        self.type = 0
-        self.number = -1
-        self.load_as_default = False
-        self.name = None
-        self.retranslateUi()
-        QtCore.QMetaObject.connectSlotsByName(self)
-
-    def retranslateUi(self):
-        self.new_name.setPlaceholderText(QtWidgets.QApplication.translate("login", "Profile name"))
-        self.setWindowTitle(QtWidgets.QApplication.translate("login", "Log in"))
-        self.new_profile.setText(QtWidgets.QApplication.translate("login", "Create"))
-        self.label.setText(QtWidgets.QApplication.translate("login", "Profile name:"))
-        self.load_profile.setText(QtWidgets.QApplication.translate("login", "Load profile"))
-        self.default.setText(QtWidgets.QApplication.translate("login", "Use as default"))
-        self.groupBox.setTitle(QtWidgets.QApplication.translate("login", "Load existing profile"))
-        self.groupBox_2.setTitle(QtWidgets.QApplication.translate("login", "Create new profile"))
-        self.toxygen.setText(QtWidgets.QApplication.translate("login", "toxygen"))
-
-    def create_profile(self):
-        self.type = 1
-        self.name = self.new_name.text()
-        self.close()
-
-    def load_ex_profile(self):
-        if not self.create_only:
-            self.type = 2
-            self.number = self.comboBox.currentIndex()
-            self.load_as_default = self.default.isChecked()
-            self.close()
-
-    def update_select(self, data):
-        list_of_profiles = []
-        for elem in data:
-            list_of_profiles.append(elem)
-        self.comboBox.addItems(list_of_profiles)
-        self.create_only = not list_of_profiles
-
-    def update_on_close(self, func):
-        self.onclose = func
-
-    def closeEvent(self, event):
-        self.onclose(self.type, self.number, self.load_as_default, self.name)
-        event.accept()

toxygen/main.py

@@ -1,485 +1,49 @@
-import sys
+import app
-from loginscreen import LoginScreen
+from user_data.settings import *
-import profile
+import utils.util as util
-from settings import *
+import argparse
-from PyQt5 import QtCore, QtGui, QtWidgets
-from bootstrap import generate_nodes, download_nodes_list
-from mainscreen import MainWindow
-from callbacks import init_callbacks, stop, start
-from util import curr_directory, program_version, remove
-import styles.style  # reqired for styles loading
-import platform
-import toxes
-from passwordscreen import PasswordScreen, UnlockAppScreen, SetProfilePasswordScreen
-from plugin_support import PluginLoader
-import updater
 
 
-class Toxygen:
+__maintainer__ = 'Ingvar'
-
+__version__ = '0.5.0'
-    def __init__(self, path_or_uri=None):
-        super(Toxygen, self).__init__()
-        self.tox = self.ms = self.init = self.app = self.tray = self.mainloop = self.avloop = None
-        if path_or_uri is None:
-            self.uri = self.path = None
-        elif path_or_uri.startswith('tox:'):
-            self.path = None
-            self.uri = path_or_uri[4:]
-        else:
-            self.path = path_or_uri
-            self.uri = None
-
-    def enter_pass(self, data):
-        """
-        Show password screen
-        """
-        tmp = [data]
-        p = PasswordScreen(toxes.ToxES.get_instance(), tmp)
-        p.show()
-        self.app.lastWindowClosed.connect(self.app.quit)
-        self.app.exec_()
-        if tmp[0] == data:
-            raise SystemExit()
-        else:
-            return tmp[0]
-
-    def main(self):
-        """
-        Main function of app. loads login screen if needed and starts main screen
-        """
-        app = QtWidgets.QApplication(sys.argv)
-        app.setWindowIcon(QtGui.QIcon(curr_directory() + '/images/icon.png'))
-        self.app = app
-
-        if platform.system() == 'Linux':
-            QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads)
-
-        with open(curr_directory() + '/styles/dark_style.qss') as fl:
-            style = fl.read()
-        app.setStyleSheet(style)
-
-        encrypt_save = toxes.ToxES()
-
-        if self.path is not None:
-            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)
-            settings = Settings(name)
-            self.tox = profile.tox_factory(data, settings)
-        else:
-            auto_profile = Settings.get_auto_profile()
-            if not auto_profile[0]:
-                # show login screen if default profile not found
-                current_locale = QtCore.QLocale()
-                curr_lang = current_locale.languageToString(current_locale.language())
-                langs = Settings.supported_languages()
-                if curr_lang in langs:
-                    lang_path = langs[curr_lang]
-                    translator = QtCore.QTranslator()
-                    translator.load(curr_directory() + '/translations/' + lang_path)
-                    app.installTranslator(translator)
-                    app.translator = translator
-                ls = LoginScreen()
-                ls.setWindowIconText("Toxygen")
-                profiles = ProfileHelper.find_profiles()
-                ls.update_select(map(lambda x: x[1], profiles))
-                _login = self.Login(profiles)
-                ls.update_on_close(_login.login_screen_close)
-                ls.show()
-                app.exec_()
-                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'
-                    pr = map(lambda x: x[1], ProfileHelper.find_profiles())
-                    if name in list(pr):
-                        msgBox = QtWidgets.QMessageBox()
-                        msgBox.setWindowTitle(
-                            QtWidgets.QApplication.translate("MainWindow", "Error"))
-                        text = (QtWidgets.QApplication.translate("MainWindow",
-                                                                 'Profile with this name already exists'))
-                        msgBox.setText(text)
-                        msgBox.exec_()
-                        return
-                    self.tox = profile.tox_factory()
-                    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')
-                    reply = QtWidgets.QMessageBox.question(None,
-                                                           'Profile {}'.format(name),
-                                                           QtWidgets.QApplication.translate("login",
-                                                                                            'Do you want to set profile password?'),
-                                                           QtWidgets.QMessageBox.Yes,
-                                                           QtWidgets.QMessageBox.No)
-                    if reply == QtWidgets.QMessageBox.Yes:
-                        set_pass = SetProfilePasswordScreen(encrypt_save)
-                        set_pass.show()
-                        self.app.lastWindowClosed.connect(self.app.quit)
-                        self.app.exec_()
-                    reply = QtWidgets.QMessageBox.question(None,
-                                                           'Profile {}'.format(name),
-                                                           QtWidgets.QApplication.translate("login",
-                                                                                            'Do you want to save profile in default folder? If no, profile will be saved in program folder'),
-                                                           QtWidgets.QMessageBox.Yes,
-                                                           QtWidgets.QMessageBox.No)
-                    if reply == QtWidgets.QMessageBox.Yes:
-                        path = Settings.get_default_path()
-                    else:
-                        path = curr_directory() + '/'
-                    try:
-                        ProfileHelper(path, name).save_profile(self.tox.get_savedata())
-                    except Exception as ex:
-                        print(str(ex))
-                        log('Profile creation exception: ' + str(ex))
-                        msgBox = QtWidgets.QMessageBox()
-                        msgBox.setText(QtWidgets.QApplication.translate("login",
-                                                                        'Profile saving error! Does Toxygen have permission to write to this directory?'))
-                        msgBox.exec_()
-                        return
-                    path = Settings.get_default_path()
-                    settings = Settings(name)
-                    if curr_lang in langs:
-                        settings['language'] = curr_lang
-                    settings.save()
-                else:  # load existing profile
-                    path, name = _login.get_data()
-                    if _login.default:
-                        Settings.set_auto_profile(path, name)
-                    data = ProfileHelper(path, name).open_profile()
-                    if encrypt_save.is_data_encrypted(data):
-                        data = self.enter_pass(data)
-                    settings = Settings(name)
-                    self.tox = profile.tox_factory(data, settings)
-            else:
-                path, name = auto_profile
-                data = ProfileHelper(path, name).open_profile()
-                if encrypt_save.is_data_encrypted(data):
-                    data = self.enter_pass(data)
-                settings = Settings(name)
-                self.tox = profile.tox_factory(data, settings)
-
-        if Settings.is_active_profile(path, name):  # profile is in use
-            reply = QtWidgets.QMessageBox.question(None,
-                                                   'Profile {}'.format(name),
-                                                   QtWidgets.QApplication.translate("login", 'Other instance of Toxygen uses this profile or profile was not properly closed. Continue?'),
-                                                   QtWidgets.QMessageBox.Yes,
-                                                   QtWidgets.QMessageBox.No)
-            if reply != QtWidgets.QMessageBox.Yes:
-                return
-        else:
-            settings.set_active_profile()
-
-        # application color scheme
-        for theme in settings.built_in_themes().keys():
-            if settings['theme'] == theme:
-                with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
-                    style = fl.read()
-                app.setStyleSheet(style)
-
-        lang = Settings.supported_languages()[settings['language']]
-        translator = QtCore.QTranslator()
-        translator.load(curr_directory() + '/translations/' + lang)
-        app.installTranslator(translator)
-        app.translator = translator
-
-        # tray icon
-        self.tray = QtWidgets.QSystemTrayIcon(QtGui.QIcon(curr_directory() + '/images/icon.png'))
-        self.tray.setObjectName('tray')
-
-        self.ms = MainWindow(self.tox, self.reset, self.tray)
-        app.aboutToQuit.connect(self.ms.close_window)
-
-        class Menu(QtWidgets.QMenu):
-
-            def newStatus(self, status):
-                if not Settings.get_instance().locked:
-                    profile.Profile.get_instance().set_status(status)
-                    self.aboutToShowHandler()
-                    self.hide()
-
-            def aboutToShowHandler(self):
-                status = profile.Profile.get_instance().status
-                act = self.act
-                if status is None or Settings.get_instance().locked:
-                    self.actions()[1].setVisible(False)
-                else:
-                    self.actions()[1].setVisible(True)
-                    act.actions()[0].setChecked(False)
-                    act.actions()[1].setChecked(False)
-                    act.actions()[2].setChecked(False)
-                    act.actions()[status].setChecked(True)
-                self.actions()[2].setVisible(not Settings.get_instance().locked)
-
-            def languageChange(self, *args, **kwargs):
-                self.actions()[0].setText(QtWidgets.QApplication.translate('tray', 'Open Toxygen'))
-                self.actions()[1].setText(QtWidgets.QApplication.translate('tray', 'Set status'))
-                self.actions()[2].setText(QtWidgets.QApplication.translate('tray', 'Exit'))
-                self.act.actions()[0].setText(QtWidgets.QApplication.translate('tray', 'Online'))
-                self.act.actions()[1].setText(QtWidgets.QApplication.translate('tray', 'Away'))
-                self.act.actions()[2].setText(QtWidgets.QApplication.translate('tray', 'Busy'))
-
-        m = Menu()
-        show = m.addAction(QtWidgets.QApplication.translate('tray', 'Open Toxygen'))
-        sub = m.addMenu(QtWidgets.QApplication.translate('tray', 'Set status'))
-        onl = sub.addAction(QtWidgets.QApplication.translate('tray', 'Online'))
-        away = sub.addAction(QtWidgets.QApplication.translate('tray', 'Away'))
-        busy = sub.addAction(QtWidgets.QApplication.translate('tray', 'Busy'))
-        onl.setCheckable(True)
-        away.setCheckable(True)
-        busy.setCheckable(True)
-        m.act = sub
-        exit = m.addAction(QtWidgets.QApplication.translate('tray', 'Exit'))
-
-        def show_window():
-            s = Settings.get_instance()
-
-            def show():
-                if not self.ms.isActiveWindow():
-                    self.ms.setWindowState(self.ms.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
-                    self.ms.activateWindow()
-                self.ms.show()
-            if not s.locked:
-                show()
-            else:
-                def correct_pass():
-                    show()
-                    s.locked = False
-                    s.unlockScreen = False
-                if not s.unlockScreen:
-                    s.unlockScreen = True
-                    self.p = UnlockAppScreen(toxes.ToxES.get_instance(), correct_pass)
-                    self.p.show()
-
-        def tray_activated(reason):
-            if reason == QtWidgets.QSystemTrayIcon.DoubleClick:
-                show_window()
-
-        def close_app():
-            if not Settings.get_instance().locked:
-                settings.closing = True
-                self.ms.close()
-
-        show.triggered.connect(show_window)
-        exit.triggered.connect(close_app)
-        m.aboutToShow.connect(lambda: m.aboutToShowHandler())
-        onl.triggered.connect(lambda: m.newStatus(0))
-        away.triggered.connect(lambda: m.newStatus(1))
-        busy.triggered.connect(lambda: m.newStatus(2))
-
-        self.tray.setContextMenu(m)
-        self.tray.show()
-        self.tray.activated.connect(tray_activated)
-
-        self.ms.show()
-
-        updating = False
-        if settings['update'] and updater.updater_available() and updater.connection_available():  # auto update
-            version = updater.check_for_updates()
-            if version is not None:
-                if settings['update'] == 2:
-                    updater.download(version)
-                    updating = True
-                else:
-                    reply = QtWidgets.QMessageBox.question(None,
-                                                           'Toxygen',
-                                                           QtWidgets.QApplication.translate("login",
-                                                                                            'Update for Toxygen was found. Download and install it?'),
-                                                           QtWidgets.QMessageBox.Yes,
-                                                           QtWidgets.QMessageBox.No)
-                    if reply == QtWidgets.QMessageBox.Yes:
-                        updater.download(version)
-                        updating = True
-
-        if updating:
-            data = self.tox.get_savedata()
-            ProfileHelper.get_instance().save_profile(data)
-            settings.close()
-            del self.tox
-            return
-
-        plugin_helper = PluginLoader(self.tox, settings)  # plugin support
-        plugin_helper.load()
-
-        start()
-        # init thread
-        self.init = self.InitThread(self.tox, self.ms, self.tray)
-        self.init.start()
-
-        # starting threads for tox iterate and toxav iterate
-        self.mainloop = self.ToxIterateThread(self.tox)
-        self.mainloop.start()
-        self.avloop = self.ToxAVIterateThread(self.tox.AV)
-        self.avloop.start()
-
-        if self.uri is not None:
-            self.ms.add_contact(self.uri)
-
-        app.lastWindowClosed.connect(app.quit)
-        app.exec_()
-
-        self.init.stop = True
-        self.mainloop.stop = True
-        self.avloop.stop = True
-        plugin_helper.stop()
-        stop()
-        self.mainloop.wait()
-        self.init.wait()
-        self.avloop.wait()
-        self.tray.hide()
-        data = self.tox.get_savedata()
-        ProfileHelper.get_instance().save_profile(data)
-        settings.close()
-        del self.tox
-
-    def reset(self):
-        """
-        Create new tox instance (new network settings)
-        :return: tox instance
-        """
-        self.mainloop.stop = True
-        self.init.stop = True
-        self.avloop.stop = True
-        self.mainloop.wait()
-        self.init.wait()
-        self.avloop.wait()
-        data = self.tox.get_savedata()
-        ProfileHelper.get_instance().save_profile(data)
-        del self.tox
-        # create new tox instance
-        self.tox = profile.tox_factory(data, Settings.get_instance())
-        # init thread
-        self.init = self.InitThread(self.tox, self.ms, self.tray)
-        self.init.start()
-
-        # starting threads for tox iterate and toxav iterate
-        self.mainloop = self.ToxIterateThread(self.tox)
-        self.mainloop.start()
-
-        self.avloop = self.ToxAVIterateThread(self.tox.AV)
-        self.avloop.start()
-
-        plugin_helper = PluginLoader.get_instance()
-        plugin_helper.set_tox(self.tox)
-
-        return self.tox
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Inner classes
-    # -----------------------------------------------------------------------------------------------------------------
-
-    class InitThread(QtCore.QThread):
-
-        def __init__(self, tox, ms, tray):
-            QtCore.QThread.__init__(self)
-            self.tox, self.ms, self.tray = tox, ms, tray
-            self.stop = False
-
-        def run(self):
-            # initializing callbacks
-            init_callbacks(self.tox, self.ms, self.tray)
-            # download list of nodes if needed
-            download_nodes_list()
-            # bootstrap
-            try:
-                for data in generate_nodes():
-                    if self.stop:
-                        return
-                    self.tox.bootstrap(*data)
-                    self.tox.add_tcp_relay(*data)
-            except:
-                pass
-            for _ in range(10):
-                if self.stop:
-                    return
-                self.msleep(1000)
-            while not self.tox.self_get_connection_status():
-                try:
-                    for data in generate_nodes():
-                        if self.stop:
-                            return
-                        self.tox.bootstrap(*data)
-                        self.tox.add_tcp_relay(*data)
-                except:
-                    pass
-                finally:
-                    self.msleep(5000)
-
-    class ToxIterateThread(QtCore.QThread):
-
-        def __init__(self, tox):
-            QtCore.QThread.__init__(self)
-            self.tox = tox
-            self.stop = False
-
-        def run(self):
-            while not self.stop:
-                self.tox.iterate()
-                self.msleep(self.tox.iteration_interval())
-
-    class ToxAVIterateThread(QtCore.QThread):
-
-        def __init__(self, toxav):
-            QtCore.QThread.__init__(self)
-            self.toxav = toxav
-            self.stop = False
-
-        def run(self):
-            while not self.stop:
-                self.toxav.iterate()
-                self.msleep(self.toxav.iteration_interval())
-
-    class Login:
-
-        def __init__(self, arr):
-            self.arr = arr
-
-        def login_screen_close(self, t, number=-1, default=False, name=None):
-            """ Function which processes data from login screen
-            :param t: 0 - window was closed, 1 - new profile was created, 2 - profile loaded
-            :param number: num of chosen profile in list (-1 by default)
-            :param default: was or not chosen profile marked as default
-            :param name: name of new profile
-            """
-            self.t = t
-            self.num = number
-            self.default = default
-            self.name = name
-
-        def get_data(self):
-            return self.arr[self.num]
 
 
 def clean():
-    """Removes all windows libs from libs folder"""
+    """Removes libs folder"""
-    d = curr_directory() + '/libs/'
+    directory = util.get_libs_directory()
-    remove(d)
+    util.remove(directory)
 
 
 def reset():
     Settings.reset_auto_profile()
 
 
+def print_toxygen_version():
+    print('Toxygen v' + __version__)
+
+
 def main():
-    if len(sys.argv) == 1:
+    parser = argparse.ArgumentParser()
-        toxygen = Toxygen()
+    parser.add_argument('--version', action='store_true', help='Prints Toxygen version')
-    else:  # started with argument(s)
+    parser.add_argument('--clean', action='store_true', help='Delete toxcore libs from libs folder')
-        arg = sys.argv[1]
+    parser.add_argument('--reset', action='store_true', help='Reset default profile')
-        if arg == '--version':
+    parser.add_argument('--uri', help='Add specified Tox ID to friends')
-            print('Toxygen v' + program_version)
+    parser.add_argument('profile', nargs='?', default=None, help='Path to Tox profile')
+    args = parser.parse_args()
+
+    if args.version:
+        print_toxygen_version()
         return
-        elif arg == '--help':
+
-            print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version\ntoxygen --reset')
+    if args.clean:
-            return
-        elif arg == '--clean':
         clean()
         return
-        elif arg == '--reset':
+
+    if args.reset:
         reset()
         return
-        else:
+
-            toxygen = Toxygen(arg)
+    toxygen = app.App(__version__, args.profile, args.uri)
     toxygen.main()
 
 

toxygen/mainscreen.py

@@ -1,757 +0,0 @@
-from menu import *
-from profile import *
-from list_items import *
-from widgets import MultilineEdit, ComboBox
-import plugin_support
-from mainscreen_widgets import *
-import settings
-import toxes
-
-
-class MainWindow(QtWidgets.QMainWindow, Singleton):
-
-    def __init__(self, tox, reset, tray):
-        super().__init__()
-        Singleton.__init__(self)
-        self.reset = reset
-        self.tray = tray
-        self.setAcceptDrops(True)
-        self.initUI(tox)
-        self._saved = False
-        if settings.Settings.get_instance()['show_welcome_screen']:
-            self.ws = WelcomeScreen()
-
-    def setup_menu(self, window):
-        self.menubar = QtWidgets.QMenuBar(window)
-        self.menubar.setObjectName("menubar")
-        self.menubar.setNativeMenuBar(False)
-        self.menubar.setMinimumSize(self.width(), 25)
-        self.menubar.setMaximumSize(self.width(), 25)
-        self.menubar.setBaseSize(self.width(), 25)
-        self.menuProfile = QtWidgets.QMenu(self.menubar)
-
-        self.menuProfile = QtWidgets.QMenu(self.menubar)
-        self.menuProfile.setObjectName("menuProfile")
-        self.menuSettings = QtWidgets.QMenu(self.menubar)
-        self.menuSettings.setObjectName("menuSettings")
-        self.menuPlugins = QtWidgets.QMenu(self.menubar)
-        self.menuPlugins.setObjectName("menuPlugins")
-        self.menuAbout = QtWidgets.QMenu(self.menubar)
-        self.menuAbout.setObjectName("menuAbout")
-
-        self.actionAdd_friend = QtWidgets.QAction(window)
-        self.actionAdd_gc = QtWidgets.QAction(window)
-        self.actionAdd_friend.setObjectName("actionAdd_friend")
-        self.actionprofilesettings = QtWidgets.QAction(window)
-        self.actionprofilesettings.setObjectName("actionprofilesettings")
-        self.actionPrivacy_settings = QtWidgets.QAction(window)
-        self.actionPrivacy_settings.setObjectName("actionPrivacy_settings")
-        self.actionInterface_settings = QtWidgets.QAction(window)
-        self.actionInterface_settings.setObjectName("actionInterface_settings")
-        self.actionNotifications = QtWidgets.QAction(window)
-        self.actionNotifications.setObjectName("actionNotifications")
-        self.actionNetwork = QtWidgets.QAction(window)
-        self.actionNetwork.setObjectName("actionNetwork")
-        self.actionAbout_program = QtWidgets.QAction(window)
-        self.actionAbout_program.setObjectName("actionAbout_program")
-        self.updateSettings = QtWidgets.QAction(window)
-        self.actionSettings = QtWidgets.QAction(window)
-        self.actionSettings.setObjectName("actionSettings")
-        self.audioSettings = QtWidgets.QAction(window)
-        self.videoSettings = QtWidgets.QAction(window)
-        self.pluginData = QtWidgets.QAction(window)
-        self.importPlugin = QtWidgets.QAction(window)
-        self.reloadPlugins = QtWidgets.QAction(window)
-        self.lockApp = QtWidgets.QAction(window)
-        self.menuProfile.addAction(self.actionAdd_friend)
-        self.menuProfile.addAction(self.actionAdd_gc)
-        self.menuProfile.addAction(self.actionSettings)
-        self.menuProfile.addAction(self.lockApp)
-        self.menuSettings.addAction(self.actionPrivacy_settings)
-        self.menuSettings.addAction(self.actionInterface_settings)
-        self.menuSettings.addAction(self.actionNotifications)
-        self.menuSettings.addAction(self.actionNetwork)
-        self.menuSettings.addAction(self.audioSettings)
-        self.menuSettings.addAction(self.videoSettings)
-        self.menuSettings.addAction(self.updateSettings)
-        self.menuPlugins.addAction(self.pluginData)
-        self.menuPlugins.addAction(self.importPlugin)
-        self.menuPlugins.addAction(self.reloadPlugins)
-        self.menuAbout.addAction(self.actionAbout_program)
-
-        self.menubar.addAction(self.menuProfile.menuAction())
-        self.menubar.addAction(self.menuSettings.menuAction())
-        self.menubar.addAction(self.menuPlugins.menuAction())
-        self.menubar.addAction(self.menuAbout.menuAction())
-
-        self.actionAbout_program.triggered.connect(self.about_program)
-        self.actionNetwork.triggered.connect(self.network_settings)
-        self.actionAdd_friend.triggered.connect(self.add_contact)
-        self.actionAdd_gc.triggered.connect(self.create_gc)
-        self.actionSettings.triggered.connect(self.profile_settings)
-        self.actionPrivacy_settings.triggered.connect(self.privacy_settings)
-        self.actionInterface_settings.triggered.connect(self.interface_settings)
-        self.actionNotifications.triggered.connect(self.notification_settings)
-        self.audioSettings.triggered.connect(self.audio_settings)
-        self.videoSettings.triggered.connect(self.video_settings)
-        self.updateSettings.triggered.connect(self.update_settings)
-        self.pluginData.triggered.connect(self.plugins_menu)
-        self.lockApp.triggered.connect(self.lock_app)
-        self.importPlugin.triggered.connect(self.import_plugin)
-        self.reloadPlugins.triggered.connect(self.reload_plugins)
-
-    def languageChange(self, *args, **kwargs):
-        self.retranslateUi()
-
-    def event(self, event):
-        if event.type() == QtCore.QEvent.WindowActivate:
-            self.tray.setIcon(QtGui.QIcon(curr_directory() + '/images/icon.png'))
-            self.messages.repaint()
-        return super(MainWindow, self).event(event)
-
-    def retranslateUi(self):
-        self.lockApp.setText(QtWidgets.QApplication.translate("MainWindow", "Lock"))
-        self.menuPlugins.setTitle(QtWidgets.QApplication.translate("MainWindow", "Plugins"))
-        self.pluginData.setText(QtWidgets.QApplication.translate("MainWindow", "List of plugins"))
-        self.menuProfile.setTitle(QtWidgets.QApplication.translate("MainWindow", "Profile"))
-        self.menuSettings.setTitle(QtWidgets.QApplication.translate("MainWindow", "Settings"))
-        self.menuAbout.setTitle(QtWidgets.QApplication.translate("MainWindow", "About"))
-        self.actionAdd_friend.setText(QtWidgets.QApplication.translate("MainWindow", "Add contact"))
-        self.actionAdd_gc.setText(QtWidgets.QApplication.translate("MainWindow", "Create group chat"))
-        self.actionprofilesettings.setText(QtWidgets.QApplication.translate("MainWindow", "Profile"))
-        self.actionPrivacy_settings.setText(QtWidgets.QApplication.translate("MainWindow", "Privacy"))
-        self.actionInterface_settings.setText(QtWidgets.QApplication.translate("MainWindow", "Interface"))
-        self.actionNotifications.setText(QtWidgets.QApplication.translate("MainWindow", "Notifications"))
-        self.actionNetwork.setText(QtWidgets.QApplication.translate("MainWindow", "Network"))
-        self.actionAbout_program.setText(QtWidgets.QApplication.translate("MainWindow", "About program"))
-        self.actionSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Settings"))
-        self.audioSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Audio"))
-        self.videoSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Video"))
-        self.updateSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Updates"))
-        self.contact_name.setPlaceholderText(QtWidgets.QApplication.translate("MainWindow", "Search"))
-        self.sendMessageButton.setToolTip(QtWidgets.QApplication.translate("MainWindow", "Send message"))
-        self.callButton.setToolTip(QtWidgets.QApplication.translate("MainWindow", "Start audio call with friend"))
-        self.online_contacts.clear()
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "All"))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Online"))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Online first"))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Name"))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Online and by name"))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Online first and by name"))
-        ind = Settings.get_instance()['sorting']
-        d = {0: 0, 1: 1, 2: 2, 3: 4, 1 | 4: 4, 2 | 4: 5}
-        self.online_contacts.setCurrentIndex(d[ind])
-        self.importPlugin.setText(QtWidgets.QApplication.translate("MainWindow", "Import plugin"))
-        self.reloadPlugins.setText(QtWidgets.QApplication.translate("MainWindow", "Reload plugins"))
-
-    def setup_right_bottom(self, Form):
-        Form.resize(650, 60)
-        self.messageEdit = MessageArea(Form, self)
-        self.messageEdit.setGeometry(QtCore.QRect(0, 3, 450, 55))
-        self.messageEdit.setObjectName("messageEdit")
-        font = QtGui.QFont()
-        font.setPointSize(11)
-        font.setFamily(settings.Settings.get_instance()['font'])
-        self.messageEdit.setFont(font)
-
-        self.sendMessageButton = QtWidgets.QPushButton(Form)
-        self.sendMessageButton.setGeometry(QtCore.QRect(565, 3, 60, 55))
-        self.sendMessageButton.setObjectName("sendMessageButton")
-
-        self.menuButton = MenuButton(Form, self.show_menu)
-        self.menuButton.setGeometry(QtCore.QRect(QtCore.QRect(455, 3, 55, 55)))
-
-        pixmap = QtGui.QPixmap('send.png')
-        icon = QtGui.QIcon(pixmap)
-        self.sendMessageButton.setIcon(icon)
-        self.sendMessageButton.setIconSize(QtCore.QSize(45, 60))
-
-        pixmap = QtGui.QPixmap('menu.png')
-        icon = QtGui.QIcon(pixmap)
-        self.menuButton.setIcon(icon)
-        self.menuButton.setIconSize(QtCore.QSize(40, 40))
-
-        self.sendMessageButton.clicked.connect(self.send_message)
-
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def setup_left_center_menu(self, Form):
-        Form.resize(270, 25)
-        self.search_label = QtWidgets.QLabel(Form)
-        self.search_label.setGeometry(QtCore.QRect(3, 2, 20, 20))
-        pixmap = QtGui.QPixmap()
-        pixmap.load(curr_directory() + '/images/search.png')
-        self.search_label.setScaledContents(False)
-        self.search_label.setPixmap(pixmap)
-
-        self.contact_name = LineEdit(Form)
-        self.contact_name.setGeometry(QtCore.QRect(0, 0, 150, 25))
-        self.contact_name.setObjectName("contact_name")
-        self.contact_name.textChanged.connect(self.filtering)
-
-        self.online_contacts = ComboBox(Form)
-        self.online_contacts.setGeometry(QtCore.QRect(150, 0, 120, 25))
-        self.online_contacts.activated[int].connect(lambda x: self.filtering())
-        self.search_label.raise_()
-
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def setup_left_top(self, Form):
-        Form.setCursor(QtCore.Qt.PointingHandCursor)
-        Form.setMinimumSize(QtCore.QSize(270, 75))
-        Form.setMaximumSize(QtCore.QSize(270, 75))
-        Form.setBaseSize(QtCore.QSize(270, 75))
-        self.avatar_label = Form.avatar_label = QtWidgets.QLabel(Form)
-        self.avatar_label.setGeometry(QtCore.QRect(5, 5, 64, 64))
-        self.avatar_label.setScaledContents(False)
-        self.avatar_label.setAlignment(QtCore.Qt.AlignCenter)
-        self.name = Form.name = DataLabel(Form)
-        Form.name.setGeometry(QtCore.QRect(75, 15, 150, 25))
-        font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
-        font.setPointSize(14)
-        font.setBold(True)
-        Form.name.setFont(font)
-        Form.name.setObjectName("name")
-        self.status_message = Form.status_message = DataLabel(Form)
-        Form.status_message.setGeometry(QtCore.QRect(75, 35, 170, 25))
-        font.setPointSize(12)
-        font.setBold(False)
-        Form.status_message.setFont(font)
-        Form.status_message.setObjectName("status_message")
-        self.connection_status = Form.connection_status = StatusCircle(Form)
-        Form.connection_status.setGeometry(QtCore.QRect(230, 10, 32, 32))
-        self.avatar_label.mouseReleaseEvent = self.profile_settings
-        self.status_message.mouseReleaseEvent = self.profile_settings
-        self.name.mouseReleaseEvent = self.profile_settings
-        self.connection_status.raise_()
-        Form.connection_status.setObjectName("connection_status")
-
-    def setup_right_top(self, Form):
-        Form.resize(650, 75)
-        self.account_avatar = QtWidgets.QLabel(Form)
-        self.account_avatar.setGeometry(QtCore.QRect(10, 5, 64, 64))
-        self.account_avatar.setScaledContents(False)
-        self.account_name = DataLabel(Form)
-        self.account_name.setGeometry(QtCore.QRect(100, 0, 400, 25))
-        self.account_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
-        font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
-        font.setPointSize(14)
-        font.setBold(True)
-        self.account_name.setFont(font)
-        self.account_name.setObjectName("account_name")
-        self.account_status = DataLabel(Form)
-        self.account_status.setGeometry(QtCore.QRect(100, 20, 400, 25))
-        self.account_status.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
-        font.setPointSize(12)
-        font.setBold(False)
-        self.account_status.setFont(font)
-        self.account_status.setObjectName("account_status")
-        self.callButton = QtWidgets.QPushButton(Form)
-        self.callButton.setGeometry(QtCore.QRect(550, 5, 50, 50))
-        self.callButton.setObjectName("callButton")
-        self.callButton.clicked.connect(lambda: self.profile.call_click(True))
-        self.videocallButton = QtWidgets.QPushButton(Form)
-        self.videocallButton.setGeometry(QtCore.QRect(550, 5, 50, 50))
-        self.videocallButton.setObjectName("videocallButton")
-        self.videocallButton.clicked.connect(lambda: self.profile.call_click(True, True))
-        self.update_call_state('call')
-        self.typing = QtWidgets.QLabel(Form)
-        self.typing.setGeometry(QtCore.QRect(500, 25, 50, 30))
-        pixmap = QtGui.QPixmap(QtCore.QSize(50, 30))
-        pixmap.load(curr_directory() + '/images/typing.png')
-        self.typing.setScaledContents(False)
-        self.typing.setPixmap(pixmap.scaled(50, 30, QtCore.Qt.KeepAspectRatio))
-        self.typing.setVisible(False)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def setup_left_center(self, widget):
-        self.friends_list = QtWidgets.QListWidget(widget)
-        self.friends_list.setObjectName("friends_list")
-        self.friends_list.setGeometry(0, 0, 270, 310)
-        self.friends_list.clicked.connect(self.friend_click)
-        self.friends_list.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.friends_list.customContextMenuRequested.connect(self.friend_right_click)
-        self.friends_list.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.friends_list.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
-        self.friends_list.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.friends_list.verticalScrollBar().setContextMenuPolicy(QtCore.Qt.NoContextMenu)
-
-    def setup_right_center(self, widget):
-        self.messages = QtWidgets.QListWidget(widget)
-        self.messages.setGeometry(0, 0, 620, 310)
-        self.messages.setObjectName("messages")
-        self.messages.setSpacing(1)
-        self.messages.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
-        self.messages.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.messages.focusOutEvent = lambda event: self.messages.clearSelection()
-        self.messages.verticalScrollBar().setContextMenuPolicy(QtCore.Qt.NoContextMenu)
-
-        def load(pos):
-            if not pos:
-                self.profile.load_history()
-                self.messages.verticalScrollBar().setValue(1)
-        self.messages.verticalScrollBar().valueChanged.connect(load)
-        self.messages.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.messages.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-
-    def initUI(self, tox):
-        self.setMinimumSize(920, 500)
-        s = Settings.get_instance()
-        self.setGeometry(s['x'], s['y'], s['width'], s['height'])
-        self.setWindowTitle('Toxygen')
-        os.chdir(curr_directory() + '/images/')
-        menu = QtWidgets.QWidget()
-        main = QtWidgets.QWidget()
-        grid = QtWidgets.QGridLayout()
-        search = QtWidgets.QWidget()
-        name = QtWidgets.QWidget()
-        info = QtWidgets.QWidget()
-        main_list = QtWidgets.QWidget()
-        messages = QtWidgets.QWidget()
-        message_buttons = QtWidgets.QWidget()
-        self.setup_left_center_menu(search)
-        self.setup_left_top(name)
-        self.setup_right_center(messages)
-        self.setup_right_top(info)
-        self.setup_right_bottom(message_buttons)
-        self.setup_left_center(main_list)
-        self.setup_menu(menu)
-        if not Settings.get_instance()['mirror_mode']:
-            grid.addWidget(search, 2, 0)
-            grid.addWidget(name, 1, 0)
-            grid.addWidget(messages, 2, 1, 2, 1)
-            grid.addWidget(info, 1, 1)
-            grid.addWidget(message_buttons, 4, 1)
-            grid.addWidget(main_list, 3, 0, 2, 1)
-            grid.setColumnMinimumWidth(1, 500)
-            grid.setColumnMinimumWidth(0, 270)
-        else:
-            grid.addWidget(search, 2, 1)
-            grid.addWidget(name, 1, 1)
-            grid.addWidget(messages, 2, 0, 2, 1)
-            grid.addWidget(info, 1, 0)
-            grid.addWidget(message_buttons, 4, 0)
-            grid.addWidget(main_list, 3, 1, 2, 1)
-            grid.setColumnMinimumWidth(0, 500)
-            grid.setColumnMinimumWidth(1, 270)
-
-        grid.addWidget(menu, 0, 0, 1, 2)
-        grid.setSpacing(0)
-        grid.setContentsMargins(0, 0, 0, 0)
-        grid.setRowMinimumHeight(0, 25)
-        grid.setRowMinimumHeight(1, 75)
-        grid.setRowMinimumHeight(2, 25)
-        grid.setRowMinimumHeight(3, 320)
-        grid.setRowMinimumHeight(4, 55)
-        grid.setColumnStretch(1, 1)
-        grid.setRowStretch(3, 1)
-        main.setLayout(grid)
-        self.setCentralWidget(main)
-        self.messageEdit.setFocus()
-        self.user_info = name
-        self.friend_info = info
-        self.retranslateUi()
-        self.profile = Profile(tox, self)
-
-    def closeEvent(self, event):
-        s = Settings.get_instance()
-        if not s['close_to_tray'] or s.closing:
-            if not self._saved:
-                self._saved = True
-                self.profile.save_history()
-                self.profile.close()
-                s['x'] = self.geometry().x()
-                s['y'] = self.geometry().y()
-                s['width'] = self.width()
-                s['height'] = self.height()
-                s.save()
-                QtWidgets.QApplication.closeAllWindows()
-                event.accept()
-        elif QtWidgets.QSystemTrayIcon.isSystemTrayAvailable():
-            event.ignore()
-            self.hide()
-
-    def close_window(self):
-        Settings.get_instance().closing = True
-        self.close()
-
-    def resizeEvent(self, *args, **kwargs):
-        self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
-        self.friends_list.setGeometry(0, 0, 270, self.height() - 125)
-
-        self.videocallButton.setGeometry(QtCore.QRect(self.width() - 330, 10, 50, 50))
-        self.callButton.setGeometry(QtCore.QRect(self.width() - 390, 10, 50, 50))
-        self.typing.setGeometry(QtCore.QRect(self.width() - 450, 20, 50, 30))
-
-        self.messageEdit.setGeometry(QtCore.QRect(55, 0, self.width() - 395, 55))
-        self.menuButton.setGeometry(QtCore.QRect(0, 0, 55, 55))
-        self.sendMessageButton.setGeometry(QtCore.QRect(self.width() - 340, 0, 70, 55))
-
-        self.account_name.setGeometry(QtCore.QRect(100, 15, self.width() - 560, 25))
-        self.account_status.setGeometry(QtCore.QRect(100, 35, self.width() - 560, 25))
-        self.messageEdit.setFocus()
-        self.profile.update()
-
-    def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_Escape and QtWidgets.QSystemTrayIcon.isSystemTrayAvailable():
-            self.hide()
-        elif event.key() == QtCore.Qt.Key_C and event.modifiers() & QtCore.Qt.ControlModifier and self.messages.selectedIndexes():
-            rows = list(map(lambda x: self.messages.row(x), self.messages.selectedItems()))
-            indexes = (rows[0] - self.messages.count(), rows[-1] - self.messages.count())
-            s = self.profile.export_history(self.profile.active_friend, True, indexes)
-            clipboard = QtWidgets.QApplication.clipboard()
-            clipboard.setText(s)
-        elif event.key() == QtCore.Qt.Key_Z and event.modifiers() & QtCore.Qt.ControlModifier and self.messages.selectedIndexes():
-            self.messages.clearSelection()
-        elif event.key() == QtCore.Qt.Key_F and event.modifiers() & QtCore.Qt.ControlModifier:
-            self.show_search_field()
-        else:
-            super(MainWindow, self).keyPressEvent(event)
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Functions which called when user click in menu
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def about_program(self):
-        import util
-        msgBox = QtWidgets.QMessageBox()
-        msgBox.setWindowTitle(QtWidgets.QApplication.translate("MainWindow", "About"))
-        text = (QtWidgets.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python.<br>Version: '))
-        github = '<br><a href="https://github.com/toxygen-project/toxygen/">Github</a>'
-        submit_a_bug = '<br><a href="https://github.com/toxygen-project/toxygen/issues">Submit a bug</a>'
-        msgBox.setText(text + util.program_version + github + submit_a_bug)
-        msgBox.exec_()
-
-    def network_settings(self):
-        self.n_s = NetworkSettings(self.reset)
-        self.n_s.show()
-
-    def plugins_menu(self):
-        self.p_s = PluginsSettings()
-        self.p_s.show()
-
-    def add_contact(self, link=''):
-        self.a_c = AddContact(link or '')
-        self.a_c.show()
-
-    def create_gc(self):
-        self.profile.create_group_chat()
-
-    def profile_settings(self, *args):
-        self.p_s = ProfileSettings()
-        self.p_s.show()
-
-    def privacy_settings(self):
-        self.priv_s = PrivacySettings()
-        self.priv_s.show()
-
-    def notification_settings(self):
-        self.notif_s = NotificationsSettings()
-        self.notif_s.show()
-
-    def interface_settings(self):
-        self.int_s = InterfaceSettings()
-        self.int_s.show()
-
-    def audio_settings(self):
-        self.audio_s = AudioSettings()
-        self.audio_s.show()
-
-    def video_settings(self):
-        self.video_s = VideoSettings()
-        self.video_s.show()
-
-    def update_settings(self):
-        self.update_s = UpdateSettings()
-        self.update_s.show()
-
-    def reload_plugins(self):
-        plugin_loader = plugin_support.PluginLoader.get_instance()
-        if plugin_loader is not None:
-            plugin_loader.reload()
-
-    def import_plugin(self):
-        import util
-        directory = QtWidgets.QFileDialog.getExistingDirectory(self,
-                                                           QtWidgets.QApplication.translate("MainWindow", 'Choose folder with plugin'),
-                                                           util.curr_directory(),
-                                                           QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
-        if directory:
-            src = directory + '/'
-            dest = curr_directory() + '/plugins/'
-            util.copy(src, dest)
-            msgBox = QtWidgets.QMessageBox()
-            msgBox.setWindowTitle(
-                QtWidgets.QApplication.translate("MainWindow", "Restart Toxygen"))
-            msgBox.setText(
-                QtWidgets.QApplication.translate("MainWindow", 'Plugin will be loaded after restart'))
-            msgBox.exec_()
-
-    def lock_app(self):
-        if toxes.ToxES.get_instance().has_password():
-            Settings.get_instance().locked = True
-            self.hide()
-        else:
-            msgBox = QtWidgets.QMessageBox()
-            msgBox.setWindowTitle(
-                QtWidgets.QApplication.translate("MainWindow", "Cannot lock app"))
-            msgBox.setText(
-                QtWidgets.QApplication.translate("MainWindow", 'Error. Profile password is not set.'))
-            msgBox.exec_()
-
-    def show_menu(self):
-        if not hasattr(self, 'menu'):
-            self.menu = DropdownMenu(self)
-        self.menu.setGeometry(QtCore.QRect(0 if Settings.get_instance()['mirror_mode'] else 270,
-                                           self.height() - 120,
-                                           180,
-                                           120))
-        self.menu.show()
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Messages, calls and file transfers
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def send_message(self):
-        text = self.messageEdit.toPlainText()
-        self.profile.send_message(text)
-
-    def send_file(self):
-        self.menu.hide()
-        if self.profile.active_friend + 1and self.profile.is_active_a_friend():
-            choose = QtWidgets.QApplication.translate("MainWindow", 'Choose file')
-            name = QtWidgets.QFileDialog.getOpenFileName(self, choose, options=QtWidgets.QFileDialog.DontUseNativeDialog)
-            if name[0]:
-                self.profile.send_file(name[0])
-
-    def send_screenshot(self, hide=False):
-        self.menu.hide()
-        if self.profile.active_friend + 1 and self.profile.is_active_a_friend():
-            self.sw = ScreenShotWindow(self)
-            self.sw.show()
-            if hide:
-                self.hide()
-
-    def send_smiley(self):
-        self.menu.hide()
-        if self.profile.active_friend + 1:
-            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(),
-                                                 self.smiley.height()))
-            self.smiley.show()
-
-    def send_sticker(self):
-        self.menu.hide()
-        if self.profile.active_friend + 1 and self.profile.is_active_a_friend():
-            self.sticker = StickerWindow(self)
-            self.sticker.setGeometry(QtCore.QRect(self.x() if Settings.get_instance()['mirror_mode'] else 270 + self.x(),
-                                                  self.y() + self.height() - 200,
-                                                  self.sticker.width(),
-                                                  self.sticker.height()))
-            self.sticker.show()
-
-    def active_call(self):
-        self.update_call_state('finish_call')
-
-    def incoming_call(self):
-        self.update_call_state('incoming_call')
-
-    def call_finished(self):
-        self.update_call_state('call')
-
-    def update_call_state(self, state):
-        os.chdir(curr_directory() + '/images/')
-
-        pixmap = QtGui.QPixmap(curr_directory() + '/images/{}.png'.format(state))
-        icon = QtGui.QIcon(pixmap)
-        self.callButton.setIcon(icon)
-        self.callButton.setIconSize(QtCore.QSize(50, 50))
-
-        pixmap = QtGui.QPixmap(curr_directory() + '/images/{}_video.png'.format(state))
-        icon = QtGui.QIcon(pixmap)
-        self.videocallButton.setIcon(icon)
-        self.videocallButton.setIconSize(QtCore.QSize(35, 35))
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Functions which called when user open context menu in friends list
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def friend_right_click(self, pos):
-        item = self.friends_list.itemAt(pos)
-        num = self.friends_list.indexFromItem(item).row()
-        friend = Profile.get_instance().get_friend(num)
-        if friend is None:
-            return
-        settings = Settings.get_instance()
-        allowed = friend.tox_id in settings['auto_accept_from_friends']
-        auto = QtWidgets.QApplication.translate("MainWindow", 'Disallow auto accept') if allowed else QtWidgets.QApplication.translate("MainWindow", 'Allow auto accept')
-        if item is not None:
-            self.listMenu = QtWidgets.QMenu()
-            is_friend = type(friend) is Friend
-            if is_friend:
-                set_alias_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Set alias'))
-                set_alias_item.triggered.connect(lambda: self.set_alias(num))
-
-            history_menu = self.listMenu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Chat history'))
-            clear_history_item = history_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Clear history'))
-            export_to_text_item = history_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Export as text'))
-            export_to_html_item = history_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Export as HTML'))
-
-            copy_menu = self.listMenu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Copy'))
-            copy_name_item = copy_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Name'))
-            copy_status_item = copy_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Status message'))
-            if is_friend:
-                copy_key_item = copy_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Public key'))
-
-                auto_accept_item = self.listMenu.addAction(auto)
-                remove_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Remove friend'))
-                block_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Block friend'))
-                notes_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Notes'))
-
-                chats = self.profile.get_group_chats()
-                if len(chats) and self.profile.is_active_online():
-                    invite_menu = self.listMenu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Invite to group chat'))
-                    for i in range(len(chats)):
-                        name, number = chats[i]
-                        item = invite_menu.addAction(name)
-                        item.triggered.connect(lambda: self.invite_friend_to_gc(num, number))
-
-                plugins_loader = plugin_support.PluginLoader.get_instance()
-                if plugins_loader is not None:
-                    submenu = plugins_loader.get_menu(self.listMenu, num)
-                    if len(submenu):
-                        plug = self.listMenu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Plugins'))
-                        plug.addActions(submenu)
-                copy_key_item.triggered.connect(lambda: self.copy_friend_key(num))
-                remove_item.triggered.connect(lambda: self.remove_friend(num))
-                block_item.triggered.connect(lambda: self.block_friend(num))
-                auto_accept_item.triggered.connect(lambda: self.auto_accept(num, not allowed))
-                notes_item.triggered.connect(lambda: self.show_note(friend))
-            else:
-                leave_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Leave chat'))
-                set_title_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Set title'))
-                leave_item.triggered.connect(lambda: self.leave_gc(num))
-                set_title_item.triggered.connect(lambda: self.set_title(num))
-            clear_history_item.triggered.connect(lambda: self.clear_history(num))
-            copy_name_item.triggered.connect(lambda: self.copy_name(friend))
-            copy_status_item.triggered.connect(lambda: self.copy_status(friend))
-            export_to_text_item.triggered.connect(lambda: self.export_history(num))
-            export_to_html_item.triggered.connect(lambda: self.export_history(num, False))
-            parent_position = self.friends_list.mapToGlobal(QtCore.QPoint(0, 0))
-            self.listMenu.move(parent_position + pos)
-            self.listMenu.show()
-
-    def show_note(self, friend):
-        s = Settings.get_instance()
-        note = s['notes'][friend.tox_id] if friend.tox_id in s['notes'] else ''
-        user = QtWidgets.QApplication.translate("MainWindow", 'Notes about user')
-        user = '{} {}'.format(user, friend.name)
-
-        def save_note(text):
-            if friend.tox_id in s['notes']:
-                del s['notes'][friend.tox_id]
-            if text:
-                s['notes'][friend.tox_id] = text
-            s.save()
-        self.note = MultilineEdit(user, note, save_note)
-        self.note.show()
-
-    def export_history(self, num, as_text=True):
-        s = self.profile.export_history(num, as_text)
-        extension = 'txt' if as_text else 'html'
-        file_name, _ = QtWidgets.QFileDialog.getSaveFileName(None,
-                                                              QtWidgets.QApplication.translate("MainWindow",
-                                                                                               'Choose file name'),
-                                                              curr_directory(),
-                                                              filter=extension,
-                                                              options=QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
-
-        if file_name:
-            if not file_name.endswith('.' + extension):
-                file_name += '.' + extension
-            with open(file_name, 'wt') as fl:
-                fl.write(s)
-
-    def set_alias(self, num):
-        self.profile.set_alias(num)
-
-    def remove_friend(self, num):
-        self.profile.delete_friend(num)
-
-    def block_friend(self, num):
-        friend = self.profile.get_friend(num)
-        self.profile.block_user(friend.tox_id)
-
-    def copy_friend_key(self, num):
-        tox_id = self.profile.friend_public_key(num)
-        clipboard = QtWidgets.QApplication.clipboard()
-        clipboard.setText(tox_id)
-
-    def copy_name(self, friend):
-        clipboard = QtWidgets.QApplication.clipboard()
-        clipboard.setText(friend.name)
-
-    def copy_status(self, friend):
-        clipboard = QtWidgets.QApplication.clipboard()
-        clipboard.setText(friend.status_message)
-
-    def clear_history(self, num):
-        self.profile.clear_history(num)
-
-    def leave_gc(self, num):
-        self.profile.leave_gc(num)
-
-    def set_title(self, num):
-        self.profile.set_title(num)
-
-    def auto_accept(self, num, value):
-        settings = Settings.get_instance()
-        tox_id = self.profile.friend_public_key(num)
-        if value:
-            settings['auto_accept_from_friends'].append(tox_id)
-        else:
-            settings['auto_accept_from_friends'].remove(tox_id)
-        settings.save()
-
-    def invite_friend_to_gc(self, friend_number, group_number):
-        self.profile.invite_friend(friend_number, group_number)
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Functions which called when user click somewhere else
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def friend_click(self, index):
-        num = index.row()
-        self.profile.set_active(num)
-
-    def mouseReleaseEvent(self, event):
-        pos = self.connection_status.pos()
-        x, y = pos.x() + self.user_info.pos().x(), pos.y() + self.user_info.pos().y()
-        if (x < event.x() < x + 32) and (y < event.y() < y + 32):
-            self.profile.change_status()
-        else:
-            super(MainWindow, self).mouseReleaseEvent(event)
-
-    def show(self):
-        super().show()
-        self.profile.update()
-
-    def filtering(self):
-        ind = self.online_contacts.currentIndex()
-        d = {0: 0, 1: 1, 2: 2, 3: 4, 4: 1 | 4, 5: 2 | 4}
-        self.profile.filtration_and_sorting(d[ind], self.contact_name.text())
-
-    def show_search_field(self):
-        if hasattr(self, 'search_field') and self.search_field.isVisible():
-            return
-        if self.profile.get_curr_friend() is None:
-            return
-        self.search_field = SearchScreen(self.messages, self.messages.width(), self.messages.parent())
-        x, y = self.messages.x(), self.messages.y() + self.messages.height() - 40
-        self.search_field.setGeometry(x, y, self.messages.width(), 40)
-        self.messages.setGeometry(x, self.messages.y(), self.messages.width(), self.messages.height() - 40)
-        self.search_field.show()

toxygen/messages.py

@@ -1,113 +0,0 @@
-
-
-MESSAGE_TYPE = {
-    'TEXT': 0,
-    'ACTION': 1,
-    'FILE_TRANSFER': 2,
-    'INLINE': 3,
-    'INFO_MESSAGE': 4,
-    'GC_TEXT': 5,
-    'GC_ACTION': 6
-}
-
-
-class Message:
-
-    def __init__(self, message_type, owner, time):
-        self._time = time
-        self._type = message_type
-        self._owner = owner
-
-    def get_type(self):
-        return self._type
-
-    def get_owner(self):
-        return self._owner
-
-    def mark_as_sent(self):
-        self._owner = 0
-
-
-class TextMessage(Message):
-    """
-    Plain text or action message
-    """
-
-    def __init__(self, message, owner, time, message_type):
-        super(TextMessage, self).__init__(message_type, owner, time)
-        self._message = message
-
-    def get_data(self):
-        return self._message, self._owner, self._time, self._type
-
-
-class GroupChatMessage(TextMessage):
-
-    def __init__(self, message, owner, time, message_type, name):
-        super().__init__(message, owner, time, message_type)
-        self._user_name = name
-
-    def get_data(self):
-        return self._message, self._owner, self._time, self._type, self._user_name
-
-
-class TransferMessage(Message):
-    """
-    Message with info about file transfer
-    """
-
-    def __init__(self, owner, time, status, size, name, friend_number, file_number):
-        super(TransferMessage, self).__init__(MESSAGE_TYPE['FILE_TRANSFER'], owner, time)
-        self._status = status
-        self._size = size
-        self._file_name = name
-        self._friend_number, self._file_number = friend_number, file_number
-
-    def is_active(self, file_number):
-        return self._file_number == file_number and self._status not in (2, 3)
-
-    def get_friend_number(self):
-        return self._friend_number
-
-    def get_file_number(self):
-        return self._file_number
-
-    def get_status(self):
-        return self._status
-
-    def set_status(self, value):
-        self._status = value
-
-    def get_data(self):
-        return self._file_name, self._size, self._time, self._owner, self._friend_number, self._file_number, self._status
-
-
-class UnsentFile(Message):
-    def __init__(self, path, data, time):
-        super(UnsentFile, self).__init__(MESSAGE_TYPE['FILE_TRANSFER'], 0, time)
-        self._data, self._path = data, path
-
-    def get_data(self):
-        return self._path, self._data, self._time
-
-    def get_status(self):
-        return None
-
-
-class InlineImage(Message):
-    """
-    Inline image
-    """
-
-    def __init__(self, data):
-        super(InlineImage, self).__init__(MESSAGE_TYPE['INLINE'], None, None)
-        self._data = data
-
-    def get_data(self):
-        return self._data
-
-
-class InfoMessage(TextMessage):
-
-    def __init__(self, message, time):
-        super(InfoMessage, self).__init__(message, None, time, MESSAGE_TYPE['INFO_MESSAGE'])

toxygen/messenger/messages.py

@@ -0,0 +1,239 @@
+from history.database import MESSAGE_AUTHOR
+import os.path
+from ui.messages_widgets import *
+
+
+MESSAGE_TYPE = {
+    'TEXT': 0,
+    'ACTION': 1,
+    'FILE_TRANSFER': 2,
+    'INLINE': 3,
+    'INFO_MESSAGE': 4
+}
+
+PAGE_SIZE = 42
+
+
+class MessageAuthor:
+
+    def __init__(self, author_name, author_type):
+        self._name = author_name
+        self._type = author_type
+
+    def get_name(self):
+        return self._name
+
+    name = property(get_name)
+
+    def get_type(self):
+        return self._type
+
+    def set_type(self, value):
+        self._type = value
+
+    type = property(get_type, set_type)
+
+
+class Message:
+
+    MESSAGE_ID = 0
+
+    def __init__(self, message_type, author, time):
+        self._time = time
+        self._type = message_type
+        self._author = author
+        self._widget = None
+        self._message_id = self._get_id()
+
+    def get_type(self):
+        return self._type
+
+    type = property(get_type)
+
+    def get_author(self):
+        return self._author
+
+    author = property(get_author)
+
+    def get_time(self):
+        return self._time
+
+    time = property(get_time)
+
+    def get_message_id(self):
+        return self._message_id
+
+    message_id = property(get_message_id)
+
+    def get_widget(self, *args):
+        self._widget = self._create_widget(*args)
+
+        return self._widget
+
+    widget = property(get_widget)
+
+    def remove_widget(self):
+        self._widget = None
+
+    def mark_as_sent(self):
+        self._author.type = MESSAGE_AUTHOR['ME']
+        if self._widget is not None:
+            self._widget.mark_as_sent()
+
+    def _create_widget(self, *args):
+        pass
+
+    @staticmethod
+    def _get_id():
+        Message.MESSAGE_ID += 1
+
+        return int(Message.MESSAGE_ID)
+
+
+class TextMessage(Message):
+    """
+    Plain text or action message
+    """
+
+    def __init__(self, message, owner, time, message_type, message_id=0):
+        super().__init__(message_type, owner, time)
+        self._message = message
+        self._id = message_id
+
+    def get_text(self):
+        return self._message
+
+    text = property(get_text)
+
+    def get_id(self):
+        return self._id
+
+    id = property(get_id)
+
+    def is_saved(self):
+        return self._id > 0
+
+    def _create_widget(self, *args):
+        return MessageItem(self, *args)
+
+
+class OutgoingTextMessage(TextMessage):
+
+    def __init__(self, message, owner, time, message_type, tox_message_id=0):
+        super().__init__(message, owner, time, message_type)
+        self._tox_message_id = tox_message_id
+
+    def get_tox_message_id(self):
+        return self._tox_message_id
+
+    def set_tox_message_id(self, tox_message_id):
+        self._tox_message_id = tox_message_id
+
+    tox_message_id = property(get_tox_message_id, set_tox_message_id)
+
+
+class GroupChatMessage(TextMessage):
+
+    def __init__(self, id, message, owner, time, message_type, name):
+        super().__init__(id, message, owner, time, message_type)
+        self._user_name = name
+
+
+class TransferMessage(Message):
+    """
+    Message with info about file transfer
+    """
+
+    def __init__(self, author, time, state, size, file_name, friend_number, file_number):
+        super().__init__(MESSAGE_TYPE['FILE_TRANSFER'], author, time)
+        self._state = state
+        self._size = size
+        self._file_name = file_name
+        self._friend_number, self._file_number = friend_number, file_number
+
+    def is_active(self, file_number):
+        if self._file_number != file_number:
+            return False
+
+        return self._state not in (FILE_TRANSFER_STATE['FINISHED'], FILE_TRANSFER_STATE['CANCELLED'])
+
+    def get_friend_number(self):
+        return self._friend_number
+
+    friend_number = property(get_friend_number)
+
+    def get_file_number(self):
+        return self._file_number
+
+    file_number = property(get_file_number)
+
+    def get_state(self):
+        return self._state
+
+    def set_state(self, value):
+        self._state = value
+
+    state = property(get_state, set_state)
+
+    def get_size(self):
+        return self._size
+
+    size = property(get_size)
+
+    def get_file_name(self):
+        return self._file_name
+
+    file_name = property(get_file_name)
+
+    def transfer_updated(self, state, percentage, time):
+        self._state = state
+        if self._widget is not None:
+            self._widget.update_transfer_state(state, percentage, time)
+
+    def _create_widget(self, *args):
+        return FileTransferItem(self, *args)
+
+
+class UnsentFileMessage(TransferMessage):
+
+    def __init__(self, path, data, time, author, size, friend_number):
+        file_name = os.path.basename(path)
+        super().__init__(author, time, FILE_TRANSFER_STATE['UNSENT'], size, file_name, friend_number, -1)
+        self._data, self._path = data, path
+
+    def get_data(self):
+        return self._data
+
+    data = property(get_data)
+
+    def get_path(self):
+        return self._path
+
+    path = property(get_path)
+
+    def _create_widget(self, *args):
+        return UnsentFileItem(self, *args)
+
+
+class InlineImageMessage(Message):
+    """
+    Inline image
+    """
+
+    def __init__(self, data):
+        super().__init__(MESSAGE_TYPE['INLINE'], None, None)
+        self._data = data
+
+    def get_data(self):
+        return self._data
+
+    data = property(get_data)
+
+    def _create_widget(self, *args):
+        return InlineImageItem(self, *args)
+
+
+class InfoMessage(TextMessage):
+
+    def __init__(self, message, time):
+        super().__init__(message, None, time, MESSAGE_TYPE['INFO_MESSAGE'])

toxygen/messenger/messenger.py

@@ -0,0 +1,310 @@
+import common.tox_save as tox_save
+from messenger.messages import *
+
+
+class Messenger(tox_save.ToxSave):
+
+    def __init__(self, tox, plugin_loader, screen, contacts_manager, contacts_provider, items_factory, profile,
+                 calls_manager):
+        super().__init__(tox)
+        self._plugin_loader = plugin_loader
+        self._screen = screen
+        self._contacts_manager = contacts_manager
+        self._contacts_provider = contacts_provider
+        self._items_factory = items_factory
+        self._profile = profile
+        self._profile_name = profile.name
+
+        profile.name_changed_event.add_callback(self._on_profile_name_changed)
+        calls_manager.call_started_event.add_callback(self._on_call_started)
+        calls_manager.call_finished_event.add_callback(self._on_call_finished)
+
+    def get_last_message(self):
+        contact = self._contacts_manager.get_curr_contact()
+        if contact is None:
+            return str()
+
+        return contact.get_last_message_text()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Messaging - friends
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def new_message(self, friend_number, message_type, message):
+        """
+        Current user gets new message
+        :param friend_number: friend_num of friend who sent message
+        :param message_type: message type - plain text or action message (/me)
+        :param message: text of message
+        """
+        t = util.get_unix_time()
+        friend = self._get_friend_by_number(friend_number)
+        text_message = TextMessage(message, MessageAuthor(friend.name, MESSAGE_AUTHOR['FRIEND']), t, message_type)
+        self._add_message(text_message, friend)
+
+    def send_message(self):
+        text = self._screen.messageEdit.toPlainText()
+
+        plugin_command_prefix = '/plugin '
+        if text.startswith(plugin_command_prefix):
+            self._plugin_loader.command(text[len(plugin_command_prefix):])
+            self._screen.messageEdit.clear()
+            return
+
+        action_message_prefix = '/me '
+        if text.startswith(action_message_prefix):
+            message_type = TOX_MESSAGE_TYPE['ACTION']
+            text = text[len(action_message_prefix):]
+        else:
+            message_type = TOX_MESSAGE_TYPE['NORMAL']
+
+        if self._contacts_manager.is_active_a_friend():
+            self.send_message_to_friend(text, message_type)
+        elif self._contacts_manager.is_active_a_group():
+            self.send_message_to_group(text, message_type)
+        elif self._contacts_manager.is_active_a_group_chat_peer():
+            self.send_message_to_group_peer(text, message_type)
+
+    def send_message_to_friend(self, text, message_type, friend_number=None):
+        """
+        Send message
+        :param text: message text
+        :param friend_number: number of friend
+        """
+        if friend_number is None:
+            friend_number = self._contacts_manager.get_active_number()
+
+        if not text or friend_number < 0:
+            return
+
+        friend = self._get_friend_by_number(friend_number)
+        messages = self._split_message(text.encode('utf-8'))
+        t = util.get_unix_time()
+        for message in messages:
+            if friend.status is not None:
+                message_id = self._tox.friend_send_message(friend_number, message_type, message)
+            else:
+                message_id = 0
+            message_author = MessageAuthor(self._profile.name, MESSAGE_AUTHOR['NOT_SENT'])
+            message = OutgoingTextMessage(text, message_author, t, message_type, message_id)
+            friend.append_message(message)
+            if not self._contacts_manager.is_friend_active(friend_number):
+                return
+            self._create_message_item(message)
+            self._screen.messageEdit.clear()
+            self._screen.messages.scrollToBottom()
+
+    def send_messages(self, friend_number):
+        """
+        Send 'offline' messages to friend
+        """
+        friend = self._get_friend_by_number(friend_number)
+        friend.load_corr()
+        messages = friend.get_unsent_messages()
+        try:
+            for message in messages:
+                message_id = self._tox.friend_send_message(friend_number, message.type, message.text.encode('utf-8'))
+                message.tox_message_id = message_id
+        except Exception as ex:
+            util.log('Sending pending messages failed with ' + str(ex))
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Messaging - groups
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def send_message_to_group(self, text, message_type, group_number=None):
+        if group_number is None:
+            group_number = self._contacts_manager.get_active_number()
+
+        if not text or group_number < 0:
+            return
+
+        group = self._get_group_by_number(group_number)
+        messages = self._split_message(text.encode('utf-8'))
+        t = util.get_unix_time()
+        for message in messages:
+            self._tox.group_send_message(group_number, message_type, message)
+            message_author = MessageAuthor(group.get_self_name(), MESSAGE_AUTHOR['GC_PEER'])
+            message = OutgoingTextMessage(text, message_author, t, message_type)
+            group.append_message(message)
+            if not self._contacts_manager.is_group_active(group_number):
+                return
+            self._create_message_item(message)
+            self._screen.messageEdit.clear()
+            self._screen.messages.scrollToBottom()
+
+    def new_group_message(self, group_number, message_type, message, peer_id):
+        """
+        Current user gets new message
+        :param message_type: message type - plain text or action message (/me)
+        :param message: text of message
+        """
+        t = util.get_unix_time()
+        group = self._get_group_by_number(group_number)
+        peer = group.get_peer_by_id(peer_id)
+        text_message = TextMessage(message, MessageAuthor(peer.name, MESSAGE_AUTHOR['GC_PEER']), t, message_type)
+        self._add_message(text_message, group)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Messaging - group peers
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def send_message_to_group_peer(self, text, message_type, group_number=None, peer_id=None):
+        if group_number is None or peer_id is None:
+            group_peer_contact = self._contacts_manager.get_curr_contact()
+            peer_id = group_peer_contact.number
+            group = self._get_group_by_public_key(group_peer_contact.group_pk)
+            group_number = group.number
+
+        if not text or group_number < 0 or peer_id < 0:
+            return
+
+        group_peer_contact = self._contacts_manager.get_or_create_group_peer_contact(group_number, peer_id)
+        group = self._get_group_by_number(group_number)
+        messages = self._split_message(text.encode('utf-8'))
+        t = util.get_unix_time()
+        for message in messages:
+            self._tox.group_send_private_message(group_number, peer_id, message_type, message)
+            message_author = MessageAuthor(group.get_self_name(), MESSAGE_AUTHOR['GC_PEER'])
+            message = OutgoingTextMessage(text, message_author, t, message_type)
+            group_peer_contact.append_message(message)
+            if not self._contacts_manager.is_contact_active(group_peer_contact):
+                return
+            self._create_message_item(message)
+            self._screen.messageEdit.clear()
+            self._screen.messages.scrollToBottom()
+
+    def new_group_private_message(self, group_number, message_type, message, peer_id):
+        """
+        Current user gets new message
+        :param message: text of message
+        """
+        t = util.get_unix_time()
+        group = self._get_group_by_number(group_number)
+        peer = group.get_peer_by_id(peer_id)
+        text_message = TextMessage(message, MessageAuthor(peer.name, MESSAGE_AUTHOR['GC_PEER']),
+                                   t, message_type)
+        group_peer_contact = self._contacts_manager.get_or_create_group_peer_contact(group_number, peer_id)
+        self._add_message(text_message, group_peer_contact)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Message receipts
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def receipt(self, friend_number, message_id):
+        friend = self._get_friend_by_number(friend_number)
+        friend.mark_as_sent(message_id)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Typing notifications
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def send_typing(self, typing):
+        """
+        Send typing notification to a friend
+        """
+        if not self._contacts_manager.can_send_typing_notification():
+            return
+        contact = self._contacts_manager.get_curr_contact()
+        contact.typing_notification_handler.send(self._tox, typing)
+
+    def friend_typing(self, friend_number, typing):
+        """
+        Display incoming typing notification
+        """
+        if self._contacts_manager.is_friend_active(friend_number):
+            self._screen.typing.setVisible(typing)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Contact info updated
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def new_friend_name(self, friend, old_name, new_name):
+        if old_name == new_name or friend.has_alias():
+            return
+        message = util_ui.tr('User {} is now known as {}')
+        message = message.format(old_name, new_name)
+        if not self._contacts_manager.is_friend_active(friend.number):
+            friend.actions = True
+        self._add_info_message(friend.number, message)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Private methods
+    # -----------------------------------------------------------------------------------------------------------------
+
+    @staticmethod
+    def _split_message(message):
+        messages = []
+        while len(message) > TOX_MAX_MESSAGE_LENGTH:
+            size = TOX_MAX_MESSAGE_LENGTH * 4 // 5
+            last_part = message[size:TOX_MAX_MESSAGE_LENGTH]
+            if b' ' in last_part:
+                index = last_part.index(b' ')
+            elif b',' in last_part:
+                index = last_part.index(b',')
+            elif b'.' in last_part:
+                index = last_part.index(b'.')
+            else:
+                index = TOX_MAX_MESSAGE_LENGTH - size - 1
+            index += size + 1
+            messages.append(message[:index])
+            message = message[index:]
+        if message:
+            messages.append(message)
+
+        return messages
+
+    def _get_friend_by_number(self, friend_number):
+        return self._contacts_provider.get_friend_by_number(friend_number)
+
+    def _get_group_by_number(self, group_number):
+        return self._contacts_provider.get_group_by_number(group_number)
+
+    def _get_group_by_public_key(self, public_key):
+        return self._contacts_provider.get_group_by_public_key( public_key)
+
+    def _on_profile_name_changed(self, new_name):
+        if self._profile_name == new_name:
+            return
+        message = util_ui.tr('User {} is now known as {}')
+        message = message.format(self._profile_name, new_name)
+        for friend in self._contacts_provider.get_all_friends():
+            self._add_info_message(friend.number, message)
+        self._profile_name = new_name
+
+    def _on_call_started(self, friend_number, audio, video, is_outgoing):
+        if is_outgoing:
+            text = util_ui.tr("Outgoing video call") if video else util_ui.tr("Outgoing audio call")
+        else:
+            text = util_ui.tr("Incoming video call") if video else util_ui.tr("Incoming audio call")
+        self._add_info_message(friend_number, text)
+
+    def _on_call_finished(self, friend_number, is_declined):
+        text = util_ui.tr("Call declined") if is_declined else util_ui.tr("Call finished")
+        self._add_info_message(friend_number, text)
+
+    def _add_info_message(self, friend_number, text):
+        friend = self._get_friend_by_number(friend_number)
+        message = InfoMessage(text, util.get_unix_time())
+        friend.append_message(message)
+        if self._contacts_manager.is_friend_active(friend_number):
+            self._create_info_message_item(message)
+
+    def _create_info_message_item(self, message):
+        self._items_factory.create_message_item(message)
+        self._screen.messages.scrollToBottom()
+
+    def _add_message(self, text_message, contact):
+        if self._contacts_manager.is_contact_active(contact):  # add message to list
+            self._create_message_item(text_message)
+            self._screen.messages.scrollToBottom()
+            self._contacts_manager.get_curr_contact().append_message(text_message)
+        else:
+            contact.inc_messages()
+            contact.append_message(text_message)
+            if not contact.visibility:
+                self._contacts_manager.update_filtration()
+
+    def _create_message_item(self, text_message):
+        # pixmap = self._contacts_manager.get_curr_contact().get_pixmap()
+        self._items_factory.create_message_item(text_message)

toxygen/middleware/callbacks.py

@@ -0,0 +1,605 @@
+from PyQt5 import QtGui
+from wrapper.toxcore_enums_and_consts import *
+from wrapper.toxav_enums import *
+from wrapper.tox import bin_to_string
+import utils.ui as util_ui
+import utils.util as util
+import cv2
+import numpy as np
+from middleware.threads import invoke_in_main_thread, execute
+from notifications.tray import tray_notification
+from notifications.sound import *
+import threading
+
+# TODO: refactoring. Use contact provider instead of manager
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - current user
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def self_connection_status(tox, profile):
+    """
+    Current user changed connection status (offline, TCP, UDP)
+    """
+    def wrapped(tox_link, connection, user_data):
+        print('Connection status: ', str(connection))
+        status = tox.self_get_status() if connection != TOX_CONNECTION['NONE'] else None
+        invoke_in_main_thread(profile.set_status, status)
+
+    return wrapped
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - friends
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def friend_status(contacts_manager, file_transfer_handler, profile, settings):
+    def wrapped(tox, friend_number, new_status, user_data):
+        """
+        Check friend's status (none, busy, away)
+        """
+        print("Friend's #{} status changed!".format(friend_number))
+        friend = contacts_manager.get_friend_by_number(friend_number)
+        if friend.status is None and settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
+            sound_notification(SOUND_NOTIFICATION['FRIEND_CONNECTION_STATUS'])
+        invoke_in_main_thread(friend.set_status, new_status)
+
+        def set_timer():
+            t = threading.Timer(5, lambda: file_transfer_handler.send_files(friend_number))
+            t.start()
+        invoke_in_main_thread(set_timer)
+        invoke_in_main_thread(contacts_manager.update_filtration)
+
+    return wrapped
+
+
+def friend_connection_status(contacts_manager, profile, settings, plugin_loader, file_transfer_handler,
+                             messenger, calls_manager):
+    def wrapped(tox, friend_number, new_status, user_data):
+        """
+        Check friend's connection status (offline, udp, tcp)
+        """
+        print("Friend #{} connection status: {}".format(friend_number, new_status))
+        friend = contacts_manager.get_friend_by_number(friend_number)
+        if new_status == TOX_CONNECTION['NONE']:
+            invoke_in_main_thread(friend.set_status, None)
+            invoke_in_main_thread(file_transfer_handler.friend_exit, friend_number)
+            invoke_in_main_thread(contacts_manager.update_filtration)
+            invoke_in_main_thread(messenger.friend_typing, friend_number, False)
+            invoke_in_main_thread(calls_manager.friend_exit, friend_number)
+            if settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
+                sound_notification(SOUND_NOTIFICATION['FRIEND_CONNECTION_STATUS'])
+        elif friend.status is None:
+            invoke_in_main_thread(file_transfer_handler.send_avatar, friend_number)
+            invoke_in_main_thread(plugin_loader.friend_online, friend_number)
+
+    return wrapped
+
+
+def friend_name(contacts_provider, messenger):
+    def wrapped(tox, friend_number, name, size, user_data):
+        """
+        Friend changed his name
+        """
+        print('New name friend #' + str(friend_number))
+        friend = contacts_provider.get_friend_by_number(friend_number)
+        old_name = friend.name
+        new_name = str(name, 'utf-8')
+        invoke_in_main_thread(friend.set_name, new_name)
+        invoke_in_main_thread(messenger.new_friend_name, friend, old_name, new_name)
+
+    return wrapped
+
+
+def friend_status_message(contacts_manager, messenger):
+    def wrapped(tox, friend_number, status_message, size, user_data):
+        """
+        :return: function for callback friend_status_message. It updates friend's status message
+        and calls window repaint
+        """
+        friend = contacts_manager.get_friend_by_number(friend_number)
+        invoke_in_main_thread(friend.set_status_message, str(status_message, 'utf-8'))
+        print('User #{} has new status message'.format(friend_number))
+        invoke_in_main_thread(messenger.send_messages, friend_number)
+
+    return wrapped
+
+
+def friend_message(messenger, contacts_manager, profile, settings, window, tray):
+    def wrapped(tox, friend_number, message_type, message, size, user_data):
+        """
+        New message from friend
+        """
+        message = str(message, 'utf-8')
+        invoke_in_main_thread(messenger.new_message, friend_number, message_type, message)
+        if not window.isActiveWindow():
+            friend = contacts_manager.get_friend_by_number(friend_number)
+            if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
+                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'])
+            icon = os.path.join(util.get_images_directory(), 'icon_new_messages.png')
+            invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+
+    return wrapped
+
+
+def friend_request(contacts_manager):
+    def wrapped(tox, public_key, message, message_size, user_data):
+        """
+        Called when user get new friend request
+        """
+        print('Friend request')
+        key = ''.join(chr(x) for x in public_key[:TOX_PUBLIC_KEY_SIZE])
+        tox_id = bin_to_string(key, TOX_PUBLIC_KEY_SIZE)
+        invoke_in_main_thread(contacts_manager.process_friend_request, tox_id, str(message, 'utf-8'))
+
+    return wrapped
+
+
+def friend_typing(messenger):
+    def wrapped(tox, friend_number, typing, user_data):
+        invoke_in_main_thread(messenger.friend_typing, friend_number, typing)
+
+    return wrapped
+
+
+def friend_read_receipt(messenger):
+    def wrapped(tox, friend_number, message_id, user_data):
+        invoke_in_main_thread(messenger.receipt, friend_number, message_id)
+
+    return wrapped
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - file transfers
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def tox_file_recv(window, tray, profile, file_transfer_handler, contacts_manager, settings):
+    """
+    New incoming file
+    """
+    def wrapped(tox, friend_number, file_number, file_type, size, file_name, file_name_size, user_data):
+        if file_type == TOX_FILE_KIND['DATA']:
+            print('File')
+            try:
+                file_name = str(file_name[:file_name_size], 'utf-8')
+            except:
+                file_name = 'toxygen_file'
+            invoke_in_main_thread(file_transfer_handler.incoming_file_transfer,
+                                  friend_number,
+                                  file_number,
+                                  size,
+                                  file_name)
+            if not window.isActiveWindow():
+                friend = contacts_manager.get_friend_by_number(friend_number)
+                if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
+                    file_from = util_ui.tr("File from")
+                    invoke_in_main_thread(tray_notification, file_from + ' ' + friend.name, file_name, tray, window)
+                if settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
+                    sound_notification(SOUND_NOTIFICATION['FILE_TRANSFER'])
+                icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
+                invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+        else:  # avatar
+            print('Avatar')
+            invoke_in_main_thread(file_transfer_handler.incoming_avatar,
+                                  friend_number,
+                                  file_number,
+                                  size)
+    return wrapped
+
+
+def file_recv_chunk(file_transfer_handler):
+    """
+    Incoming chunk
+    """
+    def wrapped(tox, friend_number, file_number, position, chunk, length, user_data):
+        chunk = chunk[:length] if length else None
+        execute(file_transfer_handler.incoming_chunk, friend_number, file_number, position, chunk)
+
+    return wrapped
+
+
+def file_chunk_request(file_transfer_handler):
+    """
+    Outgoing chunk
+    """
+    def wrapped(tox, friend_number, file_number, position, size, user_data):
+        execute(file_transfer_handler.outgoing_chunk, friend_number, file_number, position, size)
+
+    return wrapped
+
+
+def file_recv_control(file_transfer_handler):
+    """
+    Friend cancelled, paused or resumed file transfer
+    """
+    def wrapped(tox, friend_number, file_number, file_control, user_data):
+        if file_control == TOX_FILE_CONTROL['CANCEL']:
+            file_transfer_handler.cancel_transfer(friend_number, file_number, True)
+        elif file_control == TOX_FILE_CONTROL['PAUSE']:
+            file_transfer_handler.pause_transfer(friend_number, file_number, True)
+        elif file_control == TOX_FILE_CONTROL['RESUME']:
+            file_transfer_handler.resume_transfer(friend_number, file_number, True)
+
+    return wrapped
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - custom packets
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def lossless_packet(plugin_loader):
+    def wrapped(tox, friend_number, data, length, user_data):
+        """
+        Incoming lossless packet
+        """
+        data = data[:length]
+        invoke_in_main_thread(plugin_loader.callback_lossless, friend_number, data)
+
+    return wrapped
+
+
+def lossy_packet(plugin_loader):
+    def wrapped(tox, friend_number, data, length, user_data):
+        """
+        Incoming lossy packet
+        """
+        data = data[:length]
+        invoke_in_main_thread(plugin_loader.callback_lossy, friend_number, data)
+
+    return wrapped
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - audio
+# -----------------------------------------------------------------------------------------------------------------
+
+def call_state(calls_manager):
+    def wrapped(toxav, friend_number, mask, user_data):
+        """
+        New call state
+        """
+        print(friend_number, mask)
+        if mask == TOXAV_FRIEND_CALL_STATE['FINISHED'] or mask == TOXAV_FRIEND_CALL_STATE['ERROR']:
+            invoke_in_main_thread(calls_manager.stop_call, friend_number, True)
+        else:
+            calls_manager.toxav_call_state_cb(friend_number, mask)
+
+    return wrapped
+
+
+def call(calls_manager):
+    def wrapped(toxav, friend_number, audio, video, user_data):
+        """
+        Incoming call from friend
+        """
+        print(friend_number, audio, video)
+        invoke_in_main_thread(calls_manager.incoming_call, audio, video, friend_number)
+
+    return wrapped
+
+
+def callback_audio(calls_manager):
+    def wrapped(toxav, friend_number, samples, audio_samples_per_channel, audio_channels_count, rate, user_data):
+        """
+        New audio chunk
+        """
+        calls_manager.call.audio_chunk(
+            bytes(samples[:audio_samples_per_channel * 2 * audio_channels_count]),
+            audio_channels_count,
+            rate)
+
+    return wrapped
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - video
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def video_receive_frame(toxav, friend_number, width, height, y, u, v, ystride, ustride, vstride, user_data):
+    """
+    Creates yuv frame from y, u, v and shows it using OpenCV
+    For yuv => bgr we need this YUV420 frame:
+
+              width
+    -------------------------
+    |                       |
+    |          Y            |      height
+    |                       |
+    -------------------------
+    |           |           |
+    |  U even   |   U odd   |      height // 4
+    |           |           |
+    -------------------------
+    |           |           |
+    |  V even   |   V odd   |      height // 4
+    |           |           |
+    -------------------------
+
+     width // 2   width // 2
+
+    It can be created from initial y, u, v using slices
+    """
+    try:
+        y_size = abs(max(width, abs(ystride)))
+        u_size = abs(max(width // 2, abs(ustride)))
+        v_size = abs(max(width // 2, abs(vstride)))
+
+        y = np.asarray(y[:y_size * height], dtype=np.uint8).reshape(height, y_size)
+        u = np.asarray(u[:u_size * height // 2], dtype=np.uint8).reshape(height // 2, u_size)
+        v = np.asarray(v[:v_size * height // 2], dtype=np.uint8).reshape(height // 2, v_size)
+
+        width -= width % 4
+        height -= height % 4
+
+        frame = np.zeros((int(height * 1.5), width), dtype=np.uint8)
+
+        frame[:height, :] = y[:height, :width]
+        frame[height:height * 5 // 4, :width // 2] = u[:height // 2:2, :width // 2]
+        frame[height:height * 5 // 4, width // 2:] = u[1:height // 2:2, :width // 2]
+
+        frame[height * 5 // 4:, :width // 2] = v[:height // 2:2, :width // 2]
+        frame[height * 5 // 4:, width // 2:] = v[1:height // 2:2, :width // 2]
+
+        frame = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)
+
+        invoke_in_main_thread(cv2.imshow, str(friend_number), frame)
+    except Exception as ex:
+        print(ex)
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - groups
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def group_message(window, tray, tox, messenger, settings, profile):
+    """
+    New message in group chat
+    """
+    def wrapped(tox_link, group_number, peer_id, message_type, message, length, user_data):
+        message = str(message[:length], 'utf-8')
+        invoke_in_main_thread(messenger.new_group_message, group_number, message_type, message, peer_id)
+        if window.isActiveWindow():
+            return
+        bl = settings['notify_all_gc'] or profile.name in message
+        name = tox.group_peer_get_name(group_number, peer_id)
+        if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and (not settings.locked) and bl:
+            invoke_in_main_thread(tray_notification, name, message, tray, window)
+        if settings['sound_notifications'] and bl and profile.status != TOX_USER_STATUS['BUSY']:
+            sound_notification(SOUND_NOTIFICATION['MESSAGE'])
+        icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
+        invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+
+    return wrapped
+
+
+def group_private_message(window, tray, tox, messenger, settings, profile):
+    """
+    New private message in group chat
+    """
+    def wrapped(tox_link, group_number, peer_id, message_type, message, length, user_data):
+        message = str(message[:length], 'utf-8')
+        invoke_in_main_thread(messenger.new_group_private_message, group_number, message_type, message, peer_id)
+        if window.isActiveWindow():
+            return
+        bl = settings['notify_all_gc'] or profile.name in message
+        name = tox.group_peer_get_name(group_number, peer_id)
+        if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and (not settings.locked) and bl:
+            invoke_in_main_thread(tray_notification, name, message, tray, window)
+        if settings['sound_notifications'] and bl and profile.status != TOX_USER_STATUS['BUSY']:
+            sound_notification(SOUND_NOTIFICATION['MESSAGE'])
+        icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
+        invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+
+    return wrapped
+
+
+def group_invite(window, settings, tray, profile, groups_service, contacts_provider):
+    def wrapped(tox, friend_number, invite_data, length, group_name, group_name_length, user_data):
+        group_name = str(bytes(group_name[:group_name_length]), 'utf-8')
+        invoke_in_main_thread(groups_service.process_group_invite,
+                              friend_number, group_name,
+                              bytes(invite_data[:length]))
+        if window.isActiveWindow():
+            return
+        if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
+            friend = contacts_provider.get_friend_by_number(friend_number)
+            title = util_ui.tr('New invite to group chat')
+            text = util_ui.tr('{} invites you to group "{}"').format(friend.name, group_name)
+            invoke_in_main_thread(tray_notification, title, text, tray, window)
+        icon = util.join_path(util.get_images_directory(), 'icon_new_messages.png')
+        invoke_in_main_thread(tray.setIcon, QtGui.QIcon(icon))
+
+    return wrapped
+
+
+def group_self_join(contacts_provider, contacts_manager, groups_service):
+    def wrapped(tox, group_number, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        invoke_in_main_thread(group.set_status, TOX_USER_STATUS['NONE'])
+        invoke_in_main_thread(groups_service.update_group_info, group)
+        invoke_in_main_thread(contacts_manager.update_filtration)
+
+    return wrapped
+
+
+def group_peer_join(contacts_provider, groups_service):
+    def wrapped(tox, group_number, peer_id, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        group.add_peer(peer_id)
+        invoke_in_main_thread(groups_service.generate_peers_list)
+        invoke_in_main_thread(groups_service.update_group_info, group)
+
+    return wrapped
+
+
+def group_peer_exit(contacts_provider, groups_service, contacts_manager):
+    def wrapped(tox, group_number, peer_id, message, length, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        group.remove_peer(peer_id)
+        invoke_in_main_thread(groups_service.generate_peers_list)
+
+    return wrapped
+
+
+def group_peer_name(contacts_provider, groups_service):
+    def wrapped(tox, group_number, peer_id, name, length, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        peer = group.get_peer_by_id(peer_id)
+        peer.name = str(name[:length], 'utf-8')
+        invoke_in_main_thread(groups_service.generate_peers_list)
+
+    return wrapped
+
+
+def group_peer_status(contacts_provider, groups_service):
+    def wrapped(tox, group_number, peer_id, peer_status, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        peer = group.get_peer_by_id(peer_id)
+        peer.status = peer_status
+        invoke_in_main_thread(groups_service.generate_peers_list)
+
+    return wrapped
+
+
+def group_topic(contacts_provider):
+    def wrapped(tox, group_number, peer_id, topic, length, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        topic = str(topic[:length], 'utf-8')
+        invoke_in_main_thread(group.set_status_message, topic)
+
+    return wrapped
+
+
+def group_moderation(groups_service, contacts_provider, contacts_manager, messenger):
+
+    def update_peer_role(group, mod_peer_id, peer_id, new_role):
+        peer = group.get_peer_by_id(peer_id)
+        peer.role = new_role
+        # TODO: add info message
+
+    def remove_peer(group, mod_peer_id, peer_id, is_ban):
+        contacts_manager.remove_group_peer_by_id(group, peer_id)
+        group.remove_peer(peer_id)
+        # TODO: add info message
+
+    def wrapped(tox, group_number, mod_peer_id, peer_id, event_type, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+
+        if event_type == TOX_GROUP_MOD_EVENT['KICK']:
+            remove_peer(group, mod_peer_id, peer_id, False)
+        elif event_type == TOX_GROUP_MOD_EVENT['BAN']:
+            remove_peer(group, mod_peer_id, peer_id, True)
+        elif event_type == TOX_GROUP_MOD_EVENT['OBSERVER']:
+            update_peer_role(group, mod_peer_id, peer_id, TOX_GROUP_ROLE['OBSERVER'])
+        elif event_type == TOX_GROUP_MOD_EVENT['USER']:
+            update_peer_role(group, mod_peer_id, peer_id, TOX_GROUP_ROLE['USER'])
+        elif event_type == TOX_GROUP_MOD_EVENT['MODERATOR']:
+            update_peer_role(group, mod_peer_id, peer_id, TOX_GROUP_ROLE['MODERATOR'])
+
+        invoke_in_main_thread(groups_service.generate_peers_list)
+
+    return wrapped
+
+
+def group_password(contacts_provider):
+
+    def wrapped(tox_link, group_number, password, length, user_data):
+        password = str(password[:length], 'utf-8')
+        group = contacts_provider.get_group_by_number(group_number)
+        group.password = password
+
+    return wrapped
+
+
+def group_peer_limit(contacts_provider):
+
+    def wrapped(tox_link, group_number, peer_limit, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        group.peer_limit = peer_limit
+
+    return wrapped
+
+
+def group_privacy_state(contacts_provider):
+
+    def wrapped(tox_link, group_number, privacy_state, user_data):
+        group = contacts_provider.get_group_by_number(group_number)
+        group.is_private = privacy_state == TOX_GROUP_PRIVACY_STATE['PRIVATE']
+
+    return wrapped
+
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - initialization
+# -----------------------------------------------------------------------------------------------------------------
+
+
+def init_callbacks(tox, profile, settings, plugin_loader, contacts_manager,
+                   calls_manager, file_transfer_handler, main_window, tray, messenger, groups_service,
+                   contacts_provider):
+    """
+    Initialization of all callbacks.
+    :param tox: Tox instance
+    :param profile: Profile instance
+    :param settings: Settings instance
+    :param contacts_manager: ContactsManager instance
+    :param contacts_manager: ContactsManager instance
+    :param calls_manager: CallsManager instance
+    :param file_transfer_handler: FileTransferHandler instance
+    :param plugin_loader: PluginLoader instance
+    :param main_window: MainWindow instance
+    :param tray: tray (for notifications)
+    :param messenger: Messenger instance
+    :param groups_service: GroupsService instance
+    :param contacts_provider: ContactsProvider instance
+    """
+    # self callbacks
+    tox.callback_self_connection_status(self_connection_status(tox, profile))
+
+    # friend callbacks
+    tox.callback_friend_status(friend_status(contacts_manager, file_transfer_handler, profile, settings))
+    tox.callback_friend_message(friend_message(messenger, contacts_manager, profile, settings, main_window, tray))
+    tox.callback_friend_connection_status(friend_connection_status(contacts_manager, profile, settings, plugin_loader,
+                                                                   file_transfer_handler, messenger, calls_manager))
+    tox.callback_friend_name(friend_name(contacts_provider, messenger))
+    tox.callback_friend_status_message(friend_status_message(contacts_manager, messenger))
+    tox.callback_friend_request(friend_request(contacts_manager))
+    tox.callback_friend_typing(friend_typing(messenger))
+    tox.callback_friend_read_receipt(friend_read_receipt(messenger))
+
+    # file transfer
+    tox.callback_file_recv(tox_file_recv(main_window, tray, profile, file_transfer_handler,
+                                         contacts_manager, settings))
+    tox.callback_file_recv_chunk(file_recv_chunk(file_transfer_handler))
+    tox.callback_file_chunk_request(file_chunk_request(file_transfer_handler))
+    tox.callback_file_recv_control(file_recv_control(file_transfer_handler))
+
+    # av
+    toxav = tox.AV
+    toxav.callback_call_state(call_state(calls_manager), 0)
+    toxav.callback_call(call(calls_manager), 0)
+    toxav.callback_audio_receive_frame(callback_audio(calls_manager), 0)
+    toxav.callback_video_receive_frame(video_receive_frame, 0)
+
+    # custom packets
+    tox.callback_friend_lossless_packet(lossless_packet(plugin_loader))
+    tox.callback_friend_lossy_packet(lossy_packet(plugin_loader))
+
+    # gc callbacks
+    tox.callback_group_message(group_message(main_window, tray, tox, messenger, settings, profile), 0)
+    tox.callback_group_private_message(group_private_message(main_window, tray, tox, messenger, settings, profile), 0)
+    tox.callback_group_invite(group_invite(main_window, settings, tray, profile, groups_service, contacts_provider), 0)
+    tox.callback_group_self_join(group_self_join(contacts_provider, contacts_manager, groups_service), 0)
+    tox.callback_group_peer_join(group_peer_join(contacts_provider, groups_service), 0)
+    tox.callback_group_peer_exit(group_peer_exit(contacts_provider, groups_service, contacts_manager), 0)
+    tox.callback_group_peer_name(group_peer_name(contacts_provider, groups_service), 0)
+    tox.callback_group_peer_status(group_peer_status(contacts_provider, groups_service), 0)
+    tox.callback_group_topic(group_topic(contacts_provider), 0)
+    tox.callback_group_moderation(group_moderation(groups_service, contacts_provider, contacts_manager, messenger), 0)
+    tox.callback_group_password(group_password(contacts_provider), 0)
+    tox.callback_group_peer_limit(group_peer_limit(contacts_provider), 0)
+    tox.callback_group_privacy_state(group_privacy_state(contacts_provider), 0)

toxygen/middleware/threads.py

@@ -0,0 +1,172 @@
+from bootstrap.bootstrap import *
+import threading
+import queue
+from utils import util
+import time
+from PyQt5 import QtCore
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Base threads
+# -----------------------------------------------------------------------------------------------------------------
+
+class BaseThread(threading.Thread):
+
+    def __init__(self):
+        super().__init__()
+        self._stop_thread = False
+
+    def stop_thread(self):
+        self._stop_thread = True
+        self.join()
+
+
+class BaseQThread(QtCore.QThread):
+
+    def __init__(self):
+        super().__init__()
+        self._stop_thread = False
+
+    def stop_thread(self):
+        self._stop_thread = True
+        self.wait()
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Toxcore threads
+# -----------------------------------------------------------------------------------------------------------------
+
+class InitThread(BaseThread):
+
+    def __init__(self, tox, plugin_loader, settings, is_first_start):
+        super().__init__()
+        self._tox, self._plugin_loader, self._settings = tox, plugin_loader, settings
+        self._is_first_start = is_first_start
+
+    def run(self):
+        if self._is_first_start:
+            # download list of nodes if needed
+            download_nodes_list(self._settings)
+            # start plugins
+            self._plugin_loader.load()
+
+        # bootstrap
+        try:
+            for data in generate_nodes():
+                if self._stop_thread:
+                    return
+                self._tox.bootstrap(*data)
+                self._tox.add_tcp_relay(*data)
+        except:
+            pass
+
+        for _ in range(10):
+            if self._stop_thread:
+                return
+            time.sleep(1)
+
+        while not self._tox.self_get_connection_status():
+            try:
+                for data in generate_nodes(None):
+                    if self._stop_thread:
+                        return
+                    self._tox.bootstrap(*data)
+                    self._tox.add_tcp_relay(*data)
+            except:
+                pass
+            finally:
+                time.sleep(5)
+
+
+class ToxIterateThread(BaseQThread):
+
+    def __init__(self, tox):
+        super().__init__()
+        self._tox = tox
+
+    def run(self):
+        while not self._stop_thread:
+            self._tox.iterate()
+            time.sleep(self._tox.iteration_interval() / 1000)
+
+
+class ToxAVIterateThread(BaseQThread):
+
+    def __init__(self, toxav):
+        super().__init__()
+        self._toxav = toxav
+
+    def run(self):
+        while not self._stop_thread:
+            self._toxav.iterate()
+            time.sleep(self._toxav.iteration_interval() / 1000)
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# File transfers thread
+# -----------------------------------------------------------------------------------------------------------------
+
+class FileTransfersThread(BaseQThread):
+
+    def __init__(self):
+        super().__init__()
+        self._queue = queue.Queue()
+        self._timeout = 0.01
+
+    def execute(self, func, *args, **kwargs):
+        self._queue.put((func, args, kwargs))
+
+    def run(self):
+        while not self._stop_thread:
+            try:
+                func, args, kwargs = self._queue.get(timeout=self._timeout)
+                func(*args, **kwargs)
+            except queue.Empty:
+                pass
+            except queue.Full:
+                util.log('Queue is full in _thread')
+            except Exception as ex:
+                util.log('Exception in _thread: ' + str(ex))
+
+
+_thread = FileTransfersThread()
+
+
+def start_file_transfer_thread():
+    _thread.start()
+
+
+def stop_file_transfer_thread():
+    _thread.stop_thread()
+
+
+def execute(func, *args, **kwargs):
+    _thread.execute(func, *args, **kwargs)
+
+
+# -----------------------------------------------------------------------------------------------------------------
+# Invoking in main thread
+# -----------------------------------------------------------------------------------------------------------------
+
+class InvokeEvent(QtCore.QEvent):
+    EVENT_TYPE = QtCore.QEvent.Type(QtCore.QEvent.registerEventType())
+
+    def __init__(self, fn, *args, **kwargs):
+        QtCore.QEvent.__init__(self, InvokeEvent.EVENT_TYPE)
+        self.fn = fn
+        self.args = args
+        self.kwargs = kwargs
+
+
+class Invoker(QtCore.QObject):
+
+    def event(self, event):
+        event.fn(*event.args, **event.kwargs)
+        return True
+
+
+_invoker = Invoker()
+
+
+def invoke_in_main_thread(fn, *args, **kwargs):
+    QtCore.QCoreApplication.postEvent(_invoker, InvokeEvent(fn, *args, **kwargs))

toxygen/middleware/tox_factory.py

@@ -0,0 +1,34 @@
+import user_data.settings
+import wrapper.tox
+import wrapper.toxcore_enums_and_consts as enums
+import ctypes
+
+
+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 = user_data.settings.Settings.get_default_settings()
+
+    tox_options = wrapper.tox.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']
+    tox_options.contents.local_discovery_enabled = settings['lan_discovery']
+    if data:  # load existing profile
+        tox_options.contents.savedata_type = enums.TOX_SAVEDATA_TYPE['TOX_SAVE']
+        tox_options.contents.savedata_data = ctypes.c_char_p(data)
+        tox_options.contents.savedata_length = len(data)
+    else:  # create new profile
+        tox_options.contents.savedata_type = enums.TOX_SAVEDATA_TYPE['NONE']
+        tox_options.contents.savedata_data = None
+        tox_options.contents.savedata_length = 0
+
+    return wrapper.tox.Tox(tox_options)

toxygen/network/tox_dns.py

@@ -0,0 +1,65 @@
+import json
+import urllib.request
+import utils.util as util
+from PyQt5 import QtNetwork, QtCore
+
+
+class ToxDns:
+
+    def __init__(self, settings):
+        self._settings = settings
+
+    @staticmethod
+    def _send_request(url, data):
+        req = urllib.request.Request(url)
+        req.add_header('Content-Type', 'application/json')
+        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:
+            raise LookupError()
+
+    def lookup(self, email):
+        """
+        TOX DNS 4
+        :param email: data like 'groupbot@toxme.io'
+        :return: tox id on success else None
+        """
+        site = email.split('@')[1]
+        data = {"action": 3, "name": "{}".format(email)}
+        urls = ('https://{}/api'.format(site), 'http://{}/api'.format(site))
+        if not self._settings['proxy_type']:  # no proxy
+            for url in urls:
+                try:
+                    return self._send_request(url, data)
+                except Exception as ex:
+                    util.log('TOX DNS ERROR: ' + str(ex))
+        else:  # proxy
+            netman = QtNetwork.QNetworkAccessManager()
+            proxy = QtNetwork.QNetworkProxy()
+            if self._settings['proxy_type'] == 2:
+                proxy.setType(QtNetwork.QNetworkProxy.Socks5Proxy)
+            else:
+                proxy.setType(QtNetwork.QNetworkProxy.HttpProxy)
+            proxy.setHostName(self._settings['proxy_host'])
+            proxy.setPort(self._settings['proxy_port'])
+            netman.setProxy(proxy)
+            for url in urls:
+                try:
+                    request = QtNetwork.QNetworkRequest()
+                    request.setUrl(QtCore.QUrl(url))
+                    request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/json")
+                    reply = netman.post(request, bytes(json.dumps(data), 'utf-8'))
+
+                    while not reply.isFinished():
+                        QtCore.QThread.msleep(1)
+                        QtCore.QCoreApplication.processEvents()
+                    data = bytes(reply.readAll().data())
+                    result = json.loads(str(data, 'utf-8'))
+                    if not result['c']:
+                        return result['tox_id']
+                except Exception as ex:
+                    util.log('TOX DNS ERROR: ' + str(ex))
+
+        return None  # error

toxygen/notifications.py

@@ -1,71 +0,0 @@
-from PyQt5 import QtCore, QtWidgets
-from util import curr_directory
-import wave
-import pyaudio
-
-
-SOUND_NOTIFICATION = {
-    'MESSAGE': 0,
-    'FRIEND_CONNECTION_STATUS': 1,
-    'FILE_TRANSFER': 2
-}
-
-
-def tray_notification(title, text, tray, window):
-    """
-    Show tray notification and activate window icon
-    NOTE: different behaviour on different OS
-    :param title: Name of user who sent message or file
-    :param text: text of message or file info
-    :param tray: ref to tray icon
-    :param window: main window
-    """
-    if QtWidgets.QSystemTrayIcon.isSystemTrayAvailable():
-        if len(text) > 30:
-            text = text[:27] + '...'
-        tray.showMessage(title, text, QtWidgets.QSystemTrayIcon.NoIcon, 3000)
-        QtWidgets.QApplication.alert(window, 0)
-
-        def message_clicked():
-            window.setWindowState(window.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
-            window.activateWindow()
-        tray.messageClicked.connect(message_clicked)
-
-
-class AudioFile:
-    chunk = 1024
-
-    def __init__(self, fl):
-        self.wf = wave.open(fl, 'rb')
-        self.p = pyaudio.PyAudio()
-        self.stream = self.p.open(
-            format=self.p.get_format_from_width(self.wf.getsampwidth()),
-            channels=self.wf.getnchannels(),
-            rate=self.wf.getframerate(),
-            output=True)
-
-    def play(self):
-        data = self.wf.readframes(self.chunk)
-        while data:
-            self.stream.write(data)
-            data = self.wf.readframes(self.chunk)
-
-    def close(self):
-        self.stream.close()
-        self.p.terminate()
-
-
-def sound_notification(t):
-    """
-    Plays sound notification
-    :param t: type of notification
-    """
-    if t == SOUND_NOTIFICATION['MESSAGE']:
-        f = curr_directory() + '/sounds/message.wav'
-    elif t == SOUND_NOTIFICATION['FILE_TRANSFER']:
-        f = curr_directory() + '/sounds/file.wav'
-    else:
-        f = curr_directory() + '/sounds/contact.wav'
-    a = AudioFile(f)
-    a.play()
-    a.close()

toxygen/notifications/sound.py

@@ -0,0 +1,54 @@
+import utils.util
+import wave
+import pyaudio
+import os.path
+
+
+SOUND_NOTIFICATION = {
+    'MESSAGE': 0,
+    'FRIEND_CONNECTION_STATUS': 1,
+    'FILE_TRANSFER': 2
+}
+
+
+class AudioFile:
+    chunk = 1024
+
+    def __init__(self, fl):
+        self.wf = wave.open(fl, 'rb')
+        self.p = pyaudio.PyAudio()
+        self.stream = self.p.open(
+            format=self.p.get_format_from_width(self.wf.getsampwidth()),
+            channels=self.wf.getnchannels(),
+            rate=self.wf.getframerate(),
+            output=True)
+
+    def play(self):
+        data = self.wf.readframes(self.chunk)
+        while data:
+            self.stream.write(data)
+            data = self.wf.readframes(self.chunk)
+
+    def close(self):
+        self.stream.close()
+        self.p.terminate()
+
+
+def sound_notification(t):
+    """
+    Plays sound notification
+    :param t: type of notification
+    """
+    if t == SOUND_NOTIFICATION['MESSAGE']:
+        f = get_file_path('message.wav')
+    elif t == SOUND_NOTIFICATION['FILE_TRANSFER']:
+        f = get_file_path('file.wav')
+    else:
+        f = get_file_path('contact.wav')
+    a = AudioFile(f)
+    a.play()
+    a.close()
+
+
+def get_file_path(file_name):
+    return os.path.join(utils.util.get_sounds_directory(), file_name)

toxygen/notifications/tray.py

@@ -0,0 +1,22 @@
+from PyQt5 import QtCore, QtWidgets
+
+
+def tray_notification(title, text, tray, window):
+    """
+    Show tray notification and activate window icon
+    NOTE: different behaviour on different OS
+    :param title: Name of user who sent message or file
+    :param text: text of message or file info
+    :param tray: ref to tray icon
+    :param window: main window
+    """
+    if QtWidgets.QSystemTrayIcon.isSystemTrayAvailable():
+        if len(text) > 30:
+            text = text[:27] + '...'
+        tray.showMessage(title, text, QtWidgets.QSystemTrayIcon.NoIcon, 3000)
+        QtWidgets.QApplication.alert(window, 0)
+
+        def message_clicked():
+            window.setWindowState(window.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
+            window.activateWindow()
+        tray.messageClicked.connect(message_clicked)

toxygen/plugin_support/plugin_support.py

@@ -1,36 +1,50 @@
-import util
+import utils.util as util
-import profile
 import os
 import importlib
 import inspect
 import plugins.plugin_super_class as pl
-import toxes
 import sys
 
 
-class PluginLoader(util.Singleton):
+class Plugin:
 
-    def __init__(self, tox, settings):
+    def __init__(self, plugin, is_active):
-        super().__init__()
+        self._instance = plugin
-        self._profile = profile.Profile.get_instance()
+        self._is_active = is_active
+
+    def get_instance(self):
+        return self._instance
+
+    instance = property(get_instance)
+
+    def get_is_active(self):
+        return self._is_active
+
+    def set_is_active(self, is_active):
+        self._is_active = is_active
+
+    is_active = property(get_is_active, set_is_active)
+
+
+class PluginLoader:
+
+    def __init__(self, settings, app):
         self._settings = settings
-        self._plugins = {}  # dict. key - plugin unique short name, value - tuple (plugin instance, is active)
+        self._app = app
-        self._tox = tox
+        self._plugins = {}  # dict. key - plugin unique short name, value - Plugin instance
-        self._encr = toxes.ToxES.get_instance()
 
     def set_tox(self, tox):
         """
         New tox instance
         """
-        self._tox = tox
+        for plugin in self._plugins.values():
-        for value in self._plugins.values():
+            plugin.instance.set_tox(tox)
-            value[0].set_tox(tox)
 
     def load(self):
         """
         Load all plugins in plugins folder
         """
-        path = util.curr_directory() + '/plugins/'
+        path = util.get_plugins_directory()
         if not os.path.exists(path):
             util.log('Plugin dir not found')
             return
@@ -52,17 +66,18 @@ class PluginLoader(util.Singleton):
             for elem in dir(module):
                 obj = getattr(module, elem)
                 # looking for plugin class in module
-                if inspect.isclass(obj) and hasattr(obj, 'is_plugin') and obj.is_plugin:
+                if not inspect.isclass(obj) or not hasattr(obj, 'is_plugin') or not obj.is_plugin:
+                    continue
                 print('Plugin', elem)
                 try:  # create instance of plugin class
-                        inst = obj(self._tox, self._profile, self._settings, self._encr)
+                    instance = obj(self._app)
-                        autostart = inst.get_short_name() in self._settings['plugins']
+                    is_active = instance.get_short_name() in self._settings['plugins']
-                        if autostart:
+                    if is_active:
-                            inst.start()
+                        instance.start()
                 except Exception as ex:
                     util.log('Exception in module ' + name + ' Exception: ' + str(ex))
                     continue
-                    self._plugins[inst.get_short_name()] = [inst, autostart]  # (inst, is active)
+                self._plugins[instance.get_short_name()] = Plugin(instance, is_active)
                 break
 
     def callback_lossless(self, friend_number, data):
@@ -71,8 +86,8 @@ class PluginLoader(util.Singleton):
         """
         l = data[0] - pl.LOSSLESS_FIRST_BYTE
         name = ''.join(chr(x) for x in data[1:l + 1])
-        if name in self._plugins and self._plugins[name][1]:
+        if name in self._plugins and self._plugins[name].is_active:
-            self._plugins[name][0].lossless_packet(''.join(chr(x) for x in data[l + 1:]), friend_number)
+            self._plugins[name].instance.lossless_packet(''.join(chr(x) for x in data[l + 1:]), friend_number)
 
     def callback_lossy(self, friend_number, data):
         """
@@ -80,37 +95,38 @@ class PluginLoader(util.Singleton):
         """
         l = data[0] - pl.LOSSY_FIRST_BYTE
         name = ''.join(chr(x) for x in data[1:l + 1])
-        if name in self._plugins and self._plugins[name][1]:
+        if name in self._plugins and self._plugins[name].is_active:
-            self._plugins[name][0].lossy_packet(''.join(chr(x) for x in data[l + 1:]), friend_number)
+            self._plugins[name].instance.lossy_packet(''.join(chr(x) for x in data[l + 1:]), friend_number)
 
     def friend_online(self, friend_number):
         """
         Friend with specified number is online
         """
-        for elem in self._plugins.values():
+        for plugin in self._plugins.values():
-            if elem[1]:
+            if plugin.is_active:
-                elem[0].friend_connected(friend_number)
+                plugin.instance.friend_connected(friend_number)
 
     def get_plugins_list(self):
         """
         Returns list of all plugins
         """
         result = []
-        for data in self._plugins.values():
+        for plugin in self._plugins.values():
             try:
-                result.append([data[0].get_name(),  # plugin full name
+                result.append([plugin.instance.get_name(),  # plugin full name
-                               data[1],  # is enabled
+                               plugin.is_active,  # is enabled
-                               data[0].get_description(),  # plugin description
+                               plugin.instance.get_description(),  # plugin description
-                               data[0].get_short_name()])  # key - short unique name
+                               plugin.instance.get_short_name()])  # key - short unique name
             except:
                 continue
+
         return result
 
     def plugin_window(self, key):
         """
         Return window or None for specified plugin
         """
-        return self._plugins[key][0].get_window()
+        return self._plugins[key].instance.get_window()
 
     def toggle_plugin(self, key):
         """
@@ -118,12 +134,12 @@ class PluginLoader(util.Singleton):
         :param key: plugin short name
         """
         plugin = self._plugins[key]
-        if plugin[1]:
+        if plugin.is_active:
-            plugin[0].stop()
+            plugin.instance.stop()
         else:
-            plugin[0].start()
+            plugin.instance.start()
-        plugin[1] = not plugin[1]
+        plugin.is_active = not plugin.is_active
-        if plugin[1]:
+        if plugin.is_active:
             self._settings['plugins'].append(key)
         else:
             self._settings['plugins'].remove(key)
@@ -135,30 +151,32 @@ class PluginLoader(util.Singleton):
         """
         text = text.strip()
         name = text.split()[0]
-        if name in self._plugins and self._plugins[name][1]:
+        if name in self._plugins and self._plugins[name].is_active:
-            self._plugins[name][0].command(text[len(name) + 1:])
+            self._plugins[name].instance.command(text[len(name) + 1:])
 
-    def get_menu(self, menu, num):
+    def get_menu(self, num):
         """
         Return list of items for menu
         """
         result = []
-        for elem in self._plugins.values():
+        for plugin in self._plugins.values():
-            if elem[1]:
+            if not plugin.is_active:
+                continue
             try:
-                    result.extend(elem[0].get_menu(menu, num))
+                result.extend(plugin.instance.get_menu(num))
             except:
                 continue
         return result
 
     def get_message_menu(self, menu, selected_text):
         result = []
-        for elem in self._plugins.values():
+        for plugin in self._plugins.values():
-            if elem[1]:
+            if not plugin.is_active:
-                try:
-                    result.extend(elem[0].get_message_menu(menu, selected_text))
-                except:
                 continue
+            try:
+                result.extend(plugin.instance.get_message_menu(menu, selected_text))
+            except:
+                pass
         return result
 
     def stop(self):
@@ -166,8 +184,8 @@ class PluginLoader(util.Singleton):
         App is closing, stop all plugins
         """
         for key in list(self._plugins.keys()):
-            if self._plugins[key][1]:
+            if self._plugins[key].is_active:
-                self._plugins[key][0].close()
+                self._plugins[key].instance.close()
             del self._plugins[key]
 
     def reload(self):

toxygen/plugins/plugin_super_class.py

@@ -1,5 +1,7 @@
 import os
 from PyQt5 import QtCore, QtWidgets
+import utils.ui as util_ui
+import common.tox_save as tox_save
 
 
 MAX_SHORT_NAME_LENGTH = 5
@@ -26,25 +28,22 @@ def log(name, data):
         fl.write(str(data) + '\n')
 
 
-class PluginSuperClass:
+class PluginSuperClass(tox_save.ToxSave):
     """
     Superclass for all plugins. Plugin is Python3 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):
+    def __init__(self, name, short_name, app):
         """
-        Constructor. In plugin __init__ should take only 4 last arguments
+        Constructor. In plugin __init__ should take only 1 last argument
         :param name: plugin full name
         :param short_name: plugin unique short name (length of short name should not exceed MAX_SHORT_NAME_LENGTH)
-        :param tox: tox instance
+        :param app: App instance
-        :param profile: profile instance
-        :param settings: profile settings
-        :param encrypt_save: ToxES instance.
         """
-        self._settings = settings
+        tox = getattr(app, '_tox')
-        self._profile = profile
+        super().__init__(tox)
-        self._tox = tox
+        self._settings = getattr(app, '_settings')
         name = name.strip()
         short_name = short_name.strip()
         if not name or not short_name:
@@ -52,7 +51,6 @@ class PluginSuperClass:
         self._name = name
         self._short_name = short_name[:MAX_SHORT_NAME_LENGTH]
         self._translator = None  # translator for plugin's GUI
-        self._encrypt_save = encrypt_save
 
     # -----------------------------------------------------------------------------------------------------------------
     # Get methods
@@ -76,12 +74,11 @@ class PluginSuperClass:
         """
         return self.__doc__
 
-    def get_menu(self, menu, row_number):
+    def get_menu(self, row_number):
         """
         This method creates items for menu which called on right click in list of friends
-        :param menu: menu instance
         :param row_number: number of selected row in list of contacts
-        :return list of QAction's
+        :return list of tuples (text, handler)
         """
         return []
 
@@ -100,12 +97,6 @@ class PluginSuperClass:
         """
         return None
 
-    def set_tox(self, tox):
-        """
-        New tox instance
-        """
-        self._tox = tox
-
     # -----------------------------------------------------------------------------------------------------------------
     # Plugin was stopped, started or new command received
     # -----------------------------------------------------------------------------------------------------------------
@@ -134,11 +125,9 @@ class PluginSuperClass:
         :param command: string with command
         """
         if command == 'help':
-            msgbox = QtWidgets.QMessageBox()
+            text = util_ui.tr('No commands available')
-            title = QtWidgets.QApplication.translate("PluginWindow", "List of commands for plugin {}")
+            title = util_ui.tr('List of commands for plugin {}').format(self._name)
-            msgbox.setWindowTitle(title.format(self._name))
+            util_ui.message_box(text, title)
-            msgbox.setText(QtWidgets.QApplication.translate("PluginWindow", "No commands available"))
-            msgbox.exec_()
 
     # -----------------------------------------------------------------------------------------------------------------
     # Translations support

toxygen/smileys/smileys.py

@@ -1,11 +1,11 @@
-import util
+from utils import util
 import json
 import os
 from collections import OrderedDict
 from PyQt5 import QtCore
 
 
-class SmileyLoader(util.Singleton):
+class SmileyLoader:
     """
     Class which loads smileys packs and insert smileys into messages
     """
@@ -25,7 +25,7 @@ class SmileyLoader(util.Singleton):
         pack_name = self._settings['smiley_pack']
         if self._settings['smileys'] and self._curr_pack != pack_name:
             self._curr_pack = pack_name
-            path = self.get_smileys_path() + 'config.json'
+            path = util.join_path(self.get_smileys_path(), 'config.json')
             try:
                 with open(path, encoding='utf8') as fl:
                     self._smileys = json.loads(fl.read())
@@ -34,7 +34,7 @@ class SmileyLoader(util.Singleton):
                 print('Smiley pack {} loaded'.format(pack_name))
                 keys, values, self._list = [], [], []
                 for key, value in tmp.items():
-                    value = self.get_smileys_path() + value
+                    value = util.join_path(self.get_smileys_path(), value)
                     if value not in values:
                         keys.append(key)
                         values.append(value)
@@ -45,10 +45,11 @@ class SmileyLoader(util.Singleton):
                 print('Smiley pack {} was not loaded. Error: {}'.format(pack_name, ex))
 
     def get_smileys_path(self):
-        return util.curr_directory() + '/smileys/' + self._curr_pack + '/' if self._curr_pack is not None else None
+        return util.join_path(util.get_smileys_directory(), self._curr_pack) if self._curr_pack is not None else None
 
-    def get_packs_list(self):
+    @staticmethod
-        d = util.curr_directory() + '/smileys/'
+    def get_packs_list():
+        d = util.get_smileys_directory()
         return [x[1] for x in os.walk(d)][0]
 
     def get_smileys(self):
@@ -71,18 +72,3 @@ class SmileyLoader(util.Singleton):
                 if file_name.endswith('.gif'):  # animated smiley
                     edit.addAnimation(QtCore.QUrl(file_name), self.get_smileys_path() + file_name)
         return ' '.join(arr)
-
-
-def sticker_loader():
-    """
-    :return list of stickers
-    """
-    result = []
-    d = util.curr_directory() + '/stickers/'
-    keys = [x[1] for x in os.walk(d)][0]
-    for key in keys:
-        path = d + key + '/'
-        files = filter(lambda f: f.endswith('.png'), os.listdir(path))
-        files = map(lambda f: str(path + f), files)
-        result.extend(files)
-    return result

toxygen/stickers/stickers.py

@@ -0,0 +1,18 @@
+import os
+import utils.util as util
+
+
+def load_stickers():
+    """
+    :return list of stickers
+    """
+    result = []
+    d = util.get_stickers_directory()
+    keys = [x[1] for x in os.walk(d)][0]
+    for key in keys:
+        path = util.join_path(d, key)
+        files = filter(lambda f: f.endswith('.png'), os.listdir(path))
+        files = map(lambda f: util.join_path(path, f), files)
+        result.extend(files)
+
+    return result

toxygen/styles/dark_style.qss

@@ -1207,12 +1207,12 @@ MessageItem
     border: none;
 }
 
-MessageEdit
+MessageBrowser
 {
     border: none;
 }
 
-MessageEdit::focus
+MessageBrowser::focus
 {
     border: none;
 }
@@ -1222,7 +1222,7 @@ MessageItem::focus
     border: none;
 }
 
-MessageEdit:hover
+MessageBrowser:hover
 {
     border: none;
 }
@@ -1243,7 +1243,7 @@ QPushButton:hover
     background-color: #1E90FF;
 }
 
-MessageEdit 
+MessageBrowser
 {
     background-color: transparent;
 }
@@ -1253,7 +1253,7 @@ MessageEdit
     background-color: #1E90FF;
 }
 
-#friends_list:item:selected
+#friendsListWidget:item:selected
 {
     background-color: #333333;
 }
@@ -1277,7 +1277,7 @@ QListWidget > QLabel
     color: #A9A9A9;
 }
 
-#contact_name
+#searchLineEdit
 {
     padding-left: 22px;
 }
@@ -1322,3 +1322,14 @@ ClickableLabel:hover
 {
     background-color: #4A4949;
 }
+
+#warningLabel
+{
+    color: #BC1C1C;
+}
+
+#groupInvitesPushButton
+{
+    background-color: #009c00;
+}
+

toxygen/styles/style.qss

@@ -1,4 +1,4 @@
-#contact_name
+#searchLineEdit
 {
     padding-left: 22px;
 }
@@ -27,3 +27,14 @@ MessageEdit
 {
     background-color: transparent;
 }
+
+#warningLabel
+{
+    color: #BC1C1C;
+}
+
+#groupInvitesPushButton
+{
+    background-color: #009c00;
+}
+

toxygen/tox_dns.py

@@ -1,59 +0,0 @@
-import json
-import urllib.request
-from util import log
-import settings
-from PyQt5 import QtNetwork, QtCore
-
-
-def tox_dns(email):
-    """
-    TOX DNS 4
-    :param email: data like 'groupbot@toxme.io'
-    :return: tox id on success else None
-    """
-    site = email.split('@')[1]
-    data = {"action": 3, "name": "{}".format(email)}
-    urls = ('https://{}/api'.format(site), 'http://{}/api'.format(site))
-    s = settings.Settings.get_instance()
-    if not s['proxy_type']:  # no proxy
-        for url in urls:
-            try:
-                return send_request(url, data)
-            except Exception as ex:
-                log('TOX DNS ERROR: ' + str(ex))
-    else:  # proxy
-        netman = QtNetwork.QNetworkAccessManager()
-        proxy = QtNetwork.QNetworkProxy()
-        proxy.setType(QtNetwork.QNetworkProxy.Socks5Proxy if s['proxy_type'] == 2 else QtNetwork.QNetworkProxy.HttpProxy)
-        proxy.setHostName(s['proxy_host'])
-        proxy.setPort(s['proxy_port'])
-        netman.setProxy(proxy)
-        for url in urls:
-            try:
-                request = QtNetwork.QNetworkRequest()
-                request.setUrl(QtCore.QUrl(url))
-                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/json")
-                reply = netman.post(request, bytes(json.dumps(data), 'utf-8'))
-
-                while not reply.isFinished():
-                    QtCore.QThread.msleep(1)
-                    QtCore.QCoreApplication.processEvents()
-                data = bytes(reply.readAll().data())
-                result = json.loads(str(data, 'utf-8'))
-                if not result['c']:
-                    return result['tox_id']
-            except Exception as ex:
-                log('TOX DNS ERROR: ' + str(ex))
-
-    return None  # error
-
-
-def send_request(url, data):
-    req = urllib.request.Request(url)
-    req.add_header('Content-Type', 'application/json')
-    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:
-        raise LookupError()

toxygen/toxcore_enums_and_consts.py

@@ -1,220 +0,0 @@
-TOX_USER_STATUS = {
-    'NONE': 0,
-    'AWAY': 1,
-    'BUSY': 2,
-}
-
-TOX_MESSAGE_TYPE = {
-    'NORMAL': 0,
-    'ACTION': 1,
-}
-
-TOX_PROXY_TYPE = {
-    'NONE': 0,
-    'HTTP': 1,
-    'SOCKS5': 2,
-}
-
-TOX_SAVEDATA_TYPE = {
-    'NONE': 0,
-    'TOX_SAVE': 1,
-    'SECRET_KEY': 2,
-}
-
-TOX_ERR_OPTIONS_NEW = {
-    'OK': 0,
-    'MALLOC': 1,
-}
-
-TOX_ERR_NEW = {
-    'OK': 0,
-    'NULL': 1,
-    'MALLOC': 2,
-    'PORT_ALLOC': 3,
-    'PROXY_BAD_TYPE': 4,
-    'PROXY_BAD_HOST': 5,
-    'PROXY_BAD_PORT': 6,
-    'PROXY_NOT_FOUND': 7,
-    'LOAD_ENCRYPTED': 8,
-    'LOAD_BAD_FORMAT': 9,
-}
-
-TOX_ERR_BOOTSTRAP = {
-    'OK': 0,
-    'NULL': 1,
-    'BAD_HOST': 2,
-    'BAD_PORT': 3,
-}
-
-TOX_CONNECTION = {
-    'NONE': 0,
-    'TCP': 1,
-    'UDP': 2,
-}
-
-TOX_ERR_SET_INFO = {
-    'OK': 0,
-    'NULL': 1,
-    'TOO_LONG': 2,
-}
-
-TOX_ERR_FRIEND_ADD = {
-    'OK': 0,
-    'NULL': 1,
-    'TOO_LONG': 2,
-    'NO_MESSAGE': 3,
-    'OWN_KEY': 4,
-    'ALREADY_SENT': 5,
-    'BAD_CHECKSUM': 6,
-    'SET_NEW_NOSPAM': 7,
-    'MALLOC': 8,
-}
-
-TOX_ERR_FRIEND_DELETE = {
-    'OK': 0,
-    'FRIEND_NOT_FOUND': 1,
-}
-
-TOX_ERR_FRIEND_BY_PUBLIC_KEY = {
-    'OK': 0,
-    'NULL': 1,
-    'NOT_FOUND': 2,
-}
-
-TOX_ERR_FRIEND_GET_PUBLIC_KEY = {
-    'OK': 0,
-    'FRIEND_NOT_FOUND': 1,
-}
-
-TOX_ERR_FRIEND_GET_LAST_ONLINE = {
-    'OK': 0,
-    'FRIEND_NOT_FOUND': 1,
-}
-
-TOX_ERR_FRIEND_QUERY = {
-    'OK': 0,
-    'NULL': 1,
-    'FRIEND_NOT_FOUND': 2,
-}
-
-TOX_ERR_SET_TYPING = {
-    'OK': 0,
-    'FRIEND_NOT_FOUND': 1,
-}
-
-TOX_ERR_FRIEND_SEND_MESSAGE = {
-    'OK': 0,
-    'NULL': 1,
-    'FRIEND_NOT_FOUND': 2,
-    'FRIEND_NOT_CONNECTED': 3,
-    'SENDQ': 4,
-    'TOO_LONG': 5,
-    'EMPTY': 6,
-}
-
-TOX_FILE_KIND = {
-    'DATA': 0,
-    'AVATAR': 1,
-}
-
-TOX_FILE_CONTROL = {
-    'RESUME': 0,
-    'PAUSE': 1,
-    'CANCEL': 2,
-}
-
-TOX_ERR_FILE_CONTROL = {
-    'OK': 0,
-    'FRIEND_NOT_FOUND': 1,
-    'FRIEND_NOT_CONNECTED': 2,
-    'NOT_FOUND': 3,
-    'NOT_PAUSED': 4,
-    'DENIED': 5,
-    'ALREADY_PAUSED': 6,
-    'SENDQ': 7,
-}
-
-TOX_ERR_FILE_SEEK = {
-    'OK': 0,
-    'FRIEND_NOT_FOUND': 1,
-    'FRIEND_NOT_CONNECTED': 2,
-    'NOT_FOUND': 3,
-    'DENIED': 4,
-    'INVALID_POSITION': 5,
-    'SENDQ': 6,
-}
-
-TOX_ERR_FILE_GET = {
-    'OK': 0,
-    'NULL': 1,
-    'FRIEND_NOT_FOUND': 2,
-    'NOT_FOUND': 3,
-}
-
-TOX_ERR_FILE_SEND = {
-    'OK': 0,
-    'NULL': 1,
-    'FRIEND_NOT_FOUND': 2,
-    'FRIEND_NOT_CONNECTED': 3,
-    'NAME_TOO_LONG': 4,
-    'TOO_MANY': 5,
-}
-
-TOX_ERR_FILE_SEND_CHUNK = {
-    'OK': 0,
-    'NULL': 1,
-    'FRIEND_NOT_FOUND': 2,
-    'FRIEND_NOT_CONNECTED': 3,
-    'NOT_FOUND': 4,
-    'NOT_TRANSFERRING': 5,
-    'INVALID_LENGTH': 6,
-    'SENDQ': 7,
-    'WRONG_POSITION': 8,
-}
-
-TOX_ERR_FRIEND_CUSTOM_PACKET = {
-    'OK': 0,
-    'NULL': 1,
-    'FRIEND_NOT_FOUND': 2,
-    'FRIEND_NOT_CONNECTED': 3,
-    'INVALID': 4,
-    'EMPTY': 5,
-    'TOO_LONG': 6,
-    'SENDQ': 7,
-}
-
-TOX_ERR_GET_PORT = {
-    'OK': 0,
-    'NOT_BOUND': 1,
-}
-
-TOX_CHAT_CHANGE = {
-    'PEER_ADD': 0,
-    'PEER_DEL': 1,
-    'PEER_NAME': 2
-}
-
-TOX_GROUPCHAT_TYPE = {
-    'TEXT': 0,
-    'AV': 1
-}
-
-TOX_PUBLIC_KEY_SIZE = 32
-
-TOX_ADDRESS_SIZE = TOX_PUBLIC_KEY_SIZE + 6
-
-TOX_MAX_FRIEND_REQUEST_LENGTH = 1016
-
-TOX_MAX_MESSAGE_LENGTH = 1372
-
-TOX_MAX_NAME_LENGTH = 128
-
-TOX_MAX_STATUS_MESSAGE_LENGTH = 1007
-
-TOX_SECRET_KEY_SIZE = 32
-
-TOX_FILE_ID_LENGTH = 32
-
-TOX_HASH_LENGTH = 32
-
-TOX_MAX_CUSTOM_PACKET_SIZE = 1373

toxygen/toxes.py

@@ -1,28 +0,0 @@
-import util
-import toxencryptsave
-
-
-class ToxES(util.Singleton):
-
-    def __init__(self):
-        super().__init__()
-        self._toxencryptsave = toxencryptsave.ToxEncryptSave()
-        self._passphrase = None
-
-    def set_password(self, passphrase):
-        self._passphrase = passphrase
-
-    def has_password(self):
-        return bool(self._passphrase)
-
-    def is_password(self, password):
-        return self._passphrase == password
-
-    def is_data_encrypted(self, data):
-        return len(data) > 0 and self._toxencryptsave.is_data_encrypted(data)
-
-    def pass_encrypt(self, data):
-        return self._toxencryptsave.pass_encrypt(data, self._passphrase)
-
-    def pass_decrypt(self, data):
-        return self._toxencryptsave.pass_decrypt(data, self._passphrase)

toxygen/ui/av_widgets.py

@@ -1,17 +1,16 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
-import widgets
+from ui import widgets
-import profile
+import utils.util as util
-import util
 import pyaudio
 import wave
-import settings
-from util import curr_directory
 
 
 class IncomingCallWidget(widgets.CenteredWidget):
 
-    def __init__(self, friend_number, text, name):
+    def __init__(self, settings, calls_manager, friend_number, text, name):
-        super(IncomingCallWidget, self).__init__()
+        super().__init__()
+        self._settings = settings
+        self._calls_manager = calls_manager
         self.setWindowFlags(QtCore.Qt.CustomizeWindowHint | QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowStaysOnTopHint)
         self.resize(QtCore.QSize(500, 270))
         self.avatar_label = QtWidgets.QLabel(self)
@@ -21,7 +20,7 @@ class IncomingCallWidget(widgets.CenteredWidget):
         self.name.setGeometry(QtCore.QRect(90, 20, 300, 25))
         self._friend_number = friend_number
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily(settings['font'])
         font.setPointSize(16)
         font.setBold(True)
         self.name.setFont(font)
@@ -34,13 +33,13 @@ class IncomingCallWidget(widgets.CenteredWidget):
         self.accept_video.setGeometry(QtCore.QRect(170, 100, 150, 150))
         self.decline = QtWidgets.QPushButton(self)
         self.decline.setGeometry(QtCore.QRect(320, 100, 150, 150))
-        pixmap = QtGui.QPixmap(util.curr_directory() + '/images/accept_audio.png')
+        pixmap = QtGui.QPixmap(util.join_path(util.get_images_directory(), 'accept_audio.png'))
         icon = QtGui.QIcon(pixmap)
         self.accept_audio.setIcon(icon)
-        pixmap = QtGui.QPixmap(util.curr_directory() + '/images/accept_video.png')
+        pixmap = QtGui.QPixmap(util.join_path(util.get_images_directory(), 'accept_video.png'))
         icon = QtGui.QIcon(pixmap)
         self.accept_video.setIcon(icon)
-        pixmap = QtGui.QPixmap(util.curr_directory() + '/images/decline_call.png')
+        pixmap = QtGui.QPixmap(util.join_path(util.get_images_directory(), 'decline_call.png'))
         icon = QtGui.QIcon(pixmap)
         self.decline.setIcon(icon)
         self.accept_audio.setIconSize(QtCore.QSize(150, 150))
@@ -90,11 +89,11 @@ class IncomingCallWidget(widgets.CenteredWidget):
                         self.stream.close()
                         self.p.terminate()
 
-                self.a = AudioFile(curr_directory() + '/sounds/call.wav')
+                self.a = AudioFile(util.join_path(util.get_sounds_directory(), 'call.wav'))
                 self.a.play()
                 self.a.close()
 
-        if settings.Settings.get_instance()['calls_sound']:
+        if self._settings['calls_sound']:
             self.thread = SoundPlay()
             self.thread.start()
         else:
@@ -110,24 +109,21 @@ class IncomingCallWidget(widgets.CenteredWidget):
         if self._processing:
             return
         self._processing = True
-        pr = profile.Profile.get_instance()
+        self._calls_manager.accept_call(self._friend_number, True, False)
-        pr.accept_call(self._friend_number, True, False)
         self.stop()
 
     def accept_call_with_video(self):
         if self._processing:
             return
         self._processing = True
-        pr = profile.Profile.get_instance()
+        self._calls_manager.accept_call(self._friend_number, True, True)
-        pr.accept_call(self._friend_number, True, True)
         self.stop()
 
     def decline_call(self):
         if self._processing:
             return
         self._processing = True
-        pr = profile.Profile.get_instance()
+        self._calls_manager.stop_call(self._friend_number, False)
-        pr.stop_call(self._friend_number, False)
         self.stop()
 
     def set_pixmap(self, pixmap):

toxygen/ui/contact_items.py

@@ -0,0 +1,97 @@
+from wrapper.toxcore_enums_and_consts import *
+from PyQt5 import QtCore, QtGui, QtWidgets
+from utils.util import *
+from ui.widgets import DataLabel
+
+
+class ContactItem(QtWidgets.QWidget):
+    """
+    Contact in friends list
+    """
+
+    def __init__(self, settings, parent=None):
+        QtWidgets.QWidget.__init__(self, parent)
+        mode = settings['compact_mode']
+        self.setBaseSize(QtCore.QSize(250, 40 if mode else 70))
+        self.avatar_label = QtWidgets.QLabel(self)
+        size = 32 if mode else 64
+        self.avatar_label.setGeometry(QtCore.QRect(3, 4, size, size))
+        self.avatar_label.setScaledContents(False)
+        self.avatar_label.setAlignment(QtCore.Qt.AlignCenter)
+        self.name = DataLabel(self)
+        self.name.setGeometry(QtCore.QRect(50 if mode else 75, 3 if mode else 10, 150, 15 if mode else 25))
+        font = QtGui.QFont()
+        font.setFamily(settings['font'])
+        font.setPointSize(10 if mode else 12)
+        font.setBold(True)
+        self.name.setFont(font)
+        self.status_message = DataLabel(self)
+        self.status_message.setGeometry(QtCore.QRect(50 if mode else 75, 20 if mode else 30, 170, 15 if mode else 20))
+        font.setPointSize(10)
+        font.setBold(False)
+        self.status_message.setFont(font)
+        self.connection_status = StatusCircle(self)
+        self.connection_status.setGeometry(QtCore.QRect(230, -2 if mode else 5, 32, 32))
+        self.messages = UnreadMessagesCount(settings, self)
+        self.messages.setGeometry(QtCore.QRect(20 if mode else 52, 20 if mode else 50, 30, 20))
+
+
+class StatusCircle(QtWidgets.QWidget):
+    """
+    Connection status
+    """
+    def __init__(self, parent):
+        QtWidgets.QWidget.__init__(self, parent)
+        self.setGeometry(0, 0, 32, 32)
+        self.label = QtWidgets.QLabel(self)
+        self.label.setGeometry(QtCore.QRect(0, 0, 32, 32))
+        self.unread = False
+
+    def update(self, status, unread_messages=None):
+        if unread_messages is None:
+            unread_messages = self.unread
+        else:
+            self.unread = unread_messages
+        if status == TOX_USER_STATUS['NONE']:
+            name = 'online'
+        elif status == TOX_USER_STATUS['AWAY']:
+            name = 'idle'
+        elif status == TOX_USER_STATUS['BUSY']:
+            name = 'busy'
+        else:
+            name = 'offline'
+        if unread_messages:
+            name += '_notification'
+            self.label.setGeometry(QtCore.QRect(0, 0, 32, 32))
+        else:
+            self.label.setGeometry(QtCore.QRect(2, 0, 32, 32))
+        pixmap = QtGui.QPixmap(join_path(get_images_directory(), '{}.png'.format(name)))
+        self.label.setPixmap(pixmap)
+
+
+class UnreadMessagesCount(QtWidgets.QWidget):
+
+    def __init__(self, settings, parent=None):
+        super().__init__(parent)
+        self._settings = settings
+        self.resize(30, 20)
+        self.label = QtWidgets.QLabel(self)
+        self.label.setGeometry(QtCore.QRect(0, 0, 30, 20))
+        self.label.setVisible(False)
+        font = QtGui.QFont()
+        font.setFamily(settings['font'])
+        font.setPointSize(12)
+        font.setBold(True)
+        self.label.setFont(font)
+        self.label.setAlignment(QtCore.Qt.AlignVCenter | QtCore.Qt.AlignCenter)
+        color = settings['unread_color']
+        self.label.setStyleSheet('QLabel { color: white; background-color: ' + color + '; border-radius: 10; }')
+
+    def update(self, messages_count):
+        color = self._settings['unread_color']
+        self.label.setStyleSheet('QLabel { color: white; background-color: ' + color + '; border-radius: 10; }')
+        if messages_count:
+            self.label.setVisible(True)
+            self.label.setText(str(messages_count))
+        else:
+            self.label.setVisible(False)

toxygen/ui/create_profile_screen.py

@@ -0,0 +1,52 @@
+from ui.widgets import *
+from PyQt5 import uic
+import utils.util as util
+import utils.ui as util_ui
+
+
+class CreateProfileScreenResult:
+
+    def __init__(self, save_into_default_folder, password):
+        self._save_into_default_folder = save_into_default_folder
+        self._password = password
+
+    def get_save_into_default_folder(self):
+        return self._save_into_default_folder
+
+    save_into_default_folder = property(get_save_into_default_folder)
+
+    def get_password(self):
+        return self._password
+
+    password = property(get_password)
+
+
+class CreateProfileScreen(CenteredWidget, DialogWithResult):
+
+    def __init__(self):
+        CenteredWidget.__init__(self)
+        DialogWithResult.__init__(self)
+        uic.loadUi(util.get_views_path('create_profile_screen'), self)
+        self.center()
+        self.createProfile.clicked.connect(self._create_profile)
+        self._retranslate_ui()
+
+    def _retranslate_ui(self):
+        self.setWindowTitle(util_ui.tr('New profile settings'))
+        self.defaultFolder.setText(util_ui.tr('Save in default folder'))
+        self.programFolder.setText(util_ui.tr('Save in program folder'))
+        self.password.setPlaceholderText(util_ui.tr('Password'))
+        self.confirmPassword.setPlaceholderText(util_ui.tr('Confirm password'))
+        self.createProfile.setText(util_ui.tr('Create profile'))
+        self.passwordLabel.setText(util_ui.tr('Password (at least 8 symbols):'))
+
+    def _create_profile(self):
+        password = self.password.text()
+        if password != self.confirmPassword.text():
+            self.errorLabel.setText(util_ui.tr('Passwords do not match'))
+            return
+        if 0 < len(password) < 8:
+            self.errorLabel.setText(util_ui.tr('Password must be at least 8 symbols'))
+            return
+        result = CreateProfileScreenResult(self.defaultFolder.isChecked(), password)
+        self.close_with_result(result)

toxygen/ui/group_bans_widgets.py

@@ -0,0 +1,68 @@
+from ui.widgets import CenteredWidget
+from PyQt5 import uic, QtWidgets, QtCore
+import utils.util as util
+import utils.ui as util_ui
+
+
+class GroupBanItem(QtWidgets.QWidget):
+
+    def __init__(self, ban, cancel_ban, can_cancel_ban, parent=None):
+        super().__init__(parent)
+        self._ban = ban
+        self._cancel_ban = cancel_ban
+        self._can_cancel_ban = can_cancel_ban
+
+        uic.loadUi(util.get_views_path('gc_ban_item'), self)
+        self._update_ui()
+
+    def _update_ui(self):
+        self._retranslate_ui()
+
+        self.banTargetLabel.setText(self._ban.ban_target)
+        ban_time = self._ban.ban_time
+        self.banTimeLabel.setText(util.unix_time_to_long_str(ban_time))
+
+        self.cancelPushButton.clicked.connect(self._cancel_ban)
+        self.cancelPushButton.setEnabled(self._can_cancel_ban)
+
+    def _retranslate_ui(self):
+        self.cancelPushButton.setText(util_ui.tr('Cancel ban'))
+
+    def _cancel_ban(self):
+        self._cancel_ban(self._ban.ban_id)
+
+
+class GroupBansScreen(CenteredWidget):
+
+    def __init__(self, groups_service, group):
+        super().__init__()
+        self._groups_service = groups_service
+        self._group = group
+
+        uic.loadUi(util.get_views_path('bans_list_screen'), self)
+        self._update_ui()
+
+    def _update_ui(self):
+        self._retranslate_ui()
+
+        self._refresh_bans_list()
+
+    def _retranslate_ui(self):
+        self.setWindowTitle(util_ui.tr('Bans list for group "{}"').format(self._group.name))
+
+    def _refresh_bans_list(self):
+        self.bansListWidget.clear()
+        can_cancel_ban = self._group.is_self_moderator_or_founder()
+        for ban in self._group.bans:
+            self._create_ban_item(ban, can_cancel_ban)
+
+    def _create_ban_item(self, ban, can_cancel_ban):
+        item = GroupBanItem(ban, self._on_ban_cancelled, can_cancel_ban, self.bansListWidget)
+        elem = QtWidgets.QListWidgetItem()
+        elem.setSizeHint(QtCore.QSize(item.width(), item.height()))
+        self.bansListWidget.addItem(elem)
+        self.bansListWidget.setItemWidget(elem, item)
+
+    def _on_ban_cancelled(self, ban_id):
+        self._groups_service.cancel_ban(self._group.number, ban_id)
+        self._refresh_bans_list()

toxygen/ui/group_invites_widgets.py

@@ -0,0 +1,127 @@
+from PyQt5 import uic, QtWidgets
+import utils.util as util
+from ui.widgets import *
+
+
+class GroupInviteItem(QtWidgets.QWidget):
+
+    def __init__(self, parent, chat_name, avatar, friend_name):
+        super().__init__(parent)
+        uic.loadUi(util.get_views_path('gc_invite_item'), self)
+
+        self.groupNameLabel.setText(chat_name)
+        self.friendNameLabel.setText(friend_name)
+        self.friendAvatarLabel.setPixmap(avatar)
+
+    def is_selected(self):
+        return self.selectCheckBox.isChecked()
+
+    def subscribe_checked_event(self, callback):
+        self.selectCheckBox.clicked.connect(callback)
+
+
+class GroupInvitesScreen(CenteredWidget):
+
+    def __init__(self, groups_service, profile, contacts_provider):
+        super().__init__()
+        self._groups_service = groups_service
+        self._profile = profile
+        self._contacts_provider = contacts_provider
+
+        uic.loadUi(util.get_views_path('group_invites_screen'), self)
+
+        self._update_ui()
+
+    def _update_ui(self):
+        self._retranslate_ui()
+
+        self._refresh_invites_list()
+
+        self.nickLineEdit.setText(self._profile.name)
+        self.statusComboBox.setCurrentIndex(self._profile.status or 0)
+
+        self.nickLineEdit.textChanged.connect(self._nick_changed)
+        self.acceptPushButton.clicked.connect(self._accept_invites)
+        self.declinePushButton.clicked.connect(self._decline_invites)
+
+        self.invitesListWidget.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+        self.invitesListWidget.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+
+        self._update_buttons_state()
+
+    def _retranslate_ui(self):
+        self.setWindowTitle(util_ui.tr('Group chat invites'))
+        self.noInvitesLabel.setText(util_ui.tr('No group invites found'))
+        self.acceptPushButton.setText(util_ui.tr('Accept'))
+        self.declinePushButton.setText(util_ui.tr('Decline'))
+        self.statusComboBox.addItem(util_ui.tr('Online'))
+        self.statusComboBox.addItem(util_ui.tr('Away'))
+        self.statusComboBox.addItem(util_ui.tr('Busy'))
+        self.nickLineEdit.setPlaceholderText(util_ui.tr('Your nick in chat'))
+        self.passwordLineEdit.setPlaceholderText(util_ui.tr('Optional password'))
+
+    def _get_friend(self, public_key):
+        return self._contacts_provider.get_friend_by_public_key(public_key)
+
+    def _accept_invites(self):
+        nick = self.nickLineEdit.text()
+        password = self.passwordLineEdit.text()
+        status = self.statusComboBox.currentIndex()
+
+        selected_invites = self._get_selected_invites()
+        for invite in selected_invites:
+            self._groups_service.accept_group_invite(invite, nick, status, password)
+
+        self._refresh_invites_list()
+        self._close_window_if_needed()
+
+    def _decline_invites(self):
+        selected_invites = self._get_selected_invites()
+        for invite in selected_invites:
+            self._groups_service.decline_group_invite(invite)
+
+        self._refresh_invites_list()
+        self._close_window_if_needed()
+
+    def _get_selected_invites(self):
+        all_invites = self._groups_service.get_group_invites()
+        selected = []
+        items_count = len(all_invites)
+        for index in range(items_count):
+            list_item = self.invitesListWidget.item(index)
+            item_widget = self.invitesListWidget.itemWidget(list_item)
+            if item_widget.is_selected():
+                selected.append(all_invites[index])
+
+        return selected
+
+    def _refresh_invites_list(self):
+        self.invitesListWidget.clear()
+        invites = self._groups_service.get_group_invites()
+        for invite in invites:
+            self._create_invite_item(invite)
+
+    def _create_invite_item(self, invite):
+        friend = self._get_friend(invite.friend_public_key)
+        item = GroupInviteItem(self.invitesListWidget, invite.chat_name, friend.get_pixmap(), friend.name)
+        item.subscribe_checked_event(self._item_selected)
+        elem = QtWidgets.QListWidgetItem()
+        elem.setSizeHint(QtCore.QSize(item.width(), item.height()))
+        self.invitesListWidget.addItem(elem)
+        self.invitesListWidget.setItemWidget(elem, item)
+
+    def _item_selected(self):
+        self._update_buttons_state()
+
+    def _nick_changed(self):
+        self._update_buttons_state()
+
+    def _update_buttons_state(self):
+        nick = self.nickLineEdit.text()
+        selected_items = self._get_selected_invites()
+        self.acceptPushButton.setEnabled(bool(nick) and len(selected_items))
+        self.declinePushButton.setEnabled(len(selected_items) > 0)
+
+    def _close_window_if_needed(self):
+        if self._groups_service.group_invites_count == 0:
+            self.close()

toxygen/ui/group_peers_list.py

@@ -0,0 +1,33 @@
+from ui.widgets import *
+from wrapper.toxcore_enums_and_consts import *
+
+
+class PeerItem(QtWidgets.QWidget):
+
+    def __init__(self, peer, handler, width, parent=None):
+        super().__init__(parent)
+        self.resize(QtCore.QSize(width, 34))
+        self.nameLabel = DataLabel(self)
+        self.nameLabel.setGeometry(5, 0, width - 5, 34)
+        name = peer.name
+        if peer.is_current_user:
+            name += util_ui.tr(' (You)')
+        self.nameLabel.setText(name)
+        if peer.status == TOX_USER_STATUS['NONE']:
+            style = 'QLabel {color: green}'
+        elif peer.status == TOX_USER_STATUS['AWAY']:
+            style = 'QLabel {color: yellow}'
+        else:
+            style = 'QLabel {color: red}'
+        self.nameLabel.setStyleSheet(style)
+        self.nameLabel.mousePressEvent = lambda x: handler(peer.id)
+
+
+class PeerTypeItem(QtWidgets.QWidget):
+
+    def __init__(self, text, width, parent=None):
+        super().__init__(parent)
+        self.resize(QtCore.QSize(width, 34))
+        self.nameLabel = DataLabel(self)
+        self.nameLabel.setGeometry(5, 0, width - 5, 34)
+        self.nameLabel.setText(text)