Fix group join by chat id

.gitignore

@@ -15,12 +15,9 @@ toxygen/libs
 toxygen/build
 toxygen/dist
 *.spec
-dist
+dist/
 toxygen/avatars
 toxygen/__pycache__
 /*.egg-info
 /*.egg
-html
-Toxygen.egg-info
-*.tox
 

.travis.yml

@@ -1,43 +0,0 @@
-language: python
-python:
-  - "3.5"
-  - "3.6"
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y checkinstall build-essential
-  - sudo apt-get install portaudio19-dev
-  - sudo apt-get install libconfig-dev libvpx-dev check -qq
-  - sudo apt-get install -y python3-pyqt5
-install:
-  - pip install pyaudio
-before_script:
-# OPUS
-  - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
-  - tar xzf opus-1.0.3.tar.gz
-  - cd opus-1.0.3
-  - ./configure
-  - make -j3
-  - sudo make install
-  - cd ..
-# Libsodium
-  - git clone git://github.com/jedisct1/libsodium.git
-  - cd libsodium
-  - git checkout tags/1.0.3
-  - ./autogen.sh
-  - ./configure && make -j$(nproc)
-  - sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.0 --nodoc -y
-  - sudo ldconfig
-  - cd ..
-# Toxcore
-  - git clone https://github.com/irungentoo/toxcore.git
-  - cd toxcore
-  - autoreconf -if
-  - ./configure
-  - make -j$(nproc)
-  - sudo make install
-  - echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
-  - sudo ldconfig
-  - cd ..
-script:
-  - py.test tests/travis.py
-  - py.test tests/tests.py

MANIFEST.in

@@ -10,8 +10,6 @@ include toxygen/smileys/animated/config.json
 include toxygen/smileys/starwars/*.gif
 include toxygen/smileys/starwars/*.png
 include toxygen/smileys/starwars/config.json
-include toxygen/smileys/ksk/*.png
-include toxygen/smileys/ksk/config.json
 include toxygen/styles/style.qss
 include toxygen/translations/*.qm
 include toxygen/libs/libtox.dll

README.md

@@ -1,24 +1,20 @@
 # Toxygen 
+Toxygen is cross-platform [Tox](https://tox.chat/) client written in Python3
 
-Toxygen is powerful cross-platform [Tox](https://tox.chat/) client written in pure Python3.
+[![Release](https://img.shields.io/github/release/xveduk/toxygen.svg?style=flat)](https://github.com/xveduk/toxygen/releases/latest)
+[![Open issues](https://img.shields.io/github/issues/xveduk/toxygen.svg?style=flat)](https://github.com/xveduk/toxygen/issues)
+[![License](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/xveduk/toxygen/master/LICENSE.md)
 
-[![Release](https://img.shields.io/github/release/toxygen-project/toxygen.svg?style=flat)](https://github.com/toxygen-project/toxygen/releases/latest)
+### [Install](/docs/install.md) - [Contribute](/docs/contributing.md) - [Plugins](/docs/plugins.md)
-[![Stars](https://img.shields.io/github/stars/toxygen-project/toxygen.svg?style=flat)](https://github.com/toxygen-project/toxygen/stargazers)
-[![Open issues](https://img.shields.io/github/issues/toxygen-project/toxygen.svg?style=flat)](https://github.com/toxygen-project/toxygen/issues)
-[![License](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/toxygen-project/toxygen/master/LICENSE.md)
-[![Build Status](https://travis-ci.org/toxygen-project/toxygen.svg?branch=master)](https://travis-ci.org/toxygen-project/toxygen)
-
-### [Install](/docs/install.md) - [Contribute](/docs/contributing.md) - [Plugins](/docs/plugins.md) - [Compile](/docs/compile.md) - [Contact](/docs/contact.md) - [Updater](https://github.com/toxygen-project/toxygen_updater)
 
 ### Supported OS:
+- Windows
+- Linux
 
-![Linux, Windows and OS X](/docs/os.png)
+###Features
-
-### Features:
-
 - [x] 1v1 messages
 - [x] File transfers
-- [x] Audio calls
+- [x] Audio
 - [x] Plugins support
 - [x] Chat history
 - [x] Emoticons
@@ -42,25 +38,23 @@ Toxygen is powerful cross-platform [Tox](https://tox.chat/) client written in pu
 - [x] Changing nospam
 - [x] File resuming
 - [x] Read receipts
-- [ ] Video calls
+- [ ] Video
 - [ ] Desktop sharing
 - [ ] Group chats
 
-### Downloads
+###Downloads
-[Releases](https://github.com/toxygen-project/toxygen/releases)
+[Releases](https://github.com/xveduk/toxygen/releases)
 
-[Download last stable version](https://github.com/toxygen-project/toxygen/archive/master.zip)
+[Download last stable version](https://github.com/xveduk/toxygen/archive/master.zip)
 
-[Download develop version](https://github.com/toxygen-project/toxygen/archive/develop.zip)
+[Download develop version](https://github.com/xveduk/toxygen/archive/develop.zip)
 
-### Screenshots
+###Screenshots
 *Toxygen on Ubuntu and Windows*
 ![Ubuntu](/docs/ubuntu.png)
 ![Windows](/docs/windows.png)
 
-### Docs
+
+###Docs
 [Check /docs/ for more info](/docs/)
 
-Also visit [pythonhosted.org/Toxygen/](http://pythonhosted.org/Toxygen/)
-
-[Wiki](https://wiki.tox.chat/clients/toxygen)

docs/compile.md

@@ -1,11 +1,10 @@
-# Compile Toxygen
+#Compile Toxygen
 
 You can compile Toxygen using [PyInstaller](http://www.pyinstaller.org/)
 
 Install PyInstaller: 
 ``pip3 install pyinstaller``
 
-Compile Toxygen:
 ``pyinstaller --windowed --icon images/icon.ico main.py``
 
-Don't forget to copy /images/, /sounds/, /translations/, /styles/, /smileys/, /stickers/, /plugins/ (and /libs/libtox.dll, /libs/libsodium.a on Windows) to /dist/main/
+Don't forget to copy /images/, /sounds/, /translations/, /styles/, /smileys/, /stickers/ (and /libs/libtox.dll on Windows) to /dist/main/

docs/contact.md

@@ -1,5 +0,0 @@
-# Contact us:
-
-1) Using GitHub - open issue
-
-2) Use Toxygen Tox Group - add bot kalina@toxme.io (or 12EDB939AA529641CE53830B518D6EB30241868EE0E5023C46A372363CAEC91C2C948AEFE4EB)

docs/contributing.md

@@ -4,15 +4,15 @@ Help us find all bugs in Toxygen! Please provide following info:
 
 - OS
 - Toxygen version
-- Toxygen executable info - .py or precompiled binary, how was it installed in system
+- Toxygen executable info - .py or precompiled binary
 - 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://github.com/xveduk/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://github.com/xveduk/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.
 
 #Translations

docs/install.md

@@ -1,54 +1,35 @@
 # How to install Toxygen
 
 ## Use precompiled binary:
-[Check our releases page](https://github.com/toxygen-project/toxygen/releases)
+[Check our releases page](https://github.com/xveduk/toxygen/releases)
 
-## Using pip3
+##Using pip3
 
-### Windows
+### Windows  (32-bit interpreter)
 
 ``pip3.4 install toxygen``
-
 Run app using ``toxygen`` command.
 
-### Linux
+##Linux
 
 1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
 2. Install PortAudio: 
 ``sudo apt-get install portaudio19-dev``
-3. Install PySide: ``sudo apt-get install python3-pyside``
-4. Install toxygen: 
-``sudo pip3.4 install toxygen``
-5. Run toxygen using ``toxygen`` command.
-
-### OS X
-
-1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system
-2. Install PortAudio:
-``brew install portaudio``
 3. Install toxygen: 
-``pip3.4 install toxygen``
+``sudo pip3.4 install toxygen``
-4. Run toxygen using ``toxygen`` command.
+4 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
 
 1. [Download and install latest Python 3.4](https://www.python.org/downloads/windows/)
-2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4#installing-pyside-on-a-windows-system) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
+2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
 3. Install PyAudio: ``pip3.4 install pyaudio``
 4. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
 5. Unpack archive  
 6. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\
-7. Run \toxygen\main.py.
+7. Run \src\main.py.
-
-Optional: install toxygen using setup.py: ``python3.4 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)
 
@@ -58,31 +39,21 @@ Optional: install toxygen using setup.py: ``python3.4 setup.py install``
 
 [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: 
+Dependencies:
+
+1. Install latest Python3.4: 
 ``sudo apt-get install python3``
-2. Install PySide: ``sudo apt-get install python3-pyside`` or install [PyQt4](https://riverbankcomputing.com/software/pyqt/download) (``sudo apt-get install python3-pyqt4``).
+2. [Install PySide](https://wiki.qt.io/PySide_Binaries_Linux) (recommended), using terminal - ``sudo apt-get install python3-pyside``, or install [PyQt4](https://riverbankcomputing.com/software/pyqt/download).
 3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
 4. Install PyAudio: 
-``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``pip3 install pyaudio``)
+``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio``
 5. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
 6. Unpack archive 
 7. Run app:
 ``python3.4 main.py``
 
-Optional: install toxygen using setup.py: ``python3.4 setup.py install``
+## Compile Toxygen
-
+Check [compile.md](/docs/compile.md) for more info
-### OS X
-
-1. [Download and install latest Python 3.4](https://www.python.org/downloads/mac-osx/)
-2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4#installing-pyside-on-a-mac-os-x-system) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
-3. Install PortAudio:
-``brew install portaudio``
-4. Install PyAudio: ``pip3 install pyaudio``
-5. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system
-6. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
-7. Unpack archive  
-8. Run \toxygen\main.py.
-
-Optional: install toxygen using setup.py: ``python3 setup.py install``

docs/plugin_api.md

@@ -1,4 +1,4 @@
-# Plugins API
+#Plugins API
 
 In Toxygen plugin is single python (supported Python 3.0 - 3.4) 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. 
@@ -12,13 +12,12 @@ All plugin's data should be stored in following structure:
 |---plugin_short_name.py
 |---/plugin_short_name/
 	|---settings.json
-	|---readme.txt
 	|---logs.txt
 	|---other_files
 ```
 
 Plugin MUST override:
--  __init__ with params: tox (Tox instance), profile (Profile instance), settings (Settings instance), encrypt_save (ToxES instance). Call super().__init__ with params plugin_full_name, plugin_short_name, tox, profile, settings, encrypt_save.
+-  __init__ with params: tox (Tox instance), profile (Profile instance), settings (Settings instance), encrypt_save (ToxEncryptSave instance). Call super().__init__ with params plugin_full_name, plugin_short_name, tox, profile, settings, encrypt_save.
 
 Plugin can override following methods:
 - get_description - this method should return plugin description. 
@@ -51,7 +50,7 @@ Exceptions:
 
 Plugin's methods MUST NOT raise exceptions.
 
-# Examples
+#Examples
 
-You can find examples in [official repo](https://github.com/toxygen-project/toxygen_plugins)
+You can find examples in [official repo](https://github.com/ingvar1995/toxygen_plugins)
 

docs/plugins.md

@@ -1,22 +1,22 @@
-# Plugins
+#Plugins
 
 Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python 3.4 module (.py file) and directory with plugin's data which provide some additional functionality. 
 
-# How to write plugin
+#How to write plugin
 
 Check [Plugin API](/docs/plugin_api.md) for more info
 
-# How to install plugin
+#How to install plugin
 
 Toxygen comes without preinstalled plugins.
 
-1. Put plugin and directory with its data into /src/plugins/ or import it via GUI (In menu: Plugins => Import plugin)
+1. Put plugin and directory with its data into /src/plugins/ or import it via GUI (In menu: Plugins -> Import plugin)
-2. Restart Toxygen or choose Plugins => Reload plugins in menu.
+2. Restart Toxygen
 
-## Note: /src/plugins/ should contain plugin_super_class.py and __init__.py
+##Note: /src/plugins/ should contain plugin_super_class.py and __init__.py
 
-# Plugins list
+#Plugins list
 
 WARNING: It is unsecure to install plugin not from this list!
 
-[Main repo](https://github.com/toxygen-project/toxygen_plugins)
+[Main repo](https://github.com/ingvar1995/toxygen_plugins)

docs/smileys_and_stickers.md

@@ -10,4 +10,4 @@ Animated smileys (.gif) are supported too.
 
 Sticker is inline image. If you want to create your own smiley pack, create directory in src/stickers/ and place your stickers there.
 
-Users can import smileys and stickers using menu: Settings -> Interface
+Users can import plugins and stickers packs using menu: Settings -> Interface

setup.py

@@ -3,20 +3,14 @@ from setuptools.command.install import install
 from platform import system
 from subprocess import call
 from toxygen.util import program_version
-import sys
 
 
 version = program_version + '.0'
 
-MODULES = []
+MODULES = ['PyAudio']
 
-if system() in ('Windows', 'Darwin'):
+if system() == 'Windows':
-    MODULES = ['PyAudio', 'PyQt5']
+    MODULES.append('PySide')
-else:
-    try:
-        import pyaudio
-    except ImportError:
-        MODULES = ['PyAudio']
 
 
 class InstallScript(install):
@@ -24,31 +18,17 @@ class InstallScript(install):
 
     def run(self):
         install.run(self)
-        try:
+        OS = system()
-            if system() == 'Windows':
+        if OS == 'Windows':
-                call(["toxygen", "--configure"])
+            call(["toxygen", "--configure"])
-            else:
+        elif OS == 'Linux':
-                call(["toxygen", "--clean"])
+            call(["toxygen", "--clean"])
-        except:
-            try:
-                params = list(filter(lambda x: x.startswith('--prefix='), sys.argv))
-                if params:
-                    path = params[0][len('--prefix='):]
-                    if path[-1] not in ('/', '\\'):
-                        path += '/'
-                    path += 'bin/toxygen'
-                    if system() == 'Windows':
-                        call([path, "--configure"])
-                    else:
-                        call([path, "--clean"])
-            except:
-                pass
 
 setup(name='Toxygen',
       version=version,
       description='Toxygen - Tox client',
       long_description='Toxygen is powerful Tox client written in Python3',
-      url='https://github.com/toxygen-project/toxygen/',
+      url='https://github.com/xveduk/toxygen/',
       keywords='toxygen tox messenger',
       author='Ingvar',
       maintainer='Ingvar',
@@ -58,8 +38,9 @@ setup(name='Toxygen',
       include_package_data=True,
       classifiers=[
           'Programming Language :: Python :: 3 :: Only',
-          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.2',
-          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
       ],
       entry_points={
           'console_scripts': ['toxygen=toxygen.main:main'],

tests/tests.py

@@ -1,15 +1,31 @@
+from toxygen.bootstrap import node_generator
 from toxygen.profile import *
+from toxygen.settings import ProfileHelper
 from toxygen.tox_dns import tox_dns
-from toxygen.history import History
+import toxygen.toxencryptsave as encr
-from toxygen.smileys import SmileyLoader
+
-from toxygen.messages import *
+
-import toxygen.toxes as encr
+class TestProfile:
-import toxygen.util as util
+
-import time
+    def test_search(self):
+        arr = ProfileHelper.find_profiles()
+        assert len(arr) >= 2
+
+    def test_open(self):
+        data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
+        assert data
 
 
 class TestTox:
 
+    def test_loading(self):
+        data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
+        settings = Settings.get_default_settings()
+        tox = tox_factory(data, settings)
+        for data in node_generator():
+            tox.bootstrap(*data)
+        del tox
+
     def test_creation(self):
         name = b'Toxygen User'
         status_message = b'Toxing on Toxygen'
@@ -22,156 +38,33 @@ class TestTox:
         assert tox.self_get_name() == str(name, 'utf-8')
         assert tox.self_get_status_message() == str(status_message, 'utf-8')
 
-
+    def test_friend_list(self):
-class TestProfileHelper:
+        data = ProfileHelper(Settings.get_default_path(), 'bob').open_profile()
-
+        settings = Settings.get_default_settings()
-    def test_creation(self):
+        tox = tox_factory(data, settings)
-        file_name, path = 'test.tox', os.path.dirname(os.path.realpath(__file__)) + '/'
+        s = tox.self_get_friend_list()
-        data = b'test'
+        size = tox.self_get_friend_list_size()
-        with open(path + file_name, 'wb') as fl:
+        assert size <= 2
-            fl.write(data)
+        assert len(s) <= 2
-        ph = ProfileHelper(path, file_name[:4])
+        del tox
-        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()
+        with open(settings.Settings.get_default_path() + '/alice.tox', 'rb') as fl:
-        data = tox.get_savedata()
+            data = fl.read()
-        lib = encr.ToxES()
+        lib = encr.ToxEncryptSave()
-        for password in ('easypassword', 'njvnFjfn7vaGGV6', 'toxygen'):
+        lib.set_password('easypassword')
-            lib.set_password(password)
+        copy_data = data[:]
-            copy_data = data[:]
+        data = lib.pass_encrypt(data)
-            new_data = lib.pass_encrypt(data)
+        data = lib.pass_decrypt(data)
-            assert lib.is_data_encrypted(new_data)
+        assert copy_data == 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)

tests/travis.py

@@ -1,4 +0,0 @@
-class TestToxygen:
-
-    def test_main(self):
-        import toxygen.main  # check for syntax errors

toxygen/avwidgets.py

@@ -1,4 +1,7 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 import widgets
 import profile
 import util
@@ -14,24 +17,24 @@ class IncomingCallWidget(widgets.CenteredWidget):
         super(IncomingCallWidget, self).__init__()
         self.setWindowFlags(QtCore.Qt.CustomizeWindowHint | QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowStaysOnTopHint)
         self.resize(QtCore.QSize(500, 270))
-        self.avatar_label = QtWidgets.QLabel(self)
+        self.avatar_label = QtGui.QLabel(self)
         self.avatar_label.setGeometry(QtCore.QRect(10, 20, 64, 64))
         self.avatar_label.setScaledContents(False)
         self.name = widgets.DataLabel(self)
         self.name.setGeometry(QtCore.QRect(90, 20, 300, 25))
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         font.setPointSize(16)
         font.setBold(True)
         self.name.setFont(font)
         self.call_type = widgets.DataLabel(self)
         self.call_type.setGeometry(QtCore.QRect(90, 55, 300, 25))
         self.call_type.setFont(font)
-        self.accept_audio = QtWidgets.QPushButton(self)
+        self.accept_audio = QtGui.QPushButton(self)
         self.accept_audio.setGeometry(QtCore.QRect(20, 100, 150, 150))
-        self.accept_video = QtWidgets.QPushButton(self)
+        self.accept_video = QtGui.QPushButton(self)
         self.accept_video.setGeometry(QtCore.QRect(170, 100, 150, 150))
-        self.decline = QtWidgets.QPushButton(self)
+        self.decline = QtGui.QPushButton(self)
         self.decline.setGeometry(QtCore.QRect(320, 100, 150, 150))
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/accept_audio.png')
         icon = QtGui.QIcon(pixmap)
@@ -60,7 +63,6 @@ class IncomingCallWidget(widgets.CenteredWidget):
 
             def __init__(self):
                 QtCore.QThread.__init__(self)
-                self.a = None
 
             def run(self):
                 class AudioFile:
@@ -113,14 +115,15 @@ class AudioMessageRecorder(widgets.CenteredWidget):
 
     def __init__(self, friend_number, name):
         super(AudioMessageRecorder, self).__init__()
-        self.label = QtWidgets.QLabel(self)
+        self.label = QtGui.QLabel(self)
         self.label.setGeometry(QtCore.QRect(10, 20, 250, 20))
-        text = QtWidgets.QApplication.translate("MenuWindow", "Send audio message to friend {}")
+        text = QtGui.QApplication.translate("MenuWindow", "Send audio message to friend {}", None, QtGui.QApplication.UnicodeUTF8)
         self.label.setText(text.format(name))
-        self.record = QtWidgets.QPushButton(self)
+        self.record = QtGui.QPushButton(self)
         self.record.setGeometry(QtCore.QRect(20, 100, 150, 150))
 
-        self.record.setText(QtWidgets.QApplication.translate("MenuWindow", "Start recording"))
+        self.record.setText(QtGui.QApplication.translate("MenuWindow", "Start recording", None,
+                                                         QtGui.QApplication.UnicodeUTF8))
         self.record.clicked.connect(self.start_or_stop_recording)
         self.recording = False
         self.friend_num = friend_number
@@ -128,7 +131,8 @@ class AudioMessageRecorder(widgets.CenteredWidget):
     def start_or_stop_recording(self):
         if not self.recording:
             self.recording = True
-            self.record.setText(QtWidgets.QApplication.translate("MenuWindow", "Stop recording"))
+            self.record.setText(QtGui.QApplication.translate("MenuWindow", "Stop recording", None,
+                                                             QtGui.QApplication.UnicodeUTF8))
         else:
             self.close()
 

toxygen/basecontact.py

@@ -1,5 +1,9 @@
+import os
 from settings import *
-from PyQt5 import QtCore, QtGui
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 from toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE
 
 
@@ -7,8 +11,7 @@ class BaseContact:
     """
     Class encapsulating TOX contact
     Properties: name (alias of contact or name), status_message, status (connection status)
-    widget - widget for update, tox id (or public key)
+    widget - widget for update
-    Base class for all contacts.
     """
 
     def __init__(self, name, status_message, widget, tox_id):
@@ -20,8 +23,10 @@ class BaseContact:
         """
         self._name, self._status_message = name, status_message
         self._status, self._widget = None, widget
+        self._widget.name.setText(name)
+        self._widget.status_message.setText(status_message)
         self._tox_id = tox_id
-        self.init_widget()
+        self.load_avatar()
 
     # -----------------------------------------------------------------------------------------------------------------
     # Name - current name or alias of user
@@ -38,7 +43,7 @@ class BaseContact:
     name = property(get_name, set_name)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Status message
+    # Status message or group topic
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_status_message(self):
@@ -77,18 +82,20 @@ class BaseContact:
     # Avatars
     # -----------------------------------------------------------------------------------------------------------------
 
-    def load_avatar(self):
+    def load_avatar(self, default_path='avatar.png'):
         """
         Tries to load avatar of contact or uses default avatar
         """
-        prefix = ProfileHelper.get_path() + 'avatars/'
+        avatar_path = '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
-        avatar_path = prefix + '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
+        os.chdir(ProfileHelper.get_path() + 'avatars/')
-        if not os.path.isfile(avatar_path) or not os.path.getsize(avatar_path):  # load default image
+        if not os.path.isfile(avatar_path):  # load default image
-            avatar_path = curr_directory() + '/images/avatar.png'
+            avatar_path = default_path
+            os.chdir(curr_directory() + '/images/')
         width = self._widget.avatar_label.width()
-        pixmap = QtGui.QPixmap(avatar_path)
+        pixmap = QtGui.QPixmap(QtCore.QSize(width, width))
-        self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio,
+        pixmap.load(avatar_path)
-                                                          QtCore.Qt.SmoothTransformation))
+        self._widget.avatar_label.setScaledContents(False)
+        self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio))
         self._widget.avatar_label.repaint()
 
     def reset_avatar(self):
@@ -105,14 +112,3 @@ class BaseContact:
 
     def get_pixmap(self):
         return self._widget.avatar_label.pixmap()
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # 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()

toxygen/bootstrap.py

@@ -2,7 +2,6 @@ import random
 
 
 class Node:
-
     def __init__(self, ip, port, tox_key, rand):
         self._ip, self._port, self._tox_key, self.rand = ip, port, tox_key, rand
 

toxygen/callbacks.py

@@ -1,4 +1,7 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
+try:
+    from PySide import QtCore
+except ImportError:
+    from PyQt4 import QtCore
 from notifications import *
 from settings import Settings
 from profile import Profile
@@ -6,14 +9,6 @@ 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
-
-
-# -----------------------------------------------------------------------------------------------------------------
-# Threads
-# -----------------------------------------------------------------------------------------------------------------
 
 
 class InvokeEvent(QtCore.QEvent):
@@ -38,44 +33,6 @@ _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
 # -----------------------------------------------------------------------------------------------------------------
@@ -111,7 +68,7 @@ def friend_status(tox, friend_num, new_status, user_data):
     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.send_files, friend_num)
     invoke_in_main_thread(profile.update_filtration)
 
 
@@ -222,7 +179,7 @@ def tox_file_recv(window, tray):
             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")
+                    file_from = QtGui.QApplication.translate("Callback", "File from", None, QtGui.QApplication.UnicodeUTF8)
                     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'])
@@ -240,15 +197,28 @@ def file_recv_chunk(tox, friend_number, file_number, position, chunk, length, us
     """
     Incoming chunk
     """
-    _thread.execute(Profile.get_instance().incoming_chunk, friend_number, file_number, position,
+    if not length:
-                    chunk[:length] if length else None)
+        invoke_in_main_thread(Profile.get_instance().incoming_chunk,
+                              friend_number,
+                              file_number,
+                              position,
+                              None)
+    else:
+        Profile.get_instance().incoming_chunk(friend_number, file_number, position, chunk[:length])
 
 
 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)
+    if size:
+        Profile.get_instance().outgoing_chunk(friend_number, file_number, position, size)
+    else:
+        invoke_in_main_thread(Profile.get_instance().outgoing_chunk,
+                              friend_number,
+                              file_number,
+                              position,
+                              size)
 
 
 def file_recv_control(tox, friend_number, file_number, file_control, user_data):
@@ -271,18 +241,16 @@ 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)
+    invoke_in_main_thread(plugin.callback_lossless, friend_number, data, length)
 
 
 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)
+    invoke_in_main_thread(plugin.callback_lossy, friend_number, data, length)
 
 
 # -----------------------------------------------------------------------------------------------------------------
@@ -312,12 +280,56 @@ def callback_audio(toxav, friend_number, samples, audio_samples_per_channel, aud
     """
     New audio chunk
     """
+    # print(audio_samples_per_channel, audio_channels_count, rate)
     Profile.get_instance().call.chunk(
         bytes(samples[:audio_samples_per_channel * 2 * audio_channels_count]),
         audio_channels_count,
         rate)
 
 
+# -----------------------------------------------------------------------------------------------------------------
+# Callbacks - group chats
+# -----------------------------------------------------------------------------------------------------------------
+
+def group_message(window, tray, tox):
+    """
+    New message in group chat
+    """
+    def wrapped(tox_link, group_number, peer_id, message_type, message, length, user_data):
+        profile = Profile.get_instance()
+        settings = Settings.get_instance()
+        message = str(message[:length], 'utf-8')
+        invoke_in_main_thread(profile.new_message, group_number, message_type, message, True, peer_id)
+        if not window.isActiveWindow():
+            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'])
+            invoke_in_main_thread(tray.setIcon, QtGui.QIcon(curr_directory() + '/images/icon_new_messages.png'))
+    return wrapped
+
+
+def group_invite(tox, friend_number, invite_data, length, user_data):
+    invoke_in_main_thread(Profile.get_instance().process_group_invite,
+                          friend_number,
+                          bytes(invite_data[:length]))
+
+
+def group_self_join(tox, group_number, user_data):
+    pr = Profile.get_instance()
+    gc = pr.get_gc_by_number(group_number)
+    invoke_in_main_thread(gc.set_status, TOX_USER_STATUS['NONE'])
+    if not pr.is_active_a_friend() and pr.get_active_number() == group_number:
+        invoke_in_main_thread(pr.set_active)
+
+
+def group_peer_join(tox, group_number, peer_id, user_data):
+    gc = Profile.get_instance().get_gc_by_number(group_number)
+    gc.add_peer(peer_id)
+
+
 # -----------------------------------------------------------------------------------------------------------------
 # Callbacks - initialization
 # -----------------------------------------------------------------------------------------------------------------
@@ -354,3 +366,8 @@ def init_callbacks(tox, window, tray):
     tox.callback_friend_lossless_packet(lossless_packet, 0)
     tox.callback_friend_lossy_packet(lossy_packet, 0)
 
+    tox.callback_group_message(group_message(window, tray, tox), 0)
+    tox.callback_group_invite(group_invite, 0)
+    tox.callback_group_self_join(group_self_join, 0)
+    tox.callback_group_peer_join(group_peer_join, 0)
+

toxygen/contact.py

@@ -1,34 +1,38 @@
-from PyQt5 import QtCore, QtGui
+try:
-from history import *
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 import basecontact
-import util
 from messages import *
+from history import *
 import file_transfers as ft
-import re
+import util
 
 
 class Contact(basecontact.BaseContact):
     """
     Class encapsulating TOX contact
-    Properties: number, message getter, history etc. Base class for friend and gc classes
+    Properties: name (alias of contact or name), status_message, status (connection status)
+    widget - widget for update
     """
 
-    def __init__(self, message_getter, number, name, status_message, widget, tox_id):
+    def __init__(self, number, message_getter, name, status_message, widget, tox_id):
         """
-        :param message_getter: gets messages from db
+        :param name: name, example: 'Toxygen user'
-        :param number: number of friend.
+        :param status_message: status message, example: 'Toxing on Toxygen'
+        :param widget: ContactItem instance
+        :param tox_id: tox id of contact
         """
         super().__init__(name, status_message, widget, tox_id)
-        self._number = number
+        self._message_getter = message_getter
         self._new_messages = False
         self._visible = True
         self._alias = False
-        self._message_getter = message_getter
+        self._number = number
         self._corr = []
         self._unsaved_messages = 0
         self._history_loaded = self._new_actions = False
-        self._curr_text = self._search_string = ''
+        self._curr_text = ''
-        self._search_index = 0
 
     def __del__(self):
         self.set_visibility(False)
@@ -36,18 +40,12 @@ class Contact(basecontact.BaseContact):
         if hasattr(self, '_message_getter'):
             del self._message_getter
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # History support
-    # -----------------------------------------------------------------------------------------------------------------
-
     def load_corr(self, first_time=True):
         """
         :param first_time: friend became active, load first part of messages
         """
         if (first_time and self._history_loaded) or (not hasattr(self, '_message_getter')):
             return
-        if self._message_getter is None:
-            return
         data = list(self._message_getter.get(PAGE_SIZE))
         if data is not None and len(data):
             data.reverse()
@@ -57,17 +55,6 @@ class Contact(basecontact.BaseContact):
         self._corr = data + self._corr
         self._history_loaded = True
 
-    def load_all_corr(self):
-        """
-        Get all chat history from db for current friend
-        """
-        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))
-            self._corr = data + self._corr
-            self._history_loaded = True
-
     def get_corr_for_saving(self):
         """
         Get data to save in db
@@ -94,10 +81,6 @@ class Contact(basecontact.BaseContact):
         else:
             return ''
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # Unsent messages
-    # -----------------------------------------------------------------------------------------------------------------
-
     def get_unsent_messages(self):
         """
         :return list of unsent messages
@@ -112,6 +95,21 @@ class Contact(basecontact.BaseContact):
         messages = filter(lambda x: x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr)
         return list(map(lambda x: x.get_data(), messages))
 
+    def delete_message(self, time):
+        elem = list(filter(lambda x: type(x) is TextMessage and x.get_data()[2] == time, self._corr))[0]
+        tmp = list(filter(lambda x: x.get_type() <= 1, self._corr))
+        if elem in tmp[-self._unsaved_messages:]:
+            self._unsaved_messages -= 1
+        self._corr.remove(elem)
+
+    def delete_old_messages(self):
+        old = filter(lambda x: x.get_type() in (2, 3) and (x.get_status() >= 2 or x.get_status() is None),
+                     self._corr[:-SAVE_MESSAGES])
+        old = list(old)
+        l = max(len(self._corr) - SAVE_MESSAGES, 0) - len(old)
+        self._unsaved_messages -= l
+        self._corr = old + self._corr[-SAVE_MESSAGES:]
+
     def mark_as_sent(self):
         try:
             message = list(filter(lambda x: x.get_owner() == MESSAGE_OWNER['NOT_SENT'], self._corr))[0]
@@ -119,91 +117,23 @@ class Contact(basecontact.BaseContact):
         except Exception as ex:
             util.log('Mark as sent ex: ' + str(ex))
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # Message deletion
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def delete_message(self, time):
-        elem = list(filter(lambda x: type(x) is TextMessage and x.get_data()[2] == time, self._corr))[0]
-        tmp = list(filter(lambda x: x.get_type() <= 1, self._corr))
-        if elem in tmp[-self._unsaved_messages:] and self._unsaved_messages:
-            self._unsaved_messages -= 1
-        self._corr.remove(elem)
-        self._message_getter.delete_one()
-        self._search_index = 0
-
-    def delete_old_messages(self):
-        """
-        Delete old messages (reduces RAM usage if messages saving is not enabled)
-        """
-        def save_message(x):
-            if x.get_type() == 2 and (x.get_status() >= 2 or x.get_status() is None):
-                return True
-            return x.get_owner() == MESSAGE_OWNER['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)
-        self._unsaved_messages = min(self._unsaved_messages, len(list(text_messages)))
-        self._search_index = 0
-
     def clear_corr(self, save_unsent=False):
         """
         Clear messages list
         """
         if hasattr(self, '_message_getter'):
             del self._message_getter
-        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 x: x.get_type() in (2, 3) and
                                                x.get_status() 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 x: (x.get_type() in (2, 3) and x.get_status() in ft.ACTIVE_FILE_TRANSFERS)
                                                or (x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT']),
                                      self._corr))
             self._unsaved_messages = len(self.get_unsent_messages())
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # Chat history search
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def search_string(self, search_string):
-        self._search_string, self._search_index = search_string, 0
-        return self.search_prev()
-
-    def search_prev(self):
-        while True:
-            l = len(self._corr)
-            for i in range(self._search_index - 1, -l - 1, -1):
-                if self._corr[i].get_type() > 1:
-                    continue
-                message = self._corr[i].get_data()[0]
-                if re.search(self._search_string, message, re.IGNORECASE) is not None:
-                    self._search_index = i
-                    return i
-            self._search_index = -l
-            self.load_corr(False)
-            if len(self._corr) == l:
-                return None  # not found
-
-    def search_next(self):
-        if not self._search_index:
-            return None
-        for i in range(self._search_index + 1, 0):
-            if self._corr[i].get_type() > 1:
-                continue
-            message = self._corr[i].get_data()[0]
-            if re.search(self._search_string, message, re.IGNORECASE) is not None:
-                self._search_index = i
-                return i
-        return None  # not found
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Current text - text from message area
-    # -----------------------------------------------------------------------------------------------------------------
-
     def get_curr_text(self):
         return self._curr_text
 
@@ -212,21 +142,6 @@ class Contact(basecontact.BaseContact):
 
     curr_text = property(get_curr_text, set_curr_text)
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # Alias support
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def set_name(self, value):
-        """
-        Set new name or ignore if alias exists
-        :param value: new name
-        """
-        if not self._alias:
-            super().set_name(value)
-
-    def set_alias(self, alias):
-        self._alias = bool(alias)
-
     # -----------------------------------------------------------------------------------------------------------------
     # Visibility in friends' list
     # -----------------------------------------------------------------------------------------------------------------
@@ -239,12 +154,8 @@ 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
+    # Unread messages and actions
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_actions(self):
@@ -274,7 +185,7 @@ class Contact(basecontact.BaseContact):
     messages = property(get_messages)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Friend's number (can be used in toxcore)
+    # Number (can be used in toxcore)
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_number(self):
@@ -284,3 +195,18 @@ class Contact(basecontact.BaseContact):
         self._number = value
 
     number = property(get_number, set_number)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Alias support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def set_name(self, value):
+        """
+        Set new name or ignore if alias exists
+        :param value: new name
+        """
+        if not self._alias:
+            super(Contact, self).set_name(value)
+
+    def set_alias(self, alias):
+        self._alias = bool(alias)

toxygen/file_transfers.py

@@ -4,7 +4,12 @@ from os import remove, rename, chdir
 from time import time, sleep
 from tox import Tox
 import settings
-from PyQt5 import QtCore
+try:
+    from PySide import QtCore
+except ImportError:
+    from PyQt4 import QtCore
+
+# TODO: threads!
 
 
 TOX_FILE_TRANSFER_STATE = {
@@ -28,18 +33,11 @@ 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_')
-
-
 class StateSignal(QtCore.QObject):
-
+    try:
-    signal = QtCore.pyqtSignal(int, float, int)  # state, progress, time in sec
+        signal = QtCore.Signal(int, float, int)  # state and progress
-
+    except:
-
+        signal = QtCore.pyqtSignal(int, float, int)  # state and progress - pyqt4
-class TransferFinishedSignal(QtCore.QObject):
-
-    signal = QtCore.pyqtSignal(int, int)  # friend number, file number
 
 
 class FileTransfer(QtCore.QObject):
@@ -58,8 +56,6 @@ class FileTransfer(QtCore.QObject):
         self._size = float(size)
         self._done = 0
         self._state_changed = StateSignal()
-        self._finished = TransferFinishedSignal()
-        self._file_id = None
 
     def set_tox(self, tox):
         self._tox = tox
@@ -67,9 +63,6 @@ class FileTransfer(QtCore.QObject):
     def set_state_changed_handler(self, handler):
         self._state_changed.signal.connect(handler)
 
-    def set_transfer_finished_handler(self, handler):
-        self._finished.signal.connect(handler)
-
     def signal(self):
         percentage = self._done / self._size if self._size else 0
         if self._creation_time is None or not percentage:
@@ -78,21 +71,12 @@ class FileTransfer(QtCore.QObject):
             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
 
     def get_friend_number(self):
         return self._friend_number
 
-    def get_id(self):
-        return self._file_id
-
-    def get_path(self):
-        return self._path
-
     def cancel(self):
         self.send_control(TOX_FILE_CONTROL['CANCEL'])
         if hasattr(self, '_file'):
@@ -138,7 +122,6 @@ class SendTransfer(FileTransfer):
         self.state = TOX_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()
 
     def send_chunk(self, position, size):
         """
@@ -153,12 +136,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'):
                 self._file.close()
             self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self.signal()
-        self.signal()
 
 
 class SendAvatar(SendTransfer):
@@ -197,10 +180,10 @@ class SendFromBuffer(FileTransfer):
             data = self._data[position:position + size]
             self._tox.file_send_chunk(self._friend_number, self._file_number, position, data)
             self._done += size
+            self.signal()
         else:
             self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self.signal()
-        self.signal()
 
 
 class SendFromFileBuffer(SendTransfer):
@@ -221,23 +204,16 @@ class SendFromFileBuffer(SendTransfer):
 
 class ReceiveTransfer(FileTransfer):
 
-    def __init__(self, path, tox, friend_number, size, file_number, position=0):
+    def __init__(self, path, tox, friend_number, size, file_number):
         super(ReceiveTransfer, self).__init__(path, tox, friend_number, size, file_number)
         self._file = open(self._path, 'wb')
-        self._file_size = position
+        self._file.truncate(0)
-        self._file.truncate(position)
+        self._file_size = 0
-        self._missed = set()
-        self._file_id = self.get_file_id()
-        self._done = position
 
     def cancel(self):
         super(ReceiveTransfer, self).cancel()
         remove(self._path)
 
-    def total_size(self):
-        self._missed.add(self._file_size)
-        return min(self._missed)
-
     def write_chunk(self, position, data):
         """
         Incoming chunk
@@ -249,22 +225,19 @@ class ReceiveTransfer(FileTransfer):
         if data is None:
             self._file.close()
             self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
+            self.signal()
         else:
             data = bytearray(data)
             if self._file_size < position:
                 self._file.seek(0, 2)
                 self._file.write(b'\0' * (position - self._file_size))
-                self._missed.add(self._file_size)
-            else:
-                self._missed.discard(position)
             self._file.seek(position)
             self._file.write(data)
             l = len(data)
             if position + l > self._file_size:
                 self._file_size = position + l
             self._done += l
-        self.signal()
+            self.signal()
 
 
 class ReceiveToBuffer(FileTransfer):
@@ -285,7 +258,6 @@ class ReceiveToBuffer(FileTransfer):
             self._creation_time = time()
         if data is None:
             self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
-            self.finished()
         else:
             data = bytes(data)
             l = len(data)
@@ -340,8 +312,3 @@ class ReceiveAvatar(ReceiveTransfer):
                 chdir(dirname(avatar_path))
                 remove(avatar_path)
             rename(self._path, avatar_path)
-            self.finished(True)
-
-    def finished(self, emit=False):
-        if emit:
-            super().finished()

toxygen/friend.py

@@ -1,54 +1,21 @@
 import contact
 from messages import *
-import os
 
 
 class Friend(contact.Contact):
     """
-    Friend in list of friends.
+    Friend in list of friends. Can be hidden, properties 'has unread messages' and 'has alias' added
     """
 
-    def __init__(self, message_getter, number, name, status_message, widget, tox_id):
+    def __init__(self, *args):
-        super().__init__(message_getter, number, name, status_message, widget, tox_id)
+        """
+        :param number: number of friend.
+        """
+        super(Friend, self).__init__(*args)
         self._receipts = 0
 
-    # -----------------------------------------------------------------------------------------------------------------
+    def __del__(self):
-    # File transfers support
+        super().__del__()
-    # -----------------------------------------------------------------------------------------------------------------
-
-    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
@@ -66,3 +33,32 @@ class Friend(contact.Contact):
         if self._receipts:
             self._receipts -= 1
             self.mark_as_sent()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # 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 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))

toxygen/groupchat.py

@@ -0,0 +1,36 @@
+import contact
+
+
+class GroupChat(contact.Contact):
+
+    def __init__(self, tox, *args):
+        super().__init__(*args)
+        self._tox = tox
+
+    def load_avatar(self, default_path='group.png'):
+        super().load_avatar(default_path)
+
+    def set_status(self, value):
+        print('In gc set_status')
+        super().set_status(value)
+        self.name = bytes(self._tox.group_get_name(self._number), 'utf-8')
+        self._tox_id = self._tox.group_get_chat_id(self._number)
+        self.status_message = bytes(self._tox.group_get_topic(self._number), 'utf-8')
+
+    def add_peer(self, peer_id):
+        print(peer_id)
+        print(self._tox.group_peer_get_name(self._number, peer_id))
+
+    # TODO: get peers list and add other methods
+
+    def get_peers_list(self):
+        return []
+
+
+class Peer:
+
+    def __init__(self, peer_id, name, status, role):
+        self._data = (peer_id, name, status, role)
+
+    def get_data(self):
+        return self._data

toxygen/history.py

@@ -1,15 +1,14 @@
+# coding=utf-8
 from sqlite3 import connect
 import settings
 from os import chdir
 import os.path
-from toxes import ToxES
+from toxencryptsave import ToxEncryptSave
 
 
 PAGE_SIZE = 42
 
-TIMEOUT = 11
+SAVE_MESSAGES = 150
-
-SAVE_MESSAGES = 250
 
 MESSAGE_OWNER = {
     'ME': 0,
@@ -25,7 +24,7 @@ class History:
         chdir(settings.ProfileHelper.get_path())
         path = settings.ProfileHelper.get_path() + self._name + '.hstr'
         if os.path.exists(path):
-            decr = ToxES.get_instance()
+            decr = ToxEncryptSave.get_instance()
             try:
                 with open(path, 'rb') as fin:
                     data = fin.read()
@@ -35,7 +34,7 @@ class History:
                         fout.write(data)
             except:
                 os.remove(path)
-        db = connect(name + '.hstr', timeout=TIMEOUT)
+        db = connect(name + '.hstr')
         cursor = db.cursor()
         cursor.execute('CREATE TABLE IF NOT EXISTS friends('
                        '    tox_id TEXT PRIMARY KEY'
@@ -43,7 +42,7 @@ class History:
         db.close()
 
     def save(self):
-        encr = ToxES.get_instance()
+        encr = ToxEncryptSave.get_instance()
         if encr.has_password():
             path = settings.ProfileHelper.get_path() + self._name + '.hstr'
             with open(path, 'rb') as fin:
@@ -57,7 +56,7 @@ class History:
         new_path = directory + self._name + '.hstr'
         with open(path, 'rb') as fin:
             data = fin.read()
-        encr = ToxES.get_instance()
+        encr = ToxEncryptSave.get_instance()
         if encr.has_password():
             data = encr.pass_encrypt(data)
         with open(new_path, 'wb') as fout:
@@ -65,7 +64,7 @@ class History:
 
     def add_friend_to_db(self, tox_id):
         chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
+        db = connect(self._name + '.hstr')
         try:
             cursor = db.cursor()
             cursor.execute('INSERT INTO friends VALUES (?);', (tox_id, ))
@@ -78,28 +77,28 @@ class History:
                            ')')
             db.commit()
         except:
-            print('Database is locked!')
             db.rollback()
+            raise
         finally:
             db.close()
 
     def delete_friend_from_db(self, tox_id):
         chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
+        db = connect(self._name + '.hstr')
         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()
+            raise
         finally:
             db.close()
 
     def friend_exists_in_db(self, tox_id):
         chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
+        db = connect(self._name + '.hstr')
         cursor = db.cursor()
         cursor.execute('SELECT 0 FROM friends WHERE tox_id=?', (tox_id, ))
         result = cursor.fetchone()
@@ -108,57 +107,56 @@ class History:
 
     def save_messages_to_db(self, tox_id, messages_iter):
         chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
+        db = connect(self._name + '.hstr')
         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()
+            raise
         finally:
             db.close()
 
     def update_messages(self, tox_id, unsent_time):
         chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
+        db = connect(self._name + '.hstr')
         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()
+            raise
         finally:
             db.close()
+        pass
 
     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)
+        db = connect(self._name + '.hstr')
         try:
             cursor = db.cursor()
-            cursor.execute('DELETE FROM id' + tox_id + ' WHERE unix_time < ' + end + ' AND unix_time > ' +
+            cursor.execute('DELETE FROM id' + tox_id + ' WHERE unix_time = ' + str(time) + ';')
-                           start + ';')
             db.commit()
         except:
-            print('Database is locked!')
             db.rollback()
+            raise
         finally:
             db.close()
 
     def delete_messages(self, tox_id):
         chdir(settings.ProfileHelper.get_path())
-        db = connect(self._name + '.hstr', timeout=TIMEOUT)
+        db = connect(self._name + '.hstr')
         try:
             cursor = db.cursor()
             cursor.execute('DELETE FROM id' + tox_id + ';')
             db.commit()
         except:
-            print('Database is locked!')
             db.rollback()
+            raise
         finally:
             db.close()
 
@@ -166,50 +164,21 @@ class History:
         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._db = connect(name + '.hstr')
             self._cursor = self._db.cursor()
-            self._cursor.execute('SELECT message, owner, unix_time, message_type FROM id' + self._tox_id +
+            self._cursor.execute('SELECT message, owner, unix_time, message_type FROM id' + tox_id +
                                  ' ORDER BY unix_time DESC;')
 
-        def disconnect(self):
-            self._db.close()
-
         def get_one(self):
-            self.connect()
+            return self._cursor.fetchone()
-            self.skip()
-            data = self._cursor.fetchone()
-            self._count += 1
-            self.disconnect()
-            return data
 
         def get_all(self):
-            self.connect()
+            return self._cursor.fetchall()
-            data = self._cursor.fetchall()
-            self.disconnect()
-            self._count = len(data)
-            return data
 
         def get(self, count):
-            self.connect()
+            return self._cursor.fetchmany(count)
-            self.skip()
-            data = self._cursor.fetchmany(count)
-            self.disconnect()
-            self._count += len(data)
-            return data
 
-        def skip(self):
+        def __del__(self):
-            if self._count:
+            self._db.close()
-                self._cursor.fetchmany(self._count)
-
-        def delete_one(self):
-            if self._count:
-                self._count -= 1

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

@@ -6,16 +6,13 @@ import util
 class LibToxCore:
 
     def __init__(self):
-        if system() == 'Windows':
+        if system() == 'Linux':
-            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')
-                self._libtoxcore = CDLL('libtoxcore.so')
+        elif system() == 'Windows':
-            except:
+            self._libtoxcore = CDLL(util.curr_directory() + '/libs/libtox.dll')
-                self._libtoxcore = CDLL(util.curr_directory() + '/libs/libtoxcore.so')
+        else:
+            raise OSError('Unknown system.')
 
     def __getattr__(self, item):
         return self._libtoxcore.__getattr__(item)
@@ -24,17 +21,14 @@ class LibToxCore:
 class LibToxAV:
 
     def __init__(self):
-        if system() == 'Windows':
+        if system() == 'Linux':
+            # that /usr/lib/libtoxav.so must exists
+            self._libtoxav = CDLL('libtoxav.so')
+        elif 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
+            raise OSError('Unknown system.')
-            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)
@@ -43,17 +37,14 @@ class LibToxAV:
 class LibToxEncryptSave:
 
     def __init__(self):
-        if system() == 'Windows':
+        if system() == 'Linux':
+            # /usr/lib/libtoxencryptsave.so must exists
+            self._lib_tox_encrypt_save = CDLL('libtoxencryptsave.so')
+        elif system() == 'Windows':
             # on Windows profile encryption api is in libtox.dll
             self._lib_tox_encrypt_save = CDLL(util.curr_directory() + '/libs/libtox.dll')
-        elif system() == 'Darwin':
-            self._lib_tox_encrypt_save = CDLL('libtoxencryptsave.dylib')
         else:
-            # /usr/lib/libtoxencryptsave.so must exists
+            raise OSError('Unknown system.')
-            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/list_items.py

@@ -1,5 +1,8 @@
 from toxcore_enums_and_consts import *
-from PyQt5 import QtCore, QtGui, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 import profile
 from file_transfers import TOX_FILE_TRANSFER_STATE, PAUSED_FILE_TRANSFERS, DO_NOT_SHOW_ACCEPT_BUTTON, ACTIVE_FILE_TRANSFERS, SHOW_PROGRESS_BAR
 from util import curr_directory, convert_time, curr_time
@@ -7,10 +10,9 @@ from widgets import DataLabel, create_menu
 import html as h
 import smileys
 import settings
-import re
 
 
-class MessageEdit(QtWidgets.QTextBrowser):
+class MessageEdit(QtGui.QTextBrowser):
 
     def __init__(self, text, width, message_type, parent=None):
         super(MessageEdit, self).__init__(parent)
@@ -22,9 +24,7 @@ class MessageEdit(QtWidgets.QTextBrowser):
         self.setOpenExternalLinks(True)
         self.setAcceptRichText(True)
         self.setOpenLinks(False)
-        path = smileys.SmileyLoader.get_instance().get_smileys_path()
+        self.setSearchPaths([smileys.SmileyLoader.get_instance().get_smileys_path()])
-        if path is not None:
-            self.setSearchPaths([path])
         self.document().setDefaultStyleSheet('a { color: #306EFF; }')
         text = self.decoratedText(text)
         if message_type != TOX_MESSAGE_TYPE['NORMAL']:
@@ -32,7 +32,7 @@ class MessageEdit(QtWidgets.QTextBrowser):
         else:
             self.setHtml(text)
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         font.setPixelSize(settings.Settings.get_instance()['message_font_size'])
         font.setBold(False)
         self.setFont(font)
@@ -42,31 +42,10 @@ class MessageEdit(QtWidgets.QTextBrowser):
 
     def contextMenuEvent(self, event):
         menu = create_menu(self.createStandardContextMenu(event.pos()))
-        quote = menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Quote selected text'))
-        quote.triggered.connect(self.quote_text)
-        text = self.textCursor().selection().toPlainText()
-        if not text:
-            quote.setEnabled(False)
-        else:
-            import plugin_support
-            submenu = plugin_support.PluginLoader.get_instance().get_message_menu(menu, text)
-            if len(submenu):
-                plug = menu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Plugins'))
-                plug.addActions(submenu)
         menu.popup(event.globalPos())
         menu.exec_(event.globalPos())
         del menu
 
-    def quote_text(self):
-        text = self.textCursor().selection().toPlainText()
-        if text:
-            import mainscreen
-            window = mainscreen.MainWindow.get_instance()
-            text = '>' + '\n>'.join(text.split('\n'))
-            if window.messageEdit.toPlainText():
-                text = '\n' + text
-            window.messageEdit.appendPlainText(text)
-
     def on_anchor_clicked(self, url):
         text = str(url.toString())
         if text.startswith('tox:'):
@@ -119,24 +98,26 @@ class MessageEdit(QtWidgets.QTextBrowser):
         return text
 
 
-class MessageItem(QtWidgets.QWidget):
+class MessageItem(QtGui.QWidget):
     """
     Message in messages list
     """
     def __init__(self, text, time, user='', sent=True, message_type=TOX_MESSAGE_TYPE['NORMAL'], parent=None):
-        QtWidgets.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self, parent)
         self.name = DataLabel(self)
-        self.name.setGeometry(QtCore.QRect(2, 2, 95, 23))
+        self.name.setGeometry(QtCore.QRect(2, 2, 95, 20))
         self.name.setTextFormat(QtCore.Qt.PlainText)
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         font.setPointSize(11)
         font.setBold(True)
         self.name.setFont(font)
         self.name.setText(user)
 
-        self.time = QtWidgets.QLabel(self)
+        self.time = QtGui.QLabel(self)
-        self.time.setGeometry(QtCore.QRect(parent.width() - 60, 0, 50, 25))
+        self.time.setGeometry(QtCore.QRect(parent.width() - 50, 0, 50, 20))
+        font = QtGui.QFont()
+        font.setFamily("Times New Roman")
         font.setPointSize(10)
         font.setBold(False)
         self.time.setFont(font)
@@ -150,19 +131,19 @@ class MessageItem(QtWidgets.QWidget):
             self.time.setText(convert_time(time))
             self.t = False
 
-        self.message = MessageEdit(text, parent.width() - 160, message_type, self)
+        self.message = MessageEdit(text, parent.width() - 150, message_type, self)
         if message_type != TOX_MESSAGE_TYPE['NORMAL']:
             self.name.setStyleSheet("QLabel { color: #5CB3FF; }")
             self.message.setAlignment(QtCore.Qt.AlignCenter)
             self.time.setStyleSheet("QLabel { color: #5CB3FF; }")
-        self.message.setGeometry(QtCore.QRect(100, 0, parent.width() - 160, self.message.height()))
+        self.message.setGeometry(QtCore.QRect(100, 0, parent.width() - 150, self.message.height()))
         self.setFixedHeight(self.message.height())
 
     def mouseReleaseEvent(self, event):
         if event.button() == QtCore.Qt.RightButton and event.x() > self.time.x():
-            self.listMenu = QtWidgets.QMenu()
+            self.listMenu = QtGui.QMenu()
-            delete_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Delete message'))
+            delete_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Delete message', None, QtGui.QApplication.UnicodeUTF8))
-            delete_item.triggered.connect(self.delete)
+            self.connect(delete_item, QtCore.SIGNAL("triggered()"), self.delete)
             parent_position = self.time.mapToGlobal(QtCore.QPoint(0, 0))
             self.listMenu.move(parent_position)
             self.listMenu.show()
@@ -178,58 +159,24 @@ class MessageItem(QtWidgets.QWidget):
             return True
         return False
 
-    def set_avatar(self, pixmap):
-        self.name.setAlignment(QtCore.Qt.AlignCenter)
-        self.message.setAlignment(QtCore.Qt.AlignVCenter)
-        self.setFixedHeight(max(self.height(), 36))
-        self.name.setFixedHeight(self.height())
-        self.message.setFixedHeight(self.height())
-        self.name.setPixmap(pixmap.scaled(30, 30, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation))
 
-    def select_text(self, text):
+class ContactItem(QtGui.QWidget):
-        tmp = self.message.toHtml()
-        text = h.escape(text)
-        strings = re.findall(text, tmp, flags=re.IGNORECASE)
-        for s in strings:
-            tmp = self.replace_all(tmp, s)
-        self.message.setHtml(tmp)
-
-    @staticmethod
-    def replace_all(text, substring):
-        i, l = 0, len(substring)
-        while i < len(text) - l + 1:
-            index = text[i:].find(substring)
-            if index == -1:
-                break
-            i += index
-            lgt, rgt = text[i:].find('<'), text[i:].find('>')
-            if rgt < lgt:
-                i += rgt + 1
-                continue
-            sub = '<font color="red"><b>{}</b></font>'.format(substring)
-            text = text[:i] + sub + text[i + l:]
-            i += len(sub)
-        return text
-
-
-class ContactItem(QtWidgets.QWidget):
     """
     Contact in friends list
     """
 
     def __init__(self, parent=None):
-        QtWidgets.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self, parent)
         mode = settings.Settings.get_instance()['compact_mode']
         self.setBaseSize(QtCore.QSize(250, 40 if mode else 70))
-        self.avatar_label = QtWidgets.QLabel(self)
+        self.avatar_label = QtGui.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.setScaledContents(True)
-        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.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         font.setPointSize(10 if mode else 12)
         font.setBold(True)
         self.name.setFont(font)
@@ -244,14 +191,14 @@ class ContactItem(QtWidgets.QWidget):
         self.messages.setGeometry(QtCore.QRect(20 if mode else 52, 20 if mode else 50, 30, 20))
 
 
-class StatusCircle(QtWidgets.QWidget):
+class StatusCircle(QtGui.QWidget):
     """
     Connection status
     """
     def __init__(self, parent):
-        QtWidgets.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self, parent)
         self.setGeometry(0, 0, 32, 32)
-        self.label = QtWidgets.QLabel(self)
+        self.label = QtGui.QLabel(self)
         self.label.setGeometry(QtCore.QRect(0, 0, 32, 32))
         self.unread = False
 
@@ -277,16 +224,16 @@ class StatusCircle(QtWidgets.QWidget):
         self.label.setPixmap(pixmap)
 
 
-class UnreadMessagesCount(QtWidgets.QWidget):
+class UnreadMessagesCount(QtGui.QWidget):
 
     def __init__(self, parent=None):
         super(UnreadMessagesCount, self).__init__(parent)
         self.resize(30, 20)
-        self.label = QtWidgets.QLabel(self)
+        self.label = QtGui.QLabel(self)
         self.label.setGeometry(QtCore.QRect(0, 0, 30, 20))
         self.label.setVisible(False)
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         font.setPointSize(12)
         font.setBold(True)
         self.label.setFont(font)
@@ -304,11 +251,11 @@ class UnreadMessagesCount(QtWidgets.QWidget):
             self.label.setVisible(False)
 
 
-class FileTransferItem(QtWidgets.QListWidget):
+class FileTransferItem(QtGui.QListWidget):
 
     def __init__(self, file_name, size, time, user, friend_number, file_number, state, width, parent=None):
 
-        QtWidgets.QListWidget.__init__(self, parent)
+        QtGui.QListWidget.__init__(self, parent)
         self.resize(QtCore.QSize(width, 34))
         if state == TOX_FILE_TRANSFER_STATE['CANCELLED']:
             self.setStyleSheet('QListWidget { border: 1px solid #B40404; }')
@@ -319,24 +266,24 @@ class FileTransferItem(QtWidgets.QListWidget):
         self.state = state
 
         self.name = DataLabel(self)
-        self.name.setGeometry(QtCore.QRect(3, 7, 95, 25))
+        self.name.setGeometry(QtCore.QRect(3, 7, 95, 20))
         self.name.setTextFormat(QtCore.Qt.PlainText)
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         font.setPointSize(11)
         font.setBold(True)
         self.name.setFont(font)
         self.name.setText(user)
 
-        self.time = QtWidgets.QLabel(self)
+        self.time = QtGui.QLabel(self)
-        self.time.setGeometry(QtCore.QRect(width - 60, 7, 50, 25))
+        self.time.setGeometry(QtCore.QRect(width - 53, 7, 50, 20))
         font.setPointSize(10)
         font.setBold(False)
         self.time.setFont(font)
         self.time.setText(convert_time(time))
 
-        self.cancel = QtWidgets.QPushButton(self)
+        self.cancel = QtGui.QPushButton(self)
-        self.cancel.setGeometry(QtCore.QRect(width - 125, 2, 30, 30))
+        self.cancel.setGeometry(QtCore.QRect(width - 120, 2, 30, 30))
         pixmap = QtGui.QPixmap(curr_directory() + '/images/decline.png')
         icon = QtGui.QIcon(pixmap)
         self.cancel.setIcon(icon)
@@ -345,7 +292,7 @@ class FileTransferItem(QtWidgets.QListWidget):
         self.cancel.clicked.connect(lambda: self.cancel_transfer(friend_number, file_number))
         self.cancel.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; background-color: none;}')
 
-        self.accept_or_pause = QtWidgets.QPushButton(self)
+        self.accept_or_pause = QtGui.QPushButton(self)
         self.accept_or_pause.setGeometry(QtCore.QRect(width - 170, 2, 30, 30))
         if state == TOX_FILE_TRANSFER_STATE['INCOMING_NOT_STARTED']:
             self.accept_or_pause.setVisible(True)
@@ -362,7 +309,7 @@ class FileTransferItem(QtWidgets.QListWidget):
 
         self.accept_or_pause.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; background-color: none}')
 
-        self.pb = QtWidgets.QProgressBar(self)
+        self.pb = QtGui.QProgressBar(self)
         self.pb.setGeometry(QtCore.QRect(100, 7, 100, 20))
         self.pb.setValue(0)
         self.pb.setStyleSheet('QProgressBar { background-color: #302F2F; }')
@@ -383,8 +330,8 @@ class FileTransferItem(QtWidgets.QListWidget):
         self.file_name.setText(file_data)
         self.file_name.setToolTip(file_name)
         self.saved_name = file_name
-        self.time_left = QtWidgets.QLabel(self)
+        self.time_left = QtGui.QLabel(self)
-        self.time_left.setGeometry(QtCore.QRect(width - 92, 7, 30, 20))
+        self.time_left.setGeometry(QtCore.QRect(width - 87, 7, 30, 20))
         font.setPointSize(10)
         self.time_left.setFont(font)
         self.time_left.setVisible(state == TOX_FILE_TRANSFER_STATE['RUNNING'])
@@ -401,10 +348,10 @@ class FileTransferItem(QtWidgets.QListWidget):
 
     def accept_or_pause_transfer(self, friend_number, file_number, size):
         if self.state == TOX_FILE_TRANSFER_STATE['INCOMING_NOT_STARTED']:
-            directory = QtWidgets.QFileDialog.getExistingDirectory(self,
+            directory = QtGui.QFileDialog.getExistingDirectory(self,
-                                                               QtWidgets.QApplication.translate("MainWindow", 'Choose folder'),
+                                                               QtGui.QApplication.translate("MainWindow", 'Choose folder', None, QtGui.QApplication.UnicodeUTF8),
                                                                curr_directory(),
-                                                               QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
+                                                               QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
             self.pb.setVisible(True)
             if directory:
                 pr = profile.Profile.get_instance()
@@ -428,12 +375,13 @@ class FileTransferItem(QtWidgets.QListWidget):
         self.accept_or_pause.setIcon(icon)
         self.accept_or_pause.setIconSize(QtCore.QSize(30, 30))
 
-    def update_transfer_state(self, state, progress, time):
+    @QtCore.Slot(int, float, int)
+    def update(self, state, progress, time):
         self.pb.setValue(int(progress * 100))
         if time + 1:
             m, s = divmod(time, 60)
             self.time_left.setText('{0:02d}:{1:02d}'.format(m, s))
-        if self.state != state and self.state in ACTIVE_FILE_TRANSFERS:
+        if self.state != state:
             if state == TOX_FILE_TRANSFER_STATE['CANCELLED']:
                 self.setStyleSheet('QListWidget { border: 1px solid #B40404; }')
                 self.cancel.setVisible(False)
@@ -491,14 +439,14 @@ class UnsentFileItem(FileTransferItem):
         pr.cancel_not_started_transfer(self._time)
 
 
-class InlineImageItem(QtWidgets.QScrollArea):
+class InlineImageItem(QtGui.QScrollArea):
 
     def __init__(self, data, width, elem):
 
-        QtWidgets.QScrollArea.__init__(self)
+        QtGui.QScrollArea.__init__(self)
         self.setFocusPolicy(QtCore.Qt.NoFocus)
         self._elem = elem
-        self._image_label = QtWidgets.QLabel(self)
+        self._image_label = QtGui.QLabel(self)
         self._image_label.raise_()
         self.setWidget(self._image_label)
         self._image_label.setScaledContents(False)
@@ -532,11 +480,12 @@ class InlineImageItem(QtWidgets.QScrollArea):
             self._full_size = not self._full_size
             self._elem.setSizeHint(QtCore.QSize(self.width(), self.height()))
         elif event.button() == QtCore.Qt.RightButton:  # save inline
-            directory = QtWidgets.QFileDialog.getExistingDirectory(self,
+            directory = QtGui.QFileDialog.getExistingDirectory(self,
-                                                               QtWidgets.QApplication.translate("MainWindow",
+                                                               QtGui.QApplication.translate("MainWindow",
-                                                                                            'Choose folder'),
+                                                                                            'Choose folder', None,
+                                                                                            QtGui.QApplication.UnicodeUTF8),
                                                                curr_directory(),
-                                                               QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
+                                                               QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
             if directory:
                 fl = QtCore.QFile(directory + '/toxygen_inline_' + curr_time().replace(':', '_') + '.png')
                 self._pixmap.save(fl, 'PNG')

toxygen/loginscreen.py

@@ -1,4 +1,9 @@
-from PyQt5 import QtWidgets, QtCore
+# -*- coding: utf-8 -*-
+
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 from widgets import *
 
 
@@ -26,25 +31,25 @@ class LoginScreen(CenteredWidget):
         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 = QtGui.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 = QtGui.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 = QtGui.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 = QtGui.QCheckBox(self)
         self.default.setGeometry(QtCore.QRect(220, 110, 131, 22))
-        self.groupBox = QtWidgets.QGroupBox(self)
+        self.groupBox = QtGui.QGroupBox(self)
         self.groupBox.setGeometry(QtCore.QRect(210, 40, 181, 151))
-        self.comboBox = QtWidgets.QComboBox(self.groupBox)
+        self.comboBox = QtGui.QComboBox(self.groupBox)
         self.comboBox.setGeometry(QtCore.QRect(10, 30, 161, 27))
-        self.groupBox_2 = QtWidgets.QGroupBox(self)
+        self.groupBox_2 = QtGui.QGroupBox(self)
         self.groupBox_2.setGeometry(QtCore.QRect(10, 40, 191, 151))
-        self.toxygen = QtWidgets.QLabel(self)
+        self.toxygen = QtGui.QLabel(self)
         self.groupBox.raise_()
         self.groupBox_2.raise_()
         self.comboBox.raise_()
@@ -52,7 +57,7 @@ class LoginScreen(CenteredWidget):
         self.load_profile.raise_()
         self.new_name.raise_()
         self.new_profile.raise_()
-        self.toxygen.setGeometry(QtCore.QRect(160, 8, 90, 25))
+        self.toxygen.setGeometry(QtCore.QRect(160, 10, 90, 21))
         font = QtGui.QFont()
         font.setFamily("Impact")
         font.setPointSize(16)
@@ -66,15 +71,15 @@ class LoginScreen(CenteredWidget):
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def retranslateUi(self):
-        self.new_name.setPlaceholderText(QtWidgets.QApplication.translate("login", "Profile name"))
+        self.new_name.setPlaceholderText(QtGui.QApplication.translate("login", "Profile name", None, QtGui.QApplication.UnicodeUTF8))
-        self.setWindowTitle(QtWidgets.QApplication.translate("login", "Log in"))
+        self.setWindowTitle(QtGui.QApplication.translate("login", "Log in", None, QtGui.QApplication.UnicodeUTF8))
-        self.new_profile.setText(QtWidgets.QApplication.translate("login", "Create"))
+        self.new_profile.setText(QtGui.QApplication.translate("login", "Create", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtWidgets.QApplication.translate("login", "Profile name:"))
+        self.label.setText(QtGui.QApplication.translate("login", "Profile name:", None, QtGui.QApplication.UnicodeUTF8))
-        self.load_profile.setText(QtWidgets.QApplication.translate("login", "Load profile"))
+        self.load_profile.setText(QtGui.QApplication.translate("login", "Load profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.default.setText(QtWidgets.QApplication.translate("login", "Use as default"))
+        self.default.setText(QtGui.QApplication.translate("login", "Use as default", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox.setTitle(QtWidgets.QApplication.translate("login", "Load existing profile"))
+        self.groupBox.setTitle(QtGui.QApplication.translate("login", "Load existing profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox_2.setTitle(QtWidgets.QApplication.translate("login", "Create new profile"))
+        self.groupBox_2.setTitle(QtGui.QApplication.translate("login", "Create new profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.toxygen.setText(QtWidgets.QApplication.translate("login", "toxygen"))
+        self.toxygen.setText(QtGui.QApplication.translate("login", "toxygen", None, QtGui.QApplication.UnicodeUTF8))
 
     def create_profile(self):
         self.type = 1

toxygen/main.py

@@ -2,24 +2,25 @@ import sys
 from loginscreen import LoginScreen
 import profile
 from settings import *
-from PyQt5 import QtCore, QtGui, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 from bootstrap import node_generator
 from mainscreen import MainWindow
-from callbacks import init_callbacks, stop, start
+from callbacks import init_callbacks
-from util import curr_directory, program_version, remove, is_64_bit
+from util import curr_directory, program_version
 import styles.style
-import platform
+import toxencryptsave
-import toxes
 from passwordscreen import PasswordScreen, UnlockAppScreen, SetProfilePasswordScreen
 from plugin_support import PluginLoader
-import updater
 
 
 class Toxygen:
 
     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
+        self.tox = self.ms = self.init = self.mainloop = self.avloop = None
         if path_or_uri is None:
             self.uri = self.path = None
         elif path_or_uri.startswith('tox:'):
@@ -34,9 +35,9 @@ class Toxygen:
         Show password screen
         """
         tmp = [data]
-        p = PasswordScreen(toxes.ToxES.get_instance(), tmp)
+        p = PasswordScreen(toxencryptsave.ToxEncryptSave.get_instance(), tmp)
         p.show()
-        self.app.lastWindowClosed.connect(self.app.quit)
+        self.app.connect(self.app, QtCore.SIGNAL("lastWindowClosed()"), self.app, QtCore.SLOT("quit()"))
         self.app.exec_()
         if tmp[0] == data:
             raise SystemExit()
@@ -47,19 +48,16 @@ class Toxygen:
         """
         Main function of app. loads login screen if needed and starts main screen
         """
-        app = QtWidgets.QApplication(sys.argv)
+        app = QtGui.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)
-
         # application color scheme
         with open(curr_directory() + '/styles/style.qss') as fl:
             dark_style = fl.read()
         app.setStyleSheet(dark_style)
 
-        encrypt_save = toxes.ToxES()
+        encrypt_save = toxencryptsave.ToxEncryptSave()
 
         if self.path is not None:
             path = os.path.dirname(self.path) + '/'
@@ -89,6 +87,7 @@ class Toxygen:
                 _login = self.Login(profiles)
                 ls.update_on_close(_login.login_screen_close)
                 ls.show()
+                app.connect(app, QtCore.SIGNAL("lastWindowClosed()"), app, QtCore.SLOT("quit()"))
                 app.exec_()
                 if not _login.t:
                     return
@@ -97,48 +96,32 @@ class Toxygen:
                     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 = QtGui.QMessageBox()
                         msgBox.setWindowTitle(
-                            QtWidgets.QApplication.translate("MainWindow", "Error"))
+                            QtGui.QApplication.translate("MainWindow", "Error", None, QtGui.QApplication.UnicodeUTF8))
-                        text = (QtWidgets.QApplication.translate("MainWindow",
+                        text = (QtGui.QApplication.translate("MainWindow",
-                                                             'Profile with this name already exists'))
+                                                             'Profile with this name already exists',
+                                                             None, QtGui.QApplication.UnicodeUTF8))
                         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,
+                    reply = QtGui.QMessageBox.question(None,
                                                        'Profile {}'.format(name),
-                                                       QtWidgets.QApplication.translate("login",
+                                                       QtGui.QApplication.translate("login",
-                                                                                    'Do you want to set profile password?'),
+                                                                                    'Do you want to set profile password?',
-                                                           QtWidgets.QMessageBox.Yes,
+                                                                                    None,
-                                                           QtWidgets.QMessageBox.No)
+                                                                                    QtGui.QApplication.UnicodeUTF8),
-                    if reply == QtWidgets.QMessageBox.Yes:
+                                                       QtGui.QMessageBox.Yes,
+                                                       QtGui.QMessageBox.No)
+                    if reply == QtGui.QMessageBox.Yes:
                         set_pass = SetProfilePasswordScreen(encrypt_save)
                         set_pass.show()
-                        self.app.lastWindowClosed.connect(self.app.quit)
+                        self.app.connect(self.app, QtCore.SIGNAL("lastWindowClosed()"), self.app, QtCore.SLOT("quit()"))
                         self.app.exec_()
-                    reply = QtWidgets.QMessageBox.question(None,
+                    ProfileHelper(Settings.get_default_path(), name).save_profile(self.tox.get_savedata())
-                                                       '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:
@@ -162,12 +145,12 @@ class Toxygen:
                 self.tox = profile.tox_factory(data, settings)
 
         if Settings.is_active_profile(path, name):  # profile is in use
-            reply = QtWidgets.QMessageBox.question(None,
+            reply = QtGui.QMessageBox.question(None,
                                                'Profile {}'.format(name),
-                                               QtWidgets.QApplication.translate("login", 'Other instance of Toxygen uses this profile or profile was not properly closed. Continue?'),
+                                               QtGui.QApplication.translate("login", 'Other instance of Toxygen uses this profile or profile was not properly closed. Continue?', None, QtGui.QApplication.UnicodeUTF8),
-                                                   QtWidgets.QMessageBox.Yes,
+                                               QtGui.QMessageBox.Yes,
-                                                   QtWidgets.QMessageBox.No)
+                                               QtGui.QMessageBox.No)
-            if reply != QtWidgets.QMessageBox.Yes:
+            if reply != QtGui.QMessageBox.Yes:
                 return
         else:
             settings.set_active_profile()
@@ -179,21 +162,19 @@ class Toxygen:
         app.translator = translator
 
         # tray icon
-        self.tray = QtWidgets.QSystemTrayIcon(QtGui.QIcon(curr_directory() + '/images/icon.png'))
+        self.tray = QtGui.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):
+        class Menu(QtGui.QMenu):
 
             def newStatus(self, status):
-                if not Settings.get_instance().locked:
+                profile.Profile.get_instance().set_status(status)
-                    profile.Profile.get_instance().set_status(status)
+                self.aboutToShow()
-                    self.aboutToShowHandler()
+                self.hide()
-                    self.hide()
 
-            def aboutToShowHandler(self):
+            def aboutToShow(self):
                 status = profile.Profile.get_instance().status
                 act = self.act
                 if status is None or Settings.get_instance().locked:
@@ -207,96 +188,55 @@ class Toxygen:
                 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()[0].setText(QtGui.QApplication.translate('tray', 'Open Toxygen', None, QtGui.QApplication.UnicodeUTF8))
-                self.actions()[1].setText(QtWidgets.QApplication.translate('tray', 'Set status'))
+                self.actions()[1].setText(QtGui.QApplication.translate('tray', 'Set status', None, QtGui.QApplication.UnicodeUTF8))
-                self.actions()[2].setText(QtWidgets.QApplication.translate('tray', 'Exit'))
+                self.actions()[2].setText(QtGui.QApplication.translate('tray', 'Exit', None, QtGui.QApplication.UnicodeUTF8))
-                self.act.actions()[0].setText(QtWidgets.QApplication.translate('tray', 'Online'))
+                self.act.actions()[0].setText(QtGui.QApplication.translate('tray', 'Online', None, QtGui.QApplication.UnicodeUTF8))
-                self.act.actions()[1].setText(QtWidgets.QApplication.translate('tray', 'Away'))
+                self.act.actions()[1].setText(QtGui.QApplication.translate('tray', 'Away', None, QtGui.QApplication.UnicodeUTF8))
-                self.act.actions()[2].setText(QtWidgets.QApplication.translate('tray', 'Busy'))
+                self.act.actions()[2].setText(QtGui.QApplication.translate('tray', 'Busy', None, QtGui.QApplication.UnicodeUTF8))
 
         m = Menu()
-        show = m.addAction(QtWidgets.QApplication.translate('tray', 'Open Toxygen'))
+        show = m.addAction(QtGui.QApplication.translate('tray', 'Open Toxygen', None, QtGui.QApplication.UnicodeUTF8))
-        sub = m.addMenu(QtWidgets.QApplication.translate('tray', 'Set status'))
+        sub = m.addMenu(QtGui.QApplication.translate('tray', 'Set status', None, QtGui.QApplication.UnicodeUTF8))
-        onl = sub.addAction(QtWidgets.QApplication.translate('tray', 'Online'))
+        onl = sub.addAction(QtGui.QApplication.translate('tray', 'Online', None, QtGui.QApplication.UnicodeUTF8))
-        away = sub.addAction(QtWidgets.QApplication.translate('tray', 'Away'))
+        away = sub.addAction(QtGui.QApplication.translate('tray', 'Away', None, QtGui.QApplication.UnicodeUTF8))
-        busy = sub.addAction(QtWidgets.QApplication.translate('tray', 'Busy'))
+        busy = sub.addAction(QtGui.QApplication.translate('tray', 'Busy', None, QtGui.QApplication.UnicodeUTF8))
         onl.setCheckable(True)
         away.setCheckable(True)
         busy.setCheckable(True)
         m.act = sub
-        exit = m.addAction(QtWidgets.QApplication.translate('tray', 'Exit'))
+        exit = m.addAction(QtGui.QApplication.translate('tray', 'Exit', None, QtGui.QApplication.UnicodeUTF8))
 
         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:
+            if not Settings.get_instance().locked:
                 show()
             else:
                 def correct_pass():
                     show()
-                    s.locked = False
+                    Settings.get_instance().locked = False
-                    s.unlockScreen = False
+                self.p = UnlockAppScreen(toxencryptsave.ToxEncryptSave.get_instance(), correct_pass)
-                if not s.unlockScreen:
+                self.p.show()
-                    s.unlockScreen = True
-                    self.p = UnlockAppScreen(toxes.ToxES.get_instance(), correct_pass)
-                    self.p.show()
 
-        def tray_activated(reason):
+        m.connect(show, QtCore.SIGNAL("triggered()"), show_window)
-            if reason == QtWidgets.QSystemTrayIcon.DoubleClick:
+        m.connect(exit, QtCore.SIGNAL("triggered()"), lambda: app.exit())
-                show_window()
+        m.connect(m, QtCore.SIGNAL("aboutToShow()"), lambda: m.aboutToShow())
-
+        sub.connect(onl, QtCore.SIGNAL("triggered()"), lambda: m.newStatus(0))
-        def close_app():
+        sub.connect(away, QtCore.SIGNAL("triggered()"), lambda: m.newStatus(1))
-            if not Settings.get_instance().locked:
+        sub.connect(busy, QtCore.SIGNAL("triggered()"), lambda: m.newStatus(2))
-                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()
@@ -310,14 +250,12 @@ class Toxygen:
         if self.uri is not None:
             self.ms.add_contact(self.uri)
 
-        app.lastWindowClosed.connect(app.quit)
+        app.connect(app, QtCore.SIGNAL("lastWindowClosed()"), app, QtCore.SLOT("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()
@@ -445,13 +383,15 @@ class Toxygen:
 def clean():
     """Removes all windows libs from libs folder"""
     d = curr_directory() + '/libs/'
-    remove(d)
+    for fl in ('libtox64.dll', 'libtox.dll', 'libsodium64.a', 'libsodium.a'):
+        if os.path.exists(d + fl):
+            os.remove(d + fl)
 
 
 def configure():
     """Removes unused libs"""
     d = curr_directory() + '/libs/'
-    is_64bits = is_64_bit()
+    is_64bits = sys.maxsize > 2 ** 32
     if not is_64bits:
         if os.path.exists(d + 'libtox64.dll'):
             os.remove(d + 'libtox64.dll')
@@ -469,20 +409,16 @@ def configure():
             pass
 
 
-def reset():
-    Settings.reset_auto_profile()
-
-
 def main():
     if len(sys.argv) == 1:
         toxygen = Toxygen()
     else:  # started with argument(s)
         arg = sys.argv[1]
         if arg == '--version':
-            print('Toxygen v' + program_version)
+            print('Toxygen ' + program_version)
             return
         elif arg == '--help':
-            print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version\ntoxygen --reset')
+            print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version')
             return
         elif arg == '--configure':
             configure()
@@ -490,9 +426,6 @@ def main():
         elif arg == '--clean':
             clean()
             return
-        elif arg == '--reset':
-            reset()
-            return
         else:
             toxygen = Toxygen(arg)
     toxygen.main()

toxygen/mainscreen.py

@@ -1,72 +1,69 @@
+# -*- coding: utf-8 -*-
+
 from menu import *
 from profile import *
 from list_items import *
-from widgets import MultilineEdit, ComboBox
+from widgets import MultilineEdit, LineEdit
 import plugin_support
 from mainscreen_widgets import *
-import settings
-import platform
-import toxes
 
 
-class MainWindow(QtWidgets.QMainWindow, Singleton):
+class MainWindow(QtGui.QMainWindow):
 
     def __init__(self, tox, reset, tray):
-        super().__init__()
+        super(MainWindow, self).__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, Form):
+    def setup_menu(self, MainWindow):
-        box = QtWidgets.QHBoxLayout()
+        self.menubar = QtGui.QMenuBar(MainWindow)
-        box.setContentsMargins(0, 0, 0, 0)
+        self.menubar.setObjectName("menubar")
-        box.setAlignment(QtCore.Qt.AlignLeft)
+        self.menubar.setNativeMenuBar(False)
-        self.profile_button = MainMenuButton(Form)
+        self.menubar.setMinimumSize(self.width(), 25)
-        box.addWidget(self.profile_button)
+        self.menubar.setMaximumSize(self.width(), 25)
-        self.settings_button = MainMenuButton(Form)
+        self.menubar.setBaseSize(self.width(), 25)
-        box.addWidget(self.settings_button)
-        self.plugins_button = MainMenuButton(Form)
-        box.addWidget(self.plugins_button)
-        self.about_button = MainMenuButton(Form)
-        box.addWidget(self.about_button)
-        box.setSpacing(0)
 
-        self.menuProfile = QtWidgets.QMenu()
+        self.menuProfile = QtGui.QMenu(self.menubar)
         self.menuProfile.setObjectName("menuProfile")
-        self.menuSettings = QtWidgets.QMenu()
+        self.menuGroupChats = QtGui.QMenu(self.menubar)
+        self.menuGroupChats.setObjectName("menuGroupChats")
+        self.menuSettings = QtGui.QMenu(self.menubar)
         self.menuSettings.setObjectName("menuSettings")
-        self.menuPlugins = QtWidgets.QMenu()
+        self.menuPlugins = QtGui.QMenu(self.menubar)
         self.menuPlugins.setObjectName("menuPlugins")
-        self.menuAbout = QtWidgets.QMenu()
+        self.menuAbout = QtGui.QMenu(self.menubar)
         self.menuAbout.setObjectName("menuAbout")
 
-        self.actionAdd_friend = QtWidgets.QAction(Form)
+        self.actionAdd_friend = QtGui.QAction(MainWindow)
         self.actionAdd_friend.setObjectName("actionAdd_friend")
-        self.actionprofilesettings = QtWidgets.QAction(Form)
+        self.actionprofilesettings = QtGui.QAction(MainWindow)
         self.actionprofilesettings.setObjectName("actionprofilesettings")
-        self.actionPrivacy_settings = QtWidgets.QAction(Form)
+        self.actionPrivacy_settings = QtGui.QAction(MainWindow)
         self.actionPrivacy_settings.setObjectName("actionPrivacy_settings")
-        self.actionInterface_settings = QtWidgets.QAction(Form)
+        self.actionInterface_settings = QtGui.QAction(MainWindow)
         self.actionInterface_settings.setObjectName("actionInterface_settings")
-        self.actionNotifications = QtWidgets.QAction(Form)
+        self.actionNotifications = QtGui.QAction(MainWindow)
         self.actionNotifications.setObjectName("actionNotifications")
-        self.actionNetwork = QtWidgets.QAction(Form)
+        self.actionNetwork = QtGui.QAction(MainWindow)
         self.actionNetwork.setObjectName("actionNetwork")
-        self.actionAbout_program = QtWidgets.QAction(Form)
+        self.actionAbout_program = QtGui.QAction(MainWindow)
         self.actionAbout_program.setObjectName("actionAbout_program")
-        self.updateSettings = QtWidgets.QAction(Form)
+        self.actionSettings = QtGui.QAction(MainWindow)
-        self.actionSettings = QtWidgets.QAction(Form)
         self.actionSettings.setObjectName("actionSettings")
-        self.audioSettings = QtWidgets.QAction(Form)
+        self.audioSettings = QtGui.QAction(MainWindow)
-        self.pluginData = QtWidgets.QAction(Form)
+        self.pluginData = QtGui.QAction(MainWindow)
-        self.importPlugin = QtWidgets.QAction(Form)
+        self.importPlugin = QtGui.QAction(MainWindow)
-        self.reloadPlugins = QtWidgets.QAction(Form)
+        self.lockApp = QtGui.QAction(MainWindow)
-        self.lockApp = QtWidgets.QAction(Form)
+        self.createGC = QtGui.QAction(MainWindow)
+        self.joinGC = QtGui.QAction(MainWindow)
+        self.gcRequests = QtGui.QAction(MainWindow)
+        self.menuGroupChats.addAction(self.createGC)
+        self.menuGroupChats.addAction(self.joinGC)
+        self.menuGroupChats.addAction(self.gcRequests)
         self.menuProfile.addAction(self.actionAdd_friend)
         self.menuProfile.addAction(self.actionSettings)
         self.menuProfile.addAction(self.lockApp)
@@ -75,16 +72,14 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.menuSettings.addAction(self.actionNotifications)
         self.menuSettings.addAction(self.actionNetwork)
         self.menuSettings.addAction(self.audioSettings)
-        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.profile_button.setMenu(self.menuProfile)
+        self.menubar.addAction(self.menuGroupChats.menuAction())
-        self.settings_button.setMenu(self.menuSettings)
+        self.menubar.addAction(self.menuSettings.menuAction())
-        self.plugins_button.setMenu(self.menuPlugins)
+        self.menubar.addAction(self.menuPlugins.menuAction())
-        self.about_button.setMenu(self.menuAbout)
+        self.menubar.addAction(self.menuAbout.menuAction())
 
         self.actionAbout_program.triggered.connect(self.about_program)
         self.actionNetwork.triggered.connect(self.network_settings)
@@ -94,14 +89,14 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.actionInterface_settings.triggered.connect(self.interface_settings)
         self.actionNotifications.triggered.connect(self.notification_settings)
         self.audioSettings.triggered.connect(self.audio_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)
+        self.createGC.triggered.connect(self.create_groupchat)
+        self.joinGC.triggered.connect(self.join_groupchat)
 
-        Form.setLayout(box)
+        QtCore.QMetaObject.connectSlotsByName(MainWindow)
-        QtCore.QMetaObject.connectSlotsByName(Form)
 
     def languageChange(self, *args, **kwargs):
         self.retranslateUi()
@@ -109,41 +104,36 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
     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.joinGC.setText(QtGui.QApplication.translate("MainWindow", "Join group chat", None, QtGui.QApplication.UnicodeUTF8))
-        self.plugins_button.setText(QtWidgets.QApplication.translate("MainWindow", "Plugins"))
+        self.lockApp.setText(QtGui.QApplication.translate("MainWindow", "Lock", None, QtGui.QApplication.UnicodeUTF8))
-        self.pluginData.setText(QtWidgets.QApplication.translate("MainWindow", "List of plugins"))
+        self.menuGroupChats.setTitle(QtGui.QApplication.translate("MainWindow", "Group chats", None, QtGui.QApplication.UnicodeUTF8))
-        self.profile_button.setText(QtWidgets.QApplication.translate("MainWindow", "Profile"))
+        self.createGC.setText(QtGui.QApplication.translate("MainWindow", "Create group chat", None, QtGui.QApplication.UnicodeUTF8))
-        self.settings_button.setText(QtWidgets.QApplication.translate("MainWindow", "Settings"))
+        self.gcRequests.setText(QtGui.QApplication.translate("MainWindow", "Groupchat requests", None, QtGui.QApplication.UnicodeUTF8))
-        self.about_button.setText(QtWidgets.QApplication.translate("MainWindow", "About"))
+        self.menuPlugins.setTitle(QtGui.QApplication.translate("MainWindow", "Plugins", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionAdd_friend.setText(QtWidgets.QApplication.translate("MainWindow", "Add contact"))
+        self.pluginData.setText(QtGui.QApplication.translate("MainWindow", "List of plugins", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionprofilesettings.setText(QtWidgets.QApplication.translate("MainWindow", "Profile"))
+        self.menuProfile.setTitle(QtGui.QApplication.translate("MainWindow", "Profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionPrivacy_settings.setText(QtWidgets.QApplication.translate("MainWindow", "Privacy"))
+        self.menuSettings.setTitle(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionInterface_settings.setText(QtWidgets.QApplication.translate("MainWindow", "Interface"))
+        self.menuAbout.setTitle(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionNotifications.setText(QtWidgets.QApplication.translate("MainWindow", "Notifications"))
+        self.actionAdd_friend.setText(QtGui.QApplication.translate("MainWindow", "Add contact", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionNetwork.setText(QtWidgets.QApplication.translate("MainWindow", "Network"))
+        self.actionprofilesettings.setText(QtGui.QApplication.translate("MainWindow", "Profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionAbout_program.setText(QtWidgets.QApplication.translate("MainWindow", "About program"))
+        self.actionPrivacy_settings.setText(QtGui.QApplication.translate("MainWindow", "Privacy", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Settings"))
+        self.actionInterface_settings.setText(QtGui.QApplication.translate("MainWindow", "Interface", None, QtGui.QApplication.UnicodeUTF8))
-        self.audioSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Audio"))
+        self.actionNotifications.setText(QtGui.QApplication.translate("MainWindow", "Notifications", None, QtGui.QApplication.UnicodeUTF8))
-        self.updateSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Updates"))
+        self.actionNetwork.setText(QtGui.QApplication.translate("MainWindow", "Network", None, QtGui.QApplication.UnicodeUTF8))
-        self.contact_name.setPlaceholderText(QtWidgets.QApplication.translate("MainWindow", "Search"))
+        self.actionAbout_program.setText(QtGui.QApplication.translate("MainWindow", "About program", None, QtGui.QApplication.UnicodeUTF8))
-        self.sendMessageButton.setToolTip(QtWidgets.QApplication.translate("MainWindow", "Send message"))
+        self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
-        self.callButton.setToolTip(QtWidgets.QApplication.translate("MainWindow", "Start audio call with friend"))
+        self.audioSettings.setText(QtGui.QApplication.translate("MainWindow", "Audio", None, QtGui.QApplication.UnicodeUTF8))
+        self.contact_name.setPlaceholderText(QtGui.QApplication.translate("MainWindow", "Search", None, QtGui.QApplication.UnicodeUTF8))
+        self.sendMessageButton.setToolTip(QtGui.QApplication.translate("MainWindow", "Send message", None, QtGui.QApplication.UnicodeUTF8))
+        self.callButton.setToolTip(QtGui.QApplication.translate("MainWindow", "Start audio call with friend", None, QtGui.QApplication.UnicodeUTF8))
         self.online_contacts.clear()
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "All"))
+        self.online_contacts.addItem(QtGui.QApplication.translate("MainWindow", "All", None, QtGui.QApplication.UnicodeUTF8))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Online"))
+        self.online_contacts.addItem(QtGui.QApplication.translate("MainWindow", "Online", None, QtGui.QApplication.UnicodeUTF8))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Online first"))
+        self.online_contacts.setCurrentIndex(int(Settings.get_instance()['show_online_friends']))
-        self.online_contacts.addItem(QtWidgets.QApplication.translate("MainWindow", "Name"))
+        self.importPlugin.setText(QtGui.QApplication.translate("MainWindow", "Import plugin", None, QtGui.QApplication.UnicodeUTF8))
-        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)
@@ -151,11 +141,10 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.messageEdit.setGeometry(QtCore.QRect(0, 3, 450, 55))
         self.messageEdit.setObjectName("messageEdit")
         font = QtGui.QFont()
-        font.setPointSize(11)
+        font.setPointSize(10)
-        font.setFamily(settings.Settings.get_instance()['font'])
         self.messageEdit.setFont(font)
 
-        self.sendMessageButton = QtWidgets.QPushButton(Form)
+        self.sendMessageButton = QtGui.QPushButton(Form)
         self.sendMessageButton.setGeometry(QtCore.QRect(565, 3, 60, 55))
         self.sendMessageButton.setObjectName("sendMessageButton")
 
@@ -178,7 +167,7 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
 
     def setup_left_center_menu(self, Form):
         Form.resize(270, 25)
-        self.search_label = QtWidgets.QLabel(Form)
+        self.search_label = QtGui.QLabel(Form)
         self.search_label.setGeometry(QtCore.QRect(3, 2, 20, 20))
         pixmap = QtGui.QPixmap()
         pixmap.load(curr_directory() + '/images/search.png')
@@ -190,7 +179,7 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.contact_name.setObjectName("contact_name")
         self.contact_name.textChanged.connect(self.filtering)
 
-        self.online_contacts = ComboBox(Form)
+        self.online_contacts = QtGui.QComboBox(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_()
@@ -199,29 +188,28 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
 
     def setup_left_top(self, Form):
         Form.setCursor(QtCore.Qt.PointingHandCursor)
-        Form.setMinimumSize(QtCore.QSize(270, 75))
+        Form.setMinimumSize(QtCore.QSize(270, 100))
-        Form.setMaximumSize(QtCore.QSize(270, 75))
+        Form.setMaximumSize(QtCore.QSize(270, 100))
-        Form.setBaseSize(QtCore.QSize(270, 75))
+        Form.setBaseSize(QtCore.QSize(270, 100))
-        self.avatar_label = Form.avatar_label = QtWidgets.QLabel(Form)
+        self.avatar_label = Form.avatar_label = QtGui.QLabel(Form)
-        self.avatar_label.setGeometry(QtCore.QRect(5, 5, 64, 64))
+        self.avatar_label.setGeometry(QtCore.QRect(5, 30, 64, 64))
-        self.avatar_label.setScaledContents(False)
+        self.avatar_label.setScaledContents(True)
-        self.avatar_label.setAlignment(QtCore.Qt.AlignCenter)
         self.name = Form.name = DataLabel(Form)
-        Form.name.setGeometry(QtCore.QRect(75, 15, 150, 25))
+        Form.name.setGeometry(QtCore.QRect(75, 40, 150, 25))
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         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))
+        Form.status_message.setGeometry(QtCore.QRect(75, 60, 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))
+        Form.connection_status.setGeometry(QtCore.QRect(230, 35, 32, 32))
         self.avatar_label.mouseReleaseEvent = self.profile_settings
         self.status_message.mouseReleaseEvent = self.profile_settings
         self.name.mouseReleaseEvent = self.profile_settings
@@ -229,37 +217,42 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         Form.connection_status.setObjectName("connection_status")
 
     def setup_right_top(self, Form):
-        Form.resize(650, 75)
+        Form.resize(650, 100)
-        self.account_avatar = QtWidgets.QLabel(Form)
+        self.account_avatar = QtGui.QLabel(Form)
-        self.account_avatar.setGeometry(QtCore.QRect(10, 5, 64, 64))
+        self.account_avatar.setGeometry(QtCore.QRect(10, 30, 64, 64))
-        self.account_avatar.setScaledContents(False)
+        self.account_avatar.setScaledContents(True)
         self.account_name = DataLabel(Form)
-        self.account_name.setGeometry(QtCore.QRect(100, 0, 400, 25))
+        self.account_name.setGeometry(QtCore.QRect(100, 25, 400, 25))
         self.account_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
         font = QtGui.QFont()
-        font.setFamily(settings.Settings.get_instance()['font'])
+        font.setFamily("Times New Roman")
         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.setGeometry(QtCore.QRect(100, 45, 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.account_status.mouseReleaseEvent = self.show_chat_menu
+        self.account_name.mouseReleaseEvent = self.show_chat_menu
+        self.account_avatar.mouseReleaseEvent = self.show_chat_menu
+
+        self.callButton = QtGui.QPushButton(Form)
+        self.callButton.setGeometry(QtCore.QRect(550, 30, 50, 50))
         self.callButton.setObjectName("callButton")
         self.callButton.clicked.connect(lambda: self.profile.call_click(True))
-        self.videocallButton = QtWidgets.QPushButton(Form)
+        self.videocallButton = QtGui.QPushButton(Form)
-        self.videocallButton.setGeometry(QtCore.QRect(550, 5, 50, 50))
+        self.videocallButton.setGeometry(QtCore.QRect(550, 30, 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 = QtGui.QLabel(Form)
-        self.typing.setGeometry(QtCore.QRect(500, 25, 50, 30))
+        self.typing.setGeometry(QtCore.QRect(500, 50, 50, 30))
         pixmap = QtGui.QPixmap(QtCore.QSize(50, 30))
         pixmap.load(curr_directory() + '/images/typing.png')
         self.typing.setScaledContents(False)
@@ -268,34 +261,30 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def setup_left_center(self, widget):
-        self.friends_list = QtWidgets.QListWidget(widget)
+        self.friends_list = QtGui.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.connect(self.friends_list, QtCore.SIGNAL("customContextMenuRequested(QPoint)"),
-        self.friends_list.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+                                  self.friend_right_click)
-        self.friends_list.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
+        self.friends_list.setVerticalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
-        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 = QtGui.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.setFocusPolicy(QtCore.Qt.NoFocus)
-        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.setVerticalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
-        self.messages.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
 
     def initUI(self, tox):
         self.setMinimumSize(920, 500)
@@ -303,115 +292,86 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.setGeometry(s['x'], s['y'], s['width'], s['height'])
         self.setWindowTitle('Toxygen')
         os.chdir(curr_directory() + '/images/')
-        menu = QtWidgets.QWidget()
+        main = QtGui.QWidget()
-        main = QtWidgets.QWidget()
+        grid = QtGui.QGridLayout()
-        grid = QtWidgets.QGridLayout()
+        search = QtGui.QWidget()
-        search = QtWidgets.QWidget()
+        name = QtGui.QWidget()
-        name = QtWidgets.QWidget()
+        info = QtGui.QWidget()
-        info = QtWidgets.QWidget()
+        main_list = QtGui.QWidget()
-        main_list = QtWidgets.QWidget()
+        messages = QtGui.QWidget()
-        messages = QtWidgets.QWidget()
+        message_buttons = QtGui.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(search, 1, 0)
-            grid.addWidget(name, 1, 0)
+            grid.addWidget(name, 0, 0)
-            grid.addWidget(messages, 2, 1, 2, 1)
+            grid.addWidget(messages, 1, 1, 2, 1)
-            grid.addWidget(info, 1, 1)
+            grid.addWidget(info, 0, 1)
-            grid.addWidget(message_buttons, 4, 1)
+            grid.addWidget(message_buttons, 3, 1)
-            grid.addWidget(main_list, 3, 0, 2, 1)
+            grid.addWidget(main_list, 2, 0, 2, 1)
             grid.setColumnMinimumWidth(1, 500)
             grid.setColumnMinimumWidth(0, 270)
         else:
-            grid.addWidget(search, 2, 1)
+            grid.addWidget(search, 1, 1)
-            grid.addWidget(name, 1, 1)
+            grid.addWidget(name, 0, 1)
-            grid.addWidget(messages, 2, 0, 2, 1)
+            grid.addWidget(messages, 1, 0, 2, 1)
-            grid.addWidget(info, 1, 0)
+            grid.addWidget(info, 0, 0)
-            grid.addWidget(message_buttons, 4, 0)
+            grid.addWidget(message_buttons, 3, 0)
-            grid.addWidget(main_list, 3, 1, 2, 1)
+            grid.addWidget(main_list, 2, 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(0, 100)
-        grid.setRowMinimumHeight(1, 75)
+        grid.setRowMinimumHeight(1, 25)
-        grid.setRowMinimumHeight(2, 25)
+        grid.setRowMinimumHeight(2, 320)
-        grid.setRowMinimumHeight(3, 320)
+        grid.setRowMinimumHeight(3, 55)
-        grid.setRowMinimumHeight(4, 55)
         grid.setColumnStretch(1, 1)
-        grid.setRowStretch(3, 1)
+        grid.setRowStretch(2, 1)
         main.setLayout(grid)
         self.setCentralWidget(main)
+        self.setup_menu(self)
         self.messageEdit.setFocus()
         self.user_info = name
         self.friend_info = info
         self.retranslateUi()
         self.profile = Profile(tox, self)
 
-    def closeEvent(self, event):
+    def closeEvent(self, *args, **kwargs):
+        self.profile.save_history()
+        self.profile.close()
         s = Settings.get_instance()
-        if not s['close_to_tray'] or s.closing:
+        s['x'] = self.pos().x()
-            if not self._saved:
+        s['y'] = self.pos().y()
-                self._saved = True
+        s['width'] = self.width()
-                self.profile.save_history()
+        s['height'] = self.height()
-                self.profile.close()
+        s.save()
-                s['x'] = self.geometry().x()
+        QtGui.QApplication.closeAllWindows()
-                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):
-        if platform.system() == 'Windows':
+        self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
-            self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
+        self.friends_list.setGeometry(0, 0, 270, self.height() - 125)
-            self.friends_list.setGeometry(0, 0, 270, self.height() - 125)
-        else:
-            self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 159)
-            self.friends_list.setGeometry(0, 0, 270, self.height() - 129)
 
-        self.videocallButton.setGeometry(QtCore.QRect(self.width() - 330, 10, 50, 50))
+        self.videocallButton.setGeometry(QtCore.QRect(self.width() - 330, 40, 50, 50))
-        self.callButton.setGeometry(QtCore.QRect(self.width() - 390, 10, 50, 50))
+        self.callButton.setGeometry(QtCore.QRect(self.width() - 390, 40, 50, 50))
-        self.typing.setGeometry(QtCore.QRect(self.width() - 450, 20, 50, 30))
+        self.typing.setGeometry(QtCore.QRect(self.width() - 450, 50, 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_name.setGeometry(QtCore.QRect(100, 40, self.width() - 560, 25))
-        self.account_status.setGeometry(QtCore.QRect(100, 35, self.width() - 560, 25))
+        self.account_status.setGeometry(QtCore.QRect(100, 60, 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():
+        if event.key() == QtCore.Qt.Key_Escape:
             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)
 
@@ -421,10 +381,10 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
 
     def about_program(self):
         import util
-        msgBox = QtWidgets.QMessageBox()
+        msgBox = QtGui.QMessageBox()
-        msgBox.setWindowTitle(QtWidgets.QApplication.translate("MainWindow", "About"))
+        msgBox.setWindowTitle(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
-        text = (QtWidgets.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python.\nVersion: '))
+        text = (QtGui.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python.\nVersion: ', None, QtGui.QApplication.UnicodeUTF8))
-        msgBox.setText(text + util.program_version + '\nGitHub: https://github.com/toxygen-project/toxygen/')
+        msgBox.setText(text + util.program_version + '\nGitHub: github.com/xveduk/toxygen/')
         msgBox.exec_()
 
     def network_settings(self):
@@ -436,7 +396,7 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.p_s.show()
 
     def add_contact(self, link=''):
-        self.a_c = AddContact(link or '')
+        self.a_c = AddContact(link)
         self.a_c.show()
 
     def profile_settings(self, *args):
@@ -459,42 +419,37 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.audio_s = AudioSettings()
         self.audio_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,
+        directory = QtGui.QFileDialog.getExistingDirectory(self,
-                                                           QtWidgets.QApplication.translate("MainWindow", 'Choose folder with plugin'),
+                                                           QtGui.QApplication.translate("MainWindow", 'Choose folder with plugin',
+                                                                                        None,
+                                                                                        QtGui.QApplication.UnicodeUTF8),
                                                            util.curr_directory(),
-                                                           QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
+                                                           QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
         if directory:
             src = directory + '/'
             dest = curr_directory() + '/plugins/'
             util.copy(src, dest)
-            msgBox = QtWidgets.QMessageBox()
+            msgBox = QtGui.QMessageBox()
             msgBox.setWindowTitle(
-                QtWidgets.QApplication.translate("MainWindow", "Restart Toxygen"))
+                QtGui.QApplication.translate("MainWindow", "Restart Toxygen", None, QtGui.QApplication.UnicodeUTF8))
             msgBox.setText(
-                QtWidgets.QApplication.translate("MainWindow", 'Plugin will be loaded after restart'))
+                QtGui.QApplication.translate("MainWindow", 'Plugin will be loaded after restart', None,
+                                             QtGui.QApplication.UnicodeUTF8))
             msgBox.exec_()
 
     def lock_app(self):
-        if toxes.ToxES.get_instance().has_password():
+        if toxencryptsave.ToxEncryptSave.get_instance().has_password():
             Settings.get_instance().locked = True
             self.hide()
         else:
-            msgBox = QtWidgets.QMessageBox()
+            msgBox = QtGui.QMessageBox()
             msgBox.setWindowTitle(
-                QtWidgets.QApplication.translate("MainWindow", "Cannot lock app"))
+                QtGui.QApplication.translate("MainWindow", "Cannot lock app", None, QtGui.QApplication.UnicodeUTF8))
             msgBox.setText(
-                QtWidgets.QApplication.translate("MainWindow", 'Error. Profile password is not set.'))
+                QtGui.QApplication.translate("MainWindow", 'Error. Profile password is not set.', None,
+                                             QtGui.QApplication.UnicodeUTF8))
             msgBox.exec_()
 
     def show_menu(self):
@@ -506,6 +461,19 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
                                            120))
         self.menu.show()
 
+    def create_groupchat(self):
+        self.gc = AddGroupchat()
+        self.gc.show()
+
+    def join_groupchat(self):
+        self.gc = JoinGroupchat()
+        self.gc.show()
+
+    def show_chat_menu(self):
+        pr = Profile.get_instance()
+        if not pr.is_active_a_friend():
+            pass  # TODO: show list of users in chat
+
     # -----------------------------------------------------------------------------------------------------------------
     # Messages, calls and file transfers
     # -----------------------------------------------------------------------------------------------------------------
@@ -516,14 +484,18 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
 
     def send_file(self):
         self.menu.hide()
+        if not self.profile.is_active_a_friend():
+            return
         if self.profile.active_friend + 1:
-            choose = QtWidgets.QApplication.translate("MainWindow", 'Choose file')
+            choose = QtGui.QApplication.translate("MainWindow", 'Choose file', None, QtGui.QApplication.UnicodeUTF8)
-            name = QtWidgets.QFileDialog.getOpenFileName(self, choose, options=QtWidgets.QFileDialog.DontUseNativeDialog)
+            name = QtGui.QFileDialog.getOpenFileName(self, choose, options=QtGui.QFileDialog.DontUseNativeDialog)
             if name[0]:
                 self.profile.send_file(name[0])
 
     def send_screenshot(self, hide=False):
         self.menu.hide()
+        if not self.profile.is_active_a_friend():
+            return
         if self.profile.active_friend + 1:
             self.sw = ScreenShotWindow(self)
             self.sw.show()
@@ -542,12 +514,14 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
 
     def send_sticker(self):
         self.menu.hide()
+        if not self.profile.is_active_a_friend():
+            return
         if self.profile.active_friend + 1:
             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.y() + self.height() - 200,
-                                                  self.sticker.width(),
+                                                 self.sticker.width(),
-                                                  self.sticker.height()))
+                                                 self.sticker.height()))
             self.sticker.show()
 
     def active_call(self):
@@ -578,48 +552,60 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
     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)
+        friend = Profile.get_instance().get_friend_or_gc(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')
+        auto = QtGui.QApplication.translate("MainWindow", 'Disallow auto accept', None, QtGui.QApplication.UnicodeUTF8) if allowed else QtGui.QApplication.translate("MainWindow", 'Allow auto accept', None, QtGui.QApplication.UnicodeUTF8)
         if item is not None:
-            self.listMenu = QtWidgets.QMenu()
+            self.listMenu = QtGui.QMenu()
-            set_alias_item = self.listMenu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Set alias'))
+            if type(friend) is Friend:
+                arr = Profile.get_instance().get_all_gc()
+                if arr:
+                    gc_menu = self.listMenu.addMenu(QtGui.QApplication.translate("MainWindow", 'Invite to group chat', None, QtGui.QApplication.UnicodeUTF8))
+                    for gc in arr:
+                        item = gc_menu.addAction(gc.name)
+                        self.connect(item, QtCore.SIGNAL("triggered()"),
+                                     lambda: Profile.get_instance().invite_friend(gc.number, friend.number))
 
-            history_menu = self.listMenu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Chat history'))
+                set_alias_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Set alias', None, QtGui.QApplication.UnicodeUTF8))
-            clear_history_item = history_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Clear history'))
+                clear_history_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Clear history', None, QtGui.QApplication.UnicodeUTF8))
-            export_to_text_item = history_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Export as text'))
+                copy_menu = self.listMenu.addMenu(QtGui.QApplication.translate("MainWindow", 'Copy', None, QtGui.QApplication.UnicodeUTF8))
-            export_to_html_item = history_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Export as HTML'))
+                copy_name_item = copy_menu.addAction(QtGui.QApplication.translate("MainWindow", 'Name', None, QtGui.QApplication.UnicodeUTF8))
+                copy_status_item = copy_menu.addAction(QtGui.QApplication.translate("MainWindow", 'Status message', None, QtGui.QApplication.UnicodeUTF8))
+                copy_key_item = copy_menu.addAction(QtGui.QApplication.translate("MainWindow", 'Public key', None, QtGui.QApplication.UnicodeUTF8))
 
-            copy_menu = self.listMenu.addMenu(QtWidgets.QApplication.translate("MainWindow", 'Copy'))
+                auto_accept_item = self.listMenu.addAction(auto)
-            copy_name_item = copy_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Name'))
+                remove_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Remove friend', None, QtGui.QApplication.UnicodeUTF8))
-            copy_status_item = copy_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Status message'))
+                notes_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Notes', None, QtGui.QApplication.UnicodeUTF8))
-            copy_key_item = copy_menu.addAction(QtWidgets.QApplication.translate("MainWindow", 'Public key'))
 
-            auto_accept_item = self.listMenu.addAction(auto)
+                submenu = plugin_support.PluginLoader.get_instance().get_menu(self.listMenu, num)
-            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'))
-
-            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 = self.listMenu.addMenu(QtGui.QApplication.translate("MainWindow", 'Plugins', None, QtGui.QApplication.UnicodeUTF8))
                     plug.addActions(submenu)
-            set_alias_item.triggered.connect(lambda: self.set_alias(num))
+                self.connect(remove_item, QtCore.SIGNAL("triggered()"), lambda: self.remove_friend(num))
-            remove_item.triggered.connect(lambda: self.remove_friend(num))
+                self.connect(auto_accept_item, QtCore.SIGNAL("triggered()"), lambda: self.auto_accept(num, not allowed))
-            block_item.triggered.connect(lambda: self.block_friend(num))
+            else:
-            copy_key_item.triggered.connect(lambda: self.copy_friend_key(num))
+                copy_menu = self.listMenu.addMenu(
-            clear_history_item.triggered.connect(lambda: self.clear_history(num))
+                    QtGui.QApplication.translate("MainWindow", 'Copy', None, QtGui.QApplication.UnicodeUTF8))
-            auto_accept_item.triggered.connect(lambda: self.auto_accept(num, not allowed))
+                copy_name_item = copy_menu.addAction(
-            notes_item.triggered.connect(lambda: self.show_note(friend))
+                    QtGui.QApplication.translate("MainWindow", 'Name', None, QtGui.QApplication.UnicodeUTF8))
-            copy_name_item.triggered.connect(lambda: self.copy_name(friend))
+                copy_status_item = copy_menu.addAction(
-            copy_status_item.triggered.connect(lambda: self.copy_status(friend))
+                    QtGui.QApplication.translate("MainWindow", 'Topic', None, QtGui.QApplication.UnicodeUTF8))
-            export_to_text_item.triggered.connect(lambda: self.export_history(num))
+                copy_key_item = copy_menu.addAction(
-            export_to_html_item.triggered.connect(lambda: self.export_history(num, False))
+                    QtGui.QApplication.translate("MainWindow", 'Public key', None, QtGui.QApplication.UnicodeUTF8))
+                leave_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Leave group', None, QtGui.QApplication.UnicodeUTF8))
+                set_alias_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Set alias', None, QtGui.QApplication.UnicodeUTF8))
+                clear_history_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Clear history', None, QtGui.QApplication.UnicodeUTF8))
+                notes_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Notes', None, QtGui.QApplication.UnicodeUTF8))
+                self.connect(leave_item, QtCore.SIGNAL("triggered()"), lambda: Profile.get_instance().leave_group(num))
+
+            self.connect(notes_item, QtCore.SIGNAL("triggered()"), lambda: self.show_note(friend))
+            self.connect(set_alias_item, QtCore.SIGNAL("triggered()"), lambda: self.set_alias(num))
+            self.connect(clear_history_item, QtCore.SIGNAL("triggered()"), lambda: self.clear_history(num))
+            self.connect(copy_name_item, QtCore.SIGNAL("triggered()"), lambda: self.copy_name(friend))
+            self.connect(copy_status_item, QtCore.SIGNAL("triggered()"), lambda: self.copy_status(friend))
+            self.connect(copy_key_item, QtCore.SIGNAL("triggered()"), lambda: self.copy_friend_key(num))
+
             parent_position = self.friends_list.mapToGlobal(QtCore.QPoint(0, 0))
             self.listMenu.move(parent_position + pos)
             self.listMenu.show()
@@ -627,7 +613,7 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
     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 = QtGui.QApplication.translate("MainWindow", 'Notes about user', None, QtGui.QApplication.UnicodeUTF8)
         user = '{} {}'.format(user, friend.name)
 
         def save_note(text):
@@ -639,40 +625,23 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         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)
-        directory = QtWidgets.QFileDialog.getExistingDirectory(None,
-                                                           QtWidgets.QApplication.translate("MainWindow",
-                                                                                            'Choose folder'),
-                                                           curr_directory(),
-                                                           QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
-
-        if directory:
-            name = 'exported_history_{}.{}'.format(convert_time(time.time()), 'txt' if as_text else 'html')
-            with open(directory + '/' + 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)
+        self.profile.delete_friend_or_gc(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 = QtGui.QApplication.clipboard()
         clipboard.setText(tox_id)
 
     def copy_name(self, friend):
-        clipboard = QtWidgets.QApplication.clipboard()
+        clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(friend.name)
 
     def copy_status(self, friend):
-        clipboard = QtWidgets.QApplication.clipboard()
+        clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(friend.status_message)
 
     def clear_history(self, num):
@@ -703,22 +672,6 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         else:
             super(MainWindow, self).mouseReleaseEvent(event)
 
-    def show(self):
-        super().show()
-        self.profile.update()
-
     def filtering(self):
-        ind = self.online_contacts.currentIndex()
+        self.profile.filtration(self.online_contacts.currentIndex() == 1, self.contact_name.text())
-        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/mainscreen_widgets.py

@@ -1,11 +1,14 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
+try:
-from widgets import RubberBand, create_menu, QRightClickButton, CenteredWidget, LineEdit
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
+from widgets import RubberBand, create_menu, QRightClickButton, CenteredWidget
 from profile import Profile
 import smileys
 import util
 
 
-class MessageArea(QtWidgets.QPlainTextEdit):
+class MessageArea(QtGui.QPlainTextEdit):
     """User types messages here"""
 
     def __init__(self, parent, form):
@@ -17,12 +20,7 @@ class MessageArea(QtWidgets.QPlainTextEdit):
 
     def keyPressEvent(self, event):
         if event.matches(QtGui.QKeySequence.Paste):
-            mimeData = QtWidgets.QApplication.clipboard().mimeData()
+            self.pasteEvent()
-            if mimeData.hasUrls():
-                for url in mimeData.urls():
-                    self.pasteEvent(url.toString())
-            else:
-                self.pasteEvent()
         elif event.key() in (QtCore.Qt.Key_Return, QtCore.Qt.Key_Enter):
             modifiers = event.modifiers()
             if modifiers & QtCore.Qt.ControlModifier or modifiers & QtCore.Qt.ShiftModifier:
@@ -53,25 +51,21 @@ class MessageArea(QtWidgets.QPlainTextEdit):
         e.accept()
 
     def dropEvent(self, e):
-        if e.mimeData().hasFormat('text/plain') or e.mimeData().hasFormat('text/html'):
+        if e.mimeData().hasFormat('text/plain'):
             e.accept()
             self.pasteEvent(e.mimeData().text())
-        elif e.mimeData().hasUrls():
-            for url in e.mimeData().urls():
-                self.pasteEvent(url.toString())
-            e.accept()
         else:
             e.ignore()
 
     def pasteEvent(self, text=None):
-        text = text or QtWidgets.QApplication.clipboard().text()
+        text = text or QtGui.QApplication.clipboard().text()
         if text.startswith('file://'):
             self.parent.profile.send_file(text[7:])
         else:
             self.insertPlainText(text)
 
 
-class ScreenShotWindow(QtWidgets.QWidget):
+class ScreenShotWindow(QtGui.QWidget):
 
     def __init__(self, parent):
         super(ScreenShotWindow, self).__init__()
@@ -81,8 +75,6 @@ class ScreenShotWindow(QtWidgets.QWidget):
         self.showFullScreen()
         self.setWindowOpacity(0.5)
         self.rubberband = RubberBand()
-        self.rubberband.setWindowFlags(self.rubberband.windowFlags() | QtCore.Qt.FramelessWindowHint)
-        self.rubberband.setAttribute(QtCore.Qt.WA_TranslucentBackground)
 
     def closeEvent(self, *args):
         if self.parent.isHidden():
@@ -92,7 +84,7 @@ class ScreenShotWindow(QtWidgets.QWidget):
         self.origin = event.pos()
         self.rubberband.setGeometry(QtCore.QRect(self.origin, QtCore.QSize()))
         self.rubberband.show()
-        QtWidgets.QWidget.mousePressEvent(self, event)
+        QtGui.QWidget.mousePressEvent(self, event)
 
     def mouseMoveEvent(self, event):
         if self.rubberband.isVisible():
@@ -108,12 +100,11 @@ class ScreenShotWindow(QtWidgets.QWidget):
             self.rubberband.hide()
             rect = self.rubberband.geometry()
             if rect.width() and rect.height():
-                screen = QtWidgets.QApplication.primaryScreen()
+                p = QtGui.QPixmap.grabWindow(QtGui.QApplication.desktop().winId(),
-                p = screen.grabWindow(0,
+                                             rect.x() + 4,
-                                      rect.x() + 4,
+                                             rect.y() + 4,
-                                      rect.y() + 4,
+                                             rect.width() - 8,
-                                      rect.width() - 8,
+                                             rect.height() - 8)
-                                      rect.height() - 8)
                 byte_array = QtCore.QByteArray()
                 buffer = QtCore.QBuffer(byte_array)
                 buffer.open(QtCore.QIODevice.WriteOnly)
@@ -129,7 +120,7 @@ class ScreenShotWindow(QtWidgets.QWidget):
             super(ScreenShotWindow, self).keyPressEvent(event)
 
 
-class SmileyWindow(QtWidgets.QWidget):
+class SmileyWindow(QtGui.QWidget):
     """
     Smiley selection window
     """
@@ -151,7 +142,7 @@ class SmileyWindow(QtWidgets.QWidget):
         self.radio = []
         self.parent = parent
         for i in range(self.page_count):  # buttons with smileys
-            elem = QtWidgets.QRadioButton(self)
+            elem = QtGui.QRadioButton(self)
             elem.setGeometry(QtCore.QRect(i * 20 + 5, 180, 20, 20))
             elem.clicked.connect(lambda i=i: self.checked(i))
             self.radio.append(elem)
@@ -160,7 +151,7 @@ class SmileyWindow(QtWidgets.QWidget):
         self.setMinimumSize(width, 200)
         self.buttons = []
         for i in range(self.page_size):  # pages - radio buttons
-            b = QtWidgets.QPushButton(self)
+            b = QtGui.QPushButton(self)
             b.setGeometry(QtCore.QRect((i // 8) * 20 + 5, (i % 8) * 20, 20, 20))
             b.clicked.connect(lambda i=i: self.clicked(i))
             self.buttons.append(b)
@@ -190,7 +181,7 @@ class SmileyWindow(QtWidgets.QWidget):
         self.close()
 
 
-class MenuButton(QtWidgets.QPushButton):
+class MenuButton(QtGui.QPushButton):
 
     def __init__(self, parent, enter):
         super(MenuButton, self).__init__(parent)
@@ -201,7 +192,7 @@ class MenuButton(QtWidgets.QPushButton):
         super(MenuButton, self).enterEvent(event)
 
 
-class DropdownMenu(QtWidgets.QWidget):
+class DropdownMenu(QtGui.QWidget):
 
     def __init__(self, parent):
         super(DropdownMenu, self).__init__(parent)
@@ -213,20 +204,20 @@ class DropdownMenu(QtWidgets.QWidget):
         self.screenshotButton.setGeometry(QtCore.QRect(0, 60, 60, 60))
         self.screenshotButton.setObjectName("screenshotButton")
 
-        self.fileTransferButton = QtWidgets.QPushButton(self)
+        self.fileTransferButton = QtGui.QPushButton(self)
         self.fileTransferButton.setGeometry(QtCore.QRect(60, 60, 60, 60))
         self.fileTransferButton.setObjectName("fileTransferButton")
 
-        self.audioMessageButton = QtWidgets.QPushButton(self)
+        self.audioMessageButton = QtGui.QPushButton(self)
         self.audioMessageButton.setGeometry(QtCore.QRect(120, 60, 60, 60))
 
-        self.smileyButton = QtWidgets.QPushButton(self)
+        self.smileyButton = QtGui.QPushButton(self)
         self.smileyButton.setGeometry(QtCore.QRect(0, 0, 60, 60))
 
-        self.videoMessageButton = QtWidgets.QPushButton(self)
+        self.videoMessageButton = QtGui.QPushButton(self)
         self.videoMessageButton.setGeometry(QtCore.QRect(120, 0, 60, 60))
 
-        self.stickerButton = QtWidgets.QPushButton(self)
+        self.stickerButton = QtGui.QPushButton(self)
         self.stickerButton.setGeometry(QtCore.QRect(60, 0, 60, 60))
 
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/file.png')
@@ -254,16 +245,16 @@ class DropdownMenu(QtWidgets.QWidget):
         self.stickerButton.setIcon(icon)
         self.stickerButton.setIconSize(QtCore.QSize(55, 55))
 
-        self.screenshotButton.setToolTip(QtWidgets.QApplication.translate("MenuWindow", "Send screenshot"))
+        self.screenshotButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send screenshot", None, QtGui.QApplication.UnicodeUTF8))
-        self.fileTransferButton.setToolTip(QtWidgets.QApplication.translate("MenuWindow", "Send file"))
+        self.fileTransferButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send file", None, QtGui.QApplication.UnicodeUTF8))
-        self.audioMessageButton.setToolTip(QtWidgets.QApplication.translate("MenuWindow", "Send audio message"))
+        self.audioMessageButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send audio message", None, QtGui.QApplication.UnicodeUTF8))
-        self.videoMessageButton.setToolTip(QtWidgets.QApplication.translate("MenuWindow", "Send video message"))
+        self.videoMessageButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send video message", None, QtGui.QApplication.UnicodeUTF8))
-        self.smileyButton.setToolTip(QtWidgets.QApplication.translate("MenuWindow", "Add smiley"))
+        self.smileyButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Add smiley", None, QtGui.QApplication.UnicodeUTF8))
-        self.stickerButton.setToolTip(QtWidgets.QApplication.translate("MenuWindow", "Send sticker"))
+        self.stickerButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send sticker", None, QtGui.QApplication.UnicodeUTF8))
 
         self.fileTransferButton.clicked.connect(parent.send_file)
         self.screenshotButton.clicked.connect(parent.send_screenshot)
-        self.screenshotButton.rightClicked.connect(lambda: parent.send_screenshot(True))
+        self.connect(self.screenshotButton, QtCore.SIGNAL("rightClicked()"), lambda: parent.send_screenshot(True))
         self.smileyButton.clicked.connect(parent.send_smiley)
         self.stickerButton.clicked.connect(parent.send_sticker)
 
@@ -276,11 +267,11 @@ class DropdownMenu(QtWidgets.QWidget):
         return False
 
 
-class StickerItem(QtWidgets.QWidget):
+class StickerItem(QtGui.QWidget):
 
     def __init__(self, fl):
         super(StickerItem, self).__init__()
-        self._image_label = QtWidgets.QLabel(self)
+        self._image_label = QtGui.QLabel(self)
         self.path = fl
         self.pixmap = QtGui.QPixmap()
         self.pixmap.load(fl)
@@ -290,7 +281,7 @@ class StickerItem(QtWidgets.QWidget):
         self._image_label.setPixmap(self.pixmap)
 
 
-class StickerWindow(QtWidgets.QWidget):
+class StickerWindow(QtGui.QWidget):
     """Sticker selection window"""
 
     def __init__(self, parent):
@@ -298,16 +289,16 @@ class StickerWindow(QtWidgets.QWidget):
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
         self.setMaximumSize(250, 200)
         self.setMinimumSize(250, 200)
-        self.list = QtWidgets.QListWidget(self)
+        self.list = QtGui.QListWidget(self)
         self.list.setGeometry(QtCore.QRect(0, 0, 250, 200))
         self.arr = smileys.sticker_loader()
         for sticker in self.arr:
             item = StickerItem(sticker)
-            elem = QtWidgets.QListWidgetItem()
+            elem = QtGui.QListWidgetItem()
             elem.setSizeHint(QtCore.QSize(250, item.height()))
             self.list.addItem(elem)
             self.list.setItemWidget(elem, item)
-        self.list.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+        self.list.setVerticalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
         self.list.setSpacing(3)
         self.list.clicked.connect(self.click)
         self.parent = parent
@@ -329,44 +320,52 @@ class WelcomeScreen(CenteredWidget):
         self.setMinimumSize(250, 200)
         self.center()
         self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
-        self.text = QtWidgets.QTextBrowser(self)
+        self.text = QtGui.QTextBrowser(self)
         self.text.setGeometry(QtCore.QRect(0, 0, 250, 170))
         self.text.setOpenExternalLinks(True)
-        self.checkbox = QtWidgets.QCheckBox(self)
+        self.checkbox = QtGui.QCheckBox(self)
         self.checkbox.setGeometry(QtCore.QRect(5, 170, 240, 30))
-        self.checkbox.setText(QtWidgets.QApplication.translate('WelcomeScreen', "Don't show again"))
+        self.checkbox.setText(QtGui.QApplication.translate('WelcomeScreen', "Don't show again",
-        self.setWindowTitle(QtWidgets.QApplication.translate('WelcomeScreen', 'Tip of the day'))
+                                                           None, QtGui.QApplication.UnicodeUTF8))
+        self.setWindowTitle(QtGui.QApplication.translate('WelcomeScreen', 'Tip of the day',
+                                                         None, QtGui.QApplication.UnicodeUTF8))
         import random
-        num = random.randint(0, 10)
+        num = random.randint(0, 8)
         if num == 0:
-            text = QtWidgets.QApplication.translate('WelcomeScreen', 'Press Esc if you want hide app to tray.')
+            text = QtGui.QApplication.translate('WelcomeScreen', 'Press Esc if you want hide app to tray.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
         elif num == 1:
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+            text = QtGui.QApplication.translate('WelcomeScreen',
-                                                'Right click on screenshot button hides app to tray during screenshot.')
+                                                'Right click on screenshot button hides app to tray during screenshot.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
         elif num == 2:
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+            text = QtGui.QApplication.translate('WelcomeScreen',
-                                                'You can use Tox over Tor. For more info read <a href="https://wiki.tox.chat/users/tox_over_tor_tot">this post</a>')
+                                                'You can use Tox over Tor. For more info read <a href="https://wiki.tox.chat/users/tox_over_tor_tot">this post</a>',
+                                                None, QtGui.QApplication.UnicodeUTF8)
         elif num == 3:
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+            text = QtGui.QApplication.translate('WelcomeScreen',
-                                                'Use Settings -> Interface to customize interface.')
+                                                'Use Settings -> Interface to customize interface.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
         elif num == 4:
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+            text = QtGui.QApplication.translate('WelcomeScreen',
-                                                'Set profile password via Profile -> Settings. Password allows Toxygen encrypt your history and settings.')
+                                                'Set profile password via Profile -> Settings. Password allows Toxygen encrypt your history and settings.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
         elif num == 5:
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+            text = QtGui.QApplication.translate('WelcomeScreen',
-                                                'Since v0.1.3 Toxygen supports plugins. <a href="https://github.com/xveduk/toxygen/blob/master/docs/plugins.md">Read more</a>')
+                                                'Since v0.1.3 Toxygen supports plugins. <a href="https://github.com/xveduk/toxygen/blob/master/docs/plugins.md">Read more</a>',
-        elif num in (6, 7):
+                                                None, QtGui.QApplication.UnicodeUTF8)
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+        elif num == 6:
-                                                'Toxygen supports faux offline messages and file transfers. Send message or file to offline friend and he will get it later.')
+            text = QtGui.QApplication.translate('WelcomeScreen',
-        elif num == 8:
+                                                'New in Toxygen v0.2.2:<br>Users can lock application using profile password.<br>Compact contact list support<br>Bug fixes<br>Tox DNS improvements',
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+                                                None, QtGui.QApplication.UnicodeUTF8)
-                                                'Delete single message in chat: make right click on spinner or message time and choose "Delete" in menu')
+        elif num == 7:
-        elif num == 9:
+            text = QtGui.QApplication.translate('WelcomeScreen',
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+                                                'Toxygen supports faux offline messages and file transfers. Send message or file to offline friend and he will get it later.',
-                                                'Use right click on inline image to save it')
+                                                None, QtGui.QApplication.UnicodeUTF8)
         else:
-            text = QtWidgets.QApplication.translate('WelcomeScreen',
+            text = QtGui.QApplication.translate('WelcomeScreen',
-                                                'Set new NoSpam to avoid spam friend requests: Profile -> Settings -> Set new NoSpam.')
+                                                'Set new NoSpam to avoid spam friend requests: Profile -> Settings -> Set new NoSpam.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
         self.text.setHtml(text)
         self.checkbox.stateChanged.connect(self.not_show)
         QtCore.QTimer.singleShot(1000, self.show)
@@ -377,138 +376,3 @@ class WelcomeScreen(CenteredWidget):
         s['show_welcome_screen'] = False
         s.save()
 
-
-class MainMenuButton(QtWidgets.QPushButton):
-
-    def __init__(self, *args):
-        super().__init__(*args)
-        self.setObjectName("mainmenubutton")
-
-    def setText(self, text):
-        metrics = QtGui.QFontMetrics(self.font())
-        self.setFixedWidth(metrics.size(QtCore.Qt.TextSingleLine, text).width() + 20)
-        super().setText(text)
-
-
-class ClickableLabel(QtWidgets.QLabel):
-
-    clicked = QtCore.pyqtSignal()
-
-    def __init__(self, *args):
-        super().__init__(*args)
-
-    def mouseReleaseEvent(self, ev):
-        self.clicked.emit()
-
-
-class SearchScreen(QtWidgets.QWidget):
-
-    def __init__(self, messages, width, *args):
-        super().__init__(*args)
-        self.setMaximumSize(width, 40)
-        self.setMinimumSize(width, 40)
-        self._messages = messages
-
-        self.search_text = LineEdit(self)
-        self.search_text.setGeometry(0, 0, width - 160, 40)
-
-        self.search_button = ClickableLabel(self)
-        self.search_button.setGeometry(width - 160, 0, 40, 40)
-        pixmap = QtGui.QPixmap()
-        pixmap.load(util.curr_directory() + '/images/search.png')
-        self.search_button.setScaledContents(False)
-        self.search_button.setAlignment(QtCore.Qt.AlignCenter)
-        self.search_button.setPixmap(pixmap)
-        self.search_button.clicked.connect(self.search)
-
-        font = QtGui.QFont()
-        font.setPointSize(32)
-        font.setBold(True)
-
-        self.prev_button = QtWidgets.QPushButton(self)
-        self.prev_button.setGeometry(width - 120, 0, 40, 40)
-        self.prev_button.clicked.connect(self.prev)
-        self.prev_button.setText('\u25B2')
-
-        self.next_button = QtWidgets.QPushButton(self)
-        self.next_button.setGeometry(width - 80, 0, 40, 40)
-        self.next_button.clicked.connect(self.next)
-        self.next_button.setText('\u25BC')
-
-        self.close_button = QtWidgets.QPushButton(self)
-        self.close_button.setGeometry(width - 40, 0, 40, 40)
-        self.close_button.clicked.connect(self.close)
-        self.close_button.setText('×')
-        self.close_button.setFont(font)
-
-        font.setPointSize(18)
-        self.next_button.setFont(font)
-        self.prev_button.setFont(font)
-
-        self.retranslateUi()
-
-    def retranslateUi(self):
-        self.search_text.setPlaceholderText(QtWidgets.QApplication.translate("MainWindow", "Search"))
-
-    def show(self):
-        super().show()
-        self.search_text.setFocus()
-
-    def search(self):
-        Profile.get_instance().update()
-        text = self.search_text.text()
-        friend = Profile.get_instance().get_curr_friend()
-        if text and friend and util.is_re_valid(text):
-            index = friend.search_string(text)
-            self.load_messages(index)
-
-    def prev(self):
-        friend = Profile.get_instance().get_curr_friend()
-        if friend is not None:
-            index = friend.search_prev()
-            self.load_messages(index)
-
-    def next(self):
-        friend = Profile.get_instance().get_curr_friend()
-        text = self.search_text.text()
-        if friend is not None:
-            index = friend.search_next()
-            if index is not None:
-                count = self._messages.count()
-                index += count
-                item = self._messages.item(index)
-                self._messages.scrollToItem(item)
-                self._messages.itemWidget(item).select_text(text)
-            else:
-                self.not_found(text)
-
-    def load_messages(self, index):
-        text = self.search_text.text()
-        if index is not None:
-            profile = Profile.get_instance()
-            count = self._messages.count()
-            while count + index < 0:
-                profile.load_history()
-                count = self._messages.count()
-            index += count
-            item = self._messages.item(index)
-            self._messages.scrollToItem(item)
-            self._messages.itemWidget(item).select_text(text)
-        else:
-            self.not_found(text)
-
-    def closeEvent(self, *args):
-        Profile.get_instance().update()
-        self._messages.setGeometry(0, 0, self._messages.width(), self._messages.height() + 40)
-        super().closeEvent(*args)
-
-    @staticmethod
-    def not_found(text):
-        mbox = QtWidgets.QMessageBox()
-        mbox_text = QtWidgets.QApplication.translate("MainWindow",
-                                                     'Text "{}" was not found')
-
-        mbox.setText(mbox_text.format(text))
-        mbox.setWindowTitle(QtWidgets.QApplication.translate("MainWindow",
-                                                             'Not found'))
-        mbox.exec_()

toxygen/messages.py

@@ -39,6 +39,18 @@ class TextMessage(Message):
         return self._message, self._owner, self._time, self._type
 
 
+class GroupChatTextMessage(TextMessage):
+
+    def __init__(self, friend_name, *args):
+        super().__init__(*args)
+        self._name = friend_name
+
+    def get_data(self):
+        data = list(super().get_data())
+        data.append(self._name)
+        return tuple(data)
+
+
 class TransferMessage(Message):
     """
     Message with info about file transfer
@@ -71,6 +83,7 @@ class TransferMessage(Message):
 
 
 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

toxygen/notifications.py

@@ -1,4 +1,7 @@
-from PyQt5 import QtCore, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 from util import curr_directory
 import wave
 import pyaudio
@@ -20,16 +23,16 @@ def tray_notification(title, text, tray, window):
     :param tray: ref to tray icon
     :param window: main window
     """
-    if QtWidgets.QSystemTrayIcon.isSystemTrayAvailable():
+    if QtGui.QSystemTrayIcon.isSystemTrayAvailable():
         if len(text) > 30:
             text = text[:27] + '...'
-        tray.showMessage(title, text, QtWidgets.QSystemTrayIcon.NoIcon, 3000)
+        tray.showMessage(title, text, QtGui.QSystemTrayIcon.NoIcon, 3000)
-        QtWidgets.QApplication.alert(window, 0)
+        QtGui.QApplication.alert(window, 0)
 
         def message_clicked():
             window.setWindowState(window.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
             window.activateWindow()
-        tray.messageClicked.connect(message_clicked)
+        tray.connect(tray, QtCore.SIGNAL("messageClicked()"), message_clicked)
 
 
 class AudioFile:
@@ -42,7 +45,8 @@ class AudioFile:
             format=self.p.get_format_from_width(self.wf.getsampwidth()),
             channels=self.wf.getnchannels(),
             rate=self.wf.getframerate(),
-            output=True)
+            output=True
+        )
 
     def play(self):
         data = self.wf.readframes(self.chunk)

toxygen/passwordscreen.py

@@ -1,5 +1,8 @@
 from widgets import CenteredWidget, LineEdit
-from PyQt5 import QtCore, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 
 
 class PasswordArea(LineEdit):
@@ -7,7 +10,7 @@ class PasswordArea(LineEdit):
     def __init__(self, parent):
         super(PasswordArea, self).__init__(parent)
         self.parent = parent
-        self.setEchoMode(QtWidgets.QLineEdit.Password)
+        self.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
 
     def keyPressEvent(self, event):
         if event.key() == QtCore.Qt.Key_Return:
@@ -28,18 +31,18 @@ class PasswordScreenBase(CenteredWidget):
         self.setMinimumSize(QtCore.QSize(360, 170))
         self.setMaximumSize(QtCore.QSize(360, 170))
 
-        self.enter_pass = QtWidgets.QLabel(self)
+        self.enter_pass = QtGui.QLabel(self)
         self.enter_pass.setGeometry(QtCore.QRect(30, 10, 300, 30))
 
         self.password = PasswordArea(self)
         self.password.setGeometry(QtCore.QRect(30, 50, 300, 30))
 
-        self.button = QtWidgets.QPushButton(self)
+        self.button = QtGui.QPushButton(self)
         self.button.setGeometry(QtCore.QRect(30, 90, 300, 30))
         self.button.setText('OK')
         self.button.clicked.connect(self.button_click)
 
-        self.warning = QtWidgets.QLabel(self)
+        self.warning = QtGui.QLabel(self)
         self.warning.setGeometry(QtCore.QRect(30, 130, 300, 30))
         self.warning.setStyleSheet('QLabel { color: #F70D1A; }')
         self.warning.setVisible(False)
@@ -58,9 +61,9 @@ class PasswordScreenBase(CenteredWidget):
             super(PasswordScreenBase, self).keyPressEvent(event)
 
     def retranslateUi(self):
-        self.setWindowTitle(QtWidgets.QApplication.translate("pass", "Enter password"))
+        self.setWindowTitle(QtGui.QApplication.translate("pass", "Enter password", None, QtGui.QApplication.UnicodeUTF8))
-        self.enter_pass.setText(QtWidgets.QApplication.translate("pass", "Password:"))
+        self.enter_pass.setText(QtGui.QApplication.translate("pass", "Password:", None, QtGui.QApplication.UnicodeUTF8))
-        self.warning.setText(QtWidgets.QApplication.translate("pass", "Incorrect password"))
+        self.warning.setText(QtGui.QApplication.translate("pass", "Incorrect password", None, QtGui.QApplication.UnicodeUTF8))
 
 
 class PasswordScreen(PasswordScreenBase):
@@ -113,32 +116,37 @@ class SetProfilePasswordScreen(CenteredWidget):
         self.setMaximumSize(QtCore.QSize(700, 200))
         self.password = LineEdit(self)
         self.password.setGeometry(QtCore.QRect(40, 10, 300, 30))
-        self.password.setEchoMode(QtWidgets.QLineEdit.Password)
+        self.password.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
         self.confirm_password = LineEdit(self)
         self.confirm_password.setGeometry(QtCore.QRect(40, 50, 300, 30))
-        self.confirm_password.setEchoMode(QtWidgets.QLineEdit.Password)
+        self.confirm_password.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
-        self.set_password = QtWidgets.QPushButton(self)
+        self.set_password = QtGui.QPushButton(self)
         self.set_password.setGeometry(QtCore.QRect(40, 100, 300, 30))
         self.set_password.clicked.connect(self.new_password)
-        self.not_match = QtWidgets.QLabel(self)
+        self.not_match = QtGui.QLabel(self)
         self.not_match.setGeometry(QtCore.QRect(350, 50, 300, 30))
         self.not_match.setVisible(False)
         self.not_match.setStyleSheet('QLabel { color: #BC1C1C; }')
-        self.warning = QtWidgets.QLabel(self)
+        self.warning = QtGui.QLabel(self)
         self.warning.setGeometry(QtCore.QRect(40, 160, 500, 30))
         self.warning.setStyleSheet('QLabel { color: #BC1C1C; }')
 
     def retranslateUi(self):
-        self.setWindowTitle(QtWidgets.QApplication.translate("PasswordScreen", "Profile password"))
+        self.setWindowTitle(QtGui.QApplication.translate("PasswordScreen", "Profile password", None,
+                                                              QtGui.QApplication.UnicodeUTF8))
         self.password.setPlaceholderText(
-            QtWidgets.QApplication.translate("PasswordScreen", "Password (at least 8 symbols)"))
+            QtGui.QApplication.translate("PasswordScreen", "Password (at least 8 symbols)", None,
+                                         QtGui.QApplication.UnicodeUTF8))
         self.confirm_password.setPlaceholderText(
-            QtWidgets.QApplication.translate("PasswordScreen", "Confirm password"))
+            QtGui.QApplication.translate("PasswordScreen", "Confirm password", None,
+                                         QtGui.QApplication.UnicodeUTF8))
         self.set_password.setText(
-            QtWidgets.QApplication.translate("PasswordScreen", "Set password"))
+            QtGui.QApplication.translate("PasswordScreen", "Set password", None, QtGui.QApplication.UnicodeUTF8))
-        self.not_match.setText(QtWidgets.QApplication.translate("PasswordScreen", "Passwords do not match"))
+        self.not_match.setText(QtGui.QApplication.translate("PasswordScreen", "Passwords do not match", None,
+                                                            QtGui.QApplication.UnicodeUTF8))
         self.warning.setText(
-            QtWidgets.QApplication.translate("PasswordScreen", "There is no way to recover lost passwords"))
+            QtGui.QApplication.translate("PasswordScreen", "There is no way to recover lost passwords", None,
+                                         QtGui.QApplication.UnicodeUTF8))
 
     def new_password(self):
         if self.password.text() == self.confirm_password.text():
@@ -147,8 +155,10 @@ class SetProfilePasswordScreen(CenteredWidget):
                 self.close()
             else:
                 self.not_match.setText(
-                    QtWidgets.QApplication.translate("PasswordScreen", "Password must be at least 8 symbols"))
+                    QtGui.QApplication.translate("PasswordScreen", "Password must be at least 8 symbols", None,
+                                                 QtGui.QApplication.UnicodeUTF8))
             self.not_match.setVisible(True)
         else:
-            self.not_match.setText(QtWidgets.QApplication.translate("PasswordScreen", "Passwords do not match"))
+            self.not_match.setText(QtGui.QApplication.translate("PasswordScreen", "Passwords do not match", None,
+                                                                QtGui.QApplication.UnicodeUTF8))
             self.not_match.setVisible(True)

toxygen/plugin_support.py

@@ -4,7 +4,7 @@ import os
 import importlib
 import inspect
 import plugins.plugin_super_class as pl
-import toxes
+import toxencryptsave
 import sys
 
 
@@ -16,7 +16,7 @@ class PluginLoader(util.Singleton):
         self._settings = settings
         self._plugins = {}  # dict. key - plugin unique short name, value - tuple (plugin instance, is active)
         self._tox = tox
-        self._encr = toxes.ToxES.get_instance()
+        self._encr = toxencryptsave.ToxEncryptSave.get_instance()
 
     def set_tox(self, tox):
         """
@@ -51,8 +51,7 @@ class PluginLoader(util.Singleton):
                 continue
             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:  # looking for plugin class in module
-                if inspect.isclass(obj) and hasattr(obj, 'is_plugin') and obj.is_plugin:
                     print('Plugin', elem)
                     try:  # create instance of plugin class
                         inst = obj(self._tox, self._profile, self._settings, self._encr)
@@ -65,23 +64,23 @@ class PluginLoader(util.Singleton):
                     self._plugins[inst.get_short_name()] = [inst, autostart]  # (inst, is active)
                     break
 
-    def callback_lossless(self, friend_number, data):
+    def callback_lossless(self, friend_number, data, length):
         """
         New incoming custom lossless packet (callback)
         """
         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]:
-            self._plugins[name][0].lossless_packet(''.join(chr(x) for x in data[l + 1:]), friend_number)
+            self._plugins[name][0].lossless_packet(''.join(chr(x) for x in data[l + 1:length]), friend_number)
 
-    def callback_lossy(self, friend_number, data):
+    def callback_lossy(self, friend_number, data, length):
         """
         New incoming custom lossy packet (callback)
         """
         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]:
-            self._plugins[name][0].lossy_packet(''.join(chr(x) for x in data[l + 1:]), friend_number)
+            self._plugins[name][0].lossy_packet(''.join(chr(x) for x in data[l + 1:length]), friend_number)
 
     def friend_online(self, friend_number):
         """
@@ -148,16 +147,6 @@ class PluginLoader(util.Singleton):
                     continue
         return result
 
-    def get_message_menu(self, menu, selected_text):
-        result = []
-        for elem in self._plugins.values():
-            if elem[1]:
-                try:
-                    result.extend(elem[0].get_message_menu(menu, selected_text))
-                except:
-                    continue
-        return result
-
     def stop(self):
         """
         App is closing, stop all plugins
@@ -166,8 +155,3 @@ class PluginLoader(util.Singleton):
             if self._plugins[key][1]:
                 self._plugins[key][0].close()
             del self._plugins[key]
-
-    def reload(self):
-        print('Reloading plugins')
-        self.stop()
-        self.load()

toxygen/plugins/plugin_super_class.py

@@ -1,5 +1,8 @@
 import os
-from PyQt5 import QtCore, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 
 
 MAX_SHORT_NAME_LENGTH = 5
@@ -23,12 +26,12 @@ def log(name, data):
     :param data: data for saving in log
     """
     with open(path_to_data(name) + 'logs.txt', 'a') as fl:
-        fl.write(str(data) + '\n')
+        fl.write(bytes(data, 'utf-8') + b'\n')
 
 
 class PluginSuperClass:
     """
-    Superclass for all plugins. Plugin is Python3 module with at least one class derived from PluginSuperClass.
+    Superclass for all plugins. Plugin is python module with at least one class derived from PluginSuperClass.
     """
     is_plugin = True
 
@@ -40,7 +43,7 @@ class PluginSuperClass:
         :param tox: tox instance
         :param profile: profile instance
         :param settings: profile settings
-        :param encrypt_save: ToxES instance.
+        :param encrypt_save: LibToxEncryptSave instance.
         """
         self._settings = settings
         self._profile = profile
@@ -85,15 +88,6 @@ class PluginSuperClass:
         """
         return []
 
-    def get_message_menu(self, menu, text):
-        """
-        This method creates items for menu which called on right click in message
-        :param menu: menu instance
-        :param text: selected text
-        :return list of QAction's
-        """
-        return []
-
     def get_window(self):
         """
         This method should return window for plugins with GUI or None
@@ -126,7 +120,7 @@ class PluginSuperClass:
         """
         App is closing
         """
-        self.stop()
+        pass
 
     def command(self, command):
         """
@@ -134,10 +128,10 @@ class PluginSuperClass:
         :param command: string with command
         """
         if command == 'help':
-            msgbox = QtWidgets.QMessageBox()
+            msgbox = QtGui.QMessageBox()
-            title = QtWidgets.QApplication.translate("PluginWindow", "List of commands for plugin {}")
+            title = QtGui.QApplication.translate("PluginWindow", "List of commands for plugin {}", None, QtGui.QApplication.UnicodeUTF8)
             msgbox.setWindowTitle(title.format(self._name))
-            msgbox.setText(QtWidgets.QApplication.translate("PluginWindow", "No commands available"))
+            msgbox.setText(QtGui.QApplication.translate("PluginWindow", "No commands available", None, QtGui.QApplication.UnicodeUTF8))
             msgbox.exec_()
 
     # -----------------------------------------------------------------------------------------------------------------
@@ -148,7 +142,7 @@ class PluginSuperClass:
         """
         This method loads translations for GUI
         """
-        app = QtWidgets.QApplication.instance()
+        app = QtGui.QApplication.instance()
         langs = self._settings.supported_languages()
         curr_lang = self._settings['language']
         if curr_lang in langs:
@@ -166,7 +160,6 @@ class PluginSuperClass:
     def load_settings(self):
         """
         This method loads settings of plugin and returns raw data
-        If file doesn't exist this method raises exception
         """
         with open(path_to_data(self._short_name) + 'settings.json', 'rb') as fl:
             data = fl.read()

toxygen/settings.py

@@ -1,9 +1,10 @@
 from platform import system
 import json
 import os
-from util import Singleton, curr_directory, log, copy, append_slash
+import locale
+from util import Singleton, curr_directory, log
 import pyaudio
-from toxes import ToxES
+from toxencryptsave import ToxEncryptSave
 import smileys
 
 
@@ -19,7 +20,7 @@ class Settings(dict, Singleton):
         if os.path.isfile(self.path):
             with open(self.path, 'rb') as fl:
                 data = fl.read()
-            inst = ToxES.get_instance()
+            inst = ToxEncryptSave.get_instance()
             try:
                 if inst.is_data_encrypted(data):
                     data = inst.pass_decrypt(data)
@@ -33,26 +34,16 @@ class Settings(dict, Singleton):
             super(Settings, self).__init__(Settings.get_default_settings())
             self.save()
         smileys.SmileyLoader(self)
-        self.locked = False
-        self.closing = False
-        self.unlockScreen = False
         p = pyaudio.PyAudio()
-        input_devices = output_devices = 0
+        self.locked = False
-        for i in range(p.get_device_count()):
+        self.audio = {'input': p.get_default_input_device_info()['index'],
-            device = p.get_device_info_by_index(i)
+                      'output': p.get_default_output_device_info()['index']}
-            if device["maxInputChannels"]:
-                input_devices += 1
-            if device["maxOutputChannels"]:
-                output_devices += 1
-        self.audio = {'input': p.get_default_input_device_info()['index'] if input_devices else -1,
-                      'output': p.get_default_output_device_info()['index'] if output_devices else -1,
-                      'enabled': input_devices and output_devices}
 
     @staticmethod
     def get_auto_profile():
-        p = Settings.get_global_settings_path()
+        path = Settings.get_default_path() + 'toxygen.json'
-        if os.path.isfile(p):
+        if os.path.isfile(path):
-            with open(p) as fl:
+            with open(path) as fl:
                 data = fl.read()
             auto = json.loads(data)
             if 'path' in auto and 'name' in auto:
@@ -61,13 +52,10 @@ class Settings(dict, Singleton):
 
     @staticmethod
     def set_auto_profile(path, name):
-        p = Settings.get_global_settings_path()
+        p = Settings.get_default_path() + 'toxygen.json'
-        if os.path.isfile(p):
+        with open(p) as fl:
-            with open(p) as fl:
+            data = fl.read()
-                data = fl.read()
+        data = json.loads(data)
-            data = json.loads(data)
-        else:
-            data = {}
         data['path'] = str(path)
         data['name'] = str(name)
         with open(p, 'w') as fl:
@@ -75,13 +63,10 @@ class Settings(dict, Singleton):
 
     @staticmethod
     def reset_auto_profile():
-        p = Settings.get_global_settings_path()
+        p = Settings.get_default_path() + 'toxygen.json'
-        if os.path.isfile(p):
+        with open(p) as fl:
-            with open(p) as fl:
+            data = fl.read()
-                data = fl.read()
+        data = json.loads(data)
-            data = json.loads(data)
-        else:
-            data = {}
         if 'path' in data:
             del data['path']
             del data['name']
@@ -90,8 +75,15 @@ class Settings(dict, Singleton):
 
     @staticmethod
     def is_active_profile(path, name):
-        path = path + name + '.lock'
+        path = path + name + '.tox'
-        return os.path.isfile(path)
+        settings = Settings.get_default_path() + 'toxygen.json'
+        if os.path.isfile(settings):
+            with open(settings) as fl:
+                data = fl.read()
+            data = json.loads(data)
+            if 'active_profile' in data:
+                return path in data['active_profile']
+        return False
 
     @staticmethod
     def get_default_settings():
@@ -115,12 +107,9 @@ class Settings(dict, Singleton):
             'allow_inline': True,
             'allow_auto_accept': True,
             'auto_accept_path': None,
-            'sorting': 0,
+            'show_online_friends': False,
             'auto_accept_from_friends': [],
-            'paused_file_transfers': {},
-            'resend_files': True,
             'friends_aliases': [],
-            'show_avatars': False,
             'typing_notifications': False,
             'calls_sound': True,
             'blocked': [],
@@ -138,9 +127,7 @@ class Settings(dict, Singleton):
             'save_unsent_only': False,
             'compact_mode': False,
             'show_welcome_screen': True,
-            'close_to_tray': False,
+            'notify_all_gc': False
-            'font': 'Times New Roman',
-            'update': 1
         }
 
     @staticmethod
@@ -161,7 +148,7 @@ class Settings(dict, Singleton):
 
     def save(self):
         text = json.dumps(self)
-        inst = ToxES.get_instance()
+        inst = ToxEncryptSave.get_instance()
         if inst.has_password():
             text = bytes(inst.pass_encrypt(bytes(text, 'utf-8')))
         else:
@@ -170,40 +157,49 @@ class Settings(dict, Singleton):
             fl.write(text)
 
     def close(self):
-        profile_path = ProfileHelper.get_path()
+        path = Settings.get_default_path() + 'toxygen.json'
-        path = str(profile_path + str(self.name) + '.lock')
         if os.path.isfile(path):
-            os.remove(path)
+            with open(path) as fl:
+                data = fl.read()
+            app_settings = json.loads(data)
+            try:
+                app_settings['active_profile'].remove(str(ProfileHelper.get_path() + self.name + '.tox'))
+            except:
+                pass
+            data = json.dumps(app_settings)
+            with open(path, 'w') as fl:
+                fl.write(data)
 
     def set_active_profile(self):
         """
         Mark current profile as active
         """
-        profile_path = ProfileHelper.get_path()
+        path = Settings.get_default_path() + 'toxygen.json'
-        path = str(profile_path + str(self.name) + '.lock')
+        if os.path.isfile(path):
+            with open(path) as fl:
+                data = fl.read()
+            app_settings = json.loads(data)
+        else:
+            app_settings = {}
+        if 'active_profile' not in app_settings:
+            app_settings['active_profile'] = []
+        profilepath = ProfileHelper.get_path()
+        app_settings['active_profile'].append(str(profilepath + str(self.name) + '.tox'))
+        data = json.dumps(app_settings)
         with open(path, 'w') as fl:
-            fl.write('active')
+            fl.write(data)
 
     def export(self, path):
         text = json.dumps(self)
         with open(path + str(self.name) + '.json', 'w') as fl:
             fl.write(text)
 
-    def update_path(self):
-        self.path = ProfileHelper.get_path() + self.name + '.json'
-
-    @staticmethod
-    def get_global_settings_path():
-        return curr_directory() + '/toxygen.json'
-
     @staticmethod
     def get_default_path():
-        if system() == 'Windows':
+        if system() == 'Linux':
-            return os.getenv('APPDATA') + '/Tox/'
-        elif system() == 'Darwin':
-            return os.getenv('HOME') + '/Library/Application Support/Tox/'
-        else:
             return os.getenv('HOME') + '/.config/tox/'
+        elif system() == 'Windows':
+            return os.getenv('APPDATA') + '/Tox/'
 
 
 class ProfileHelper(Singleton):
@@ -212,7 +208,6 @@ class ProfileHelper(Singleton):
     """
     def __init__(self, path, name):
         Singleton.__init__(self)
-        path = append_slash(path)
         self._path = path + name + '.tox'
         self._directory = path
         # create /avatars if not exists:
@@ -232,25 +227,20 @@ class ProfileHelper(Singleton):
         return self._directory
 
     def save_profile(self, data):
-        inst = ToxES.get_instance()
+        inst = ToxEncryptSave.get_instance()
         if inst.has_password():
             data = inst.pass_encrypt(data)
         with open(self._path, 'wb') as fl:
             fl.write(data)
         print('Profile saved successfully')
 
-    def export_profile(self, new_path, use_new_path):
+    def export_profile(self, new_path):
-        path = new_path + os.path.basename(self._path)
+        new_path += os.path.basename(self._path)
         with open(self._path, 'rb') as fin:
             data = fin.read()
-        with open(path, 'wb') as fout:
+        with open(new_path, 'wb') as fout:
             fout.write(data)
         print('Profile exported successfully')
-        copy(self._directory + 'avatars', new_path + 'avatars')
-        if use_new_path:
-            self._path = new_path + os.path.basename(self._path)
-            self._directory = new_path
-            Settings.get_instance().update_path()
 
     @staticmethod
     def find_profiles():

toxygen/smileys.py

@@ -2,7 +2,10 @@ import util
 import json
 import os
 from collections import OrderedDict
-from PyQt5 import QtCore
+try:
+    from PySide import QtCore
+except ImportError:
+    from PyQt4 import QtCore
 
 
 class SmileyLoader(util.Singleton):
@@ -45,7 +48,7 @@ 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.curr_directory() + '/smileys/' + self._curr_pack + '/'
 
     def get_packs_list(self):
         d = util.curr_directory() + '/smileys/'

toxygen/smileys/ksk/config.json

@@ -1 +0,0 @@
-{"BD": "cool2.png", "v_v": "calm.png", ":/": "getlost.png", ":(": "sad.png", ":)": "smile.png", ":*": "kiss.png", ":animal:": "pawn.png", "=|": "none.png", "=*": "kiss.png", ":heart:": "heart.png", "B]": "cool.png", "=o": "shocked.png", ":0": "shocked.png", "=S": "none2.png", "=]": "smile2.png", "=\\": "getlost.png", "B-)": "cool.png", ":pawn:": "pawn.png", "=O": "shocked.png", ">:\\": "angry2.png", ":redstar:": "redstar.png", ":o": "shocked.png", "=0": "shocked.png", "B-D": "cool2.png", ":|": "none.png", ":''(": "cry.png", "=/": "getlost.png", "=)": "smile.png", "=(": "sad.png", "B-]": "cool.png", ":O": "shocked.png", ":D": "grin.png", "B)": "cool.png", ":'(": "cry.png", ":]": "smile2.png", ":music:": "notes.png", ":P": "tongue.png", ":S": "none2.png", ":evil:": "evil.png", ":-O": "shocked.png", ":zzzzz:": "zzz.png", ">:[]": "angry.png", ";|": "none.png", ":-\\": "getlost.png", ":-]": "smile2.png", ":-S": "none2.png", ":-P": "tongue.png", ";o": "shocked.png", ";S": "none2.png", ":\\": "getlost.png", ";P": "tongue.png", ":pet:": "pawn.png", ":-o": "shocked.png", ";]": "blink.png", ";\\": "getlost.png", ":oops:": "oops.png", ":-|": "none.png", ";D": "grin.png", ";O": "shocked.png", "@->-": "flower.png", ";0": "shocked.png", ":zzz:": "zzz.png", ":cool2:": "cool2.png", "^_^": "pleased.png", ":)))": "grin.png", ";)": "blink.png", ";/": "getlost.png", ":-*": "kiss.png", ":-(": "sad.png", ":-)": "smile.png", "8-[]": "scared.png", ":cool:": "cool.png", ":kiss:": "kiss.png", ":notes:": "notes.png", ":calm:": "calm.png", ":-0": "shocked.png", ":greenstar:": "greenstar.png", ">:][": "angry.png", ">:]]": "evil2.png", "B))": "cool2.png", ">:)": "evil.png", ">:(": "angry3.png", ">:/": "angry2.png", ":lol:": "lol.png", ":scared:": "scared.png", ">:>": "evil.png", ">:<": "angry3.png", ">:D": "evil2.png", "B]]": "cool2.png", ">:((": "angry3.png", ">:[": "angry3.png", ":sick:": "unwell.png", ":-/": "getlost.png", ":cry:": "cry.png", "<3": "heart.png", ":leaf:": "leaf.png", ">:))": "evil2.png", ":bluestar:": "bluestar.png", ";-0": "shocked.png", ":weed:": "leaf.png", ":zzzz:": "zzz.png", ":sing:": "notes.png", ":yellowstar:": "yellowstar.png", ";-/": "getlost.png", ";-)": "blink.png", ":dead:": "dead.png", ";-S": "none2.png", "^^": "pleased.png", ";-P": "tongue.png", ";-]": "blink.png", ";-\\": "getlost.png", ":flower:": "flower.png", ":puke:": "unwell.png", ";-O": "shocked.png", ":love:": "heart.png", ";-o": "shocked.png", ":))))": "grin.png", ":))": "grin.png"}

toxygen/styles/style.qss

@@ -1070,6 +1070,12 @@ QToolButton::menu-arrow:open {
     border: 1px solid #3A3939;
 }
 
+QPushButton::menu-indicator  {
+    subcontrol-origin: padding;
+    subcontrol-position: bottom right;
+    left: 8px;
+}
+
 QTableView
 {
     border: 1px solid #444;
@@ -1239,20 +1245,10 @@ QPushButton:hover
 }
 
 #messages:item:selected
-{
-    background-color: #1E90FF;
-}
-
-MessageEdit 
 {
     background-color: transparent;
 }
 
-#messages:item:selected QListWidgetItem
-{
-    background-color: #1E90FF;
-}
-
 #friends_list:item:selected
 {
     background-color: #333333;
@@ -1281,44 +1277,3 @@ QListWidget > QLabel
 {
     padding-left: 22px;
 }
-
-#mainmenubutton
-{
-    border: 1px solid #3A3939;
-    color: silver;
-    margin: 0px;
-    text-align: center;
-}
-
-#mainmenubutton:hover
-{
-    background: transparent;
-    border: 1px solid #A9A9A9;
-    background-color: #302F2F;
-}
-
-#mainmenubutton:pressed
-{
-    background: transparent;
-    border: 1px solid #A9A9A9;
-    background-color: #302F2F;
-}
-
-#mainmenubutton::menu-indicator
-{
-    image: none;
-    width: 0px;
-    height: 0px;
-}
-
-ClickableLabel:focus
-{
-    border-width: 1px;
-    border-color: #4A4949;
-    border-style: solid;
-}
-
-ClickableLabel:hover
-{
-    background-color: #4A4949;
-}

toxygen/tox.py

@@ -92,6 +92,22 @@ class Tox:
             self.file_recv_chunk_cb = None
             self.friend_lossy_packet_cb = None
             self.friend_lossless_packet_cb = None
+            self.group_moderation_cb = None
+            self.group_join_fail_cb = None
+            self.group_self_join_cb = None
+            self.group_invite_cb = None
+            self.group_custom_packet_cb = None
+            self.group_private_message_cb = None
+            self.group_private_message_cb = None
+            self.group_message_cb = None
+            self.group_password_cb = None
+            self.group_peer_limit_cb = None
+            self.group_privacy_state_cb = None
+            self.group_topic_cb = None
+            self.group_peer_status_cb = None
+            self.group_peer_name_cb = None
+            self.group_peer_exit_cb = None
+            self.group_peer_join_cb = None
 
             self.AV = ToxAV(self._tox_pointer)
 
@@ -1510,3 +1526,935 @@ class Tox:
             return result
         elif tox_err_get_port == TOX_ERR_GET_PORT['NOT_BOUND']:
             raise RuntimeError('The instance was not bound to any port.')
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chat instance management
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_new(self, privacy_state, group_name):
+        """
+        Creates a new group chat.
+
+        This function creates a new group chat object and adds it to the chats array.
+
+        The client should initiate its peer list with self info after calling this function, as
+        the peer_join callback will not be triggered.
+
+        :param privacy_state: The privacy state of the group. If this is set to TOX_GROUP_PRIVACY_STATE_PUBLIC,
+        the group will attempt to announce itself to the DHT and anyone with the Chat ID may join.
+        Otherwise a friend invite will be required to join the group.
+        :param group_name: The name of the group. The name must be non-NULL.
+
+        :return group number on success, UINT32_MAX on failure.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_new(self._tox_pointer, privacy_state, group_name,
+                      len(group_name), byref(error))
+        return result
+
+    def group_join(self, chat_id, password):
+        """
+        Joins a group chat with specified Chat ID.
+
+        This function creates a new group chat object, adds it to the chats array, and sends
+        a DHT announcement to find peers in the group associated with chat_id. Once a peer has been
+        found a join attempt will be initiated.
+
+        :param chat_id: The Chat ID of the group you wish to join. This must be TOX_GROUP_CHAT_ID_SIZE bytes.
+        :param password: The password required to join the group. Set to NULL if no password is required.
+
+        :return groupnumber on success, UINT32_MAX on failure.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_join(self._tox_pointer, string_to_bin(chat_id),
+                                               password,
+                                               len(password) if password is not None else 0,
+                                               byref(error))
+        return result
+
+    def group_reconnect(self, groupnumber):
+        """
+        Reconnects to a group.
+
+        This function disconnects from all peers in the group, then attempts to reconnect with the group.
+        The caller's state is not changed (i.e. name, status, role, chat public key etc.)
+
+        :param groupnumber: The group number of the group we wish to reconnect to.
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_reconnect(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_leave(self, groupnumber, message):
+        """
+        Leaves a group.
+
+        This function sends a parting packet containing a custom (non-obligatory) message to all
+        peers in a group, and deletes the group from the chat array. All group state information is permanently
+        lost, including keys and role credentials.
+
+        :param groupnumber: The group number of the group we wish to leave.
+        :param message: The parting message to be sent to all the peers. Set to NULL if we do not wish to
+        send a parting message.
+
+        :return True if the group chat instance was successfully deleted.
+        """
+
+        error = c_int()
+        f = Tox.libtoxcore.tox_group_leave
+        f.restype = c_bool
+        result = f(self._tox_pointer, groupnumber, message,
+                   len(message) if message is not None else 0, byref(error))
+        return result
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group user-visible client information (nickname/status/role/public key)
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_self_set_name(self, groupnumber, name):
+        """
+        Set the client's nickname for the group instance designated by the given group number.
+
+        Nickname length cannot exceed TOX_MAX_NAME_LENGTH. If length is equal to zero or name is a NULL
+        pointer, the function call will fail.
+
+        :param name: A byte array containing the new nickname.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_self_set_name(self._tox_pointer, groupnumber, name, len(name), byref(error))
+        return result
+
+    def group_self_get_name_size(self, groupnumber):
+        """
+        Return the length of the client's current nickname for the group instance designated
+        by groupnumber as passed to tox_group_self_set_name.
+
+        If no nickname was set before calling this function, the name is empty,
+        and this function returns 0.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_self_get_name_size(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_self_get_name(self, groupnumber):
+        """
+        Write the nickname set by tox_group_self_set_name to a byte array.
+
+        If no nickname was set before calling this function, the name is empty,
+        and this function has no effect.
+
+        Call tox_group_self_get_name_size to find out how much memory to allocate for the result.
+        :return nickname
+        """
+
+        error = c_int()
+        size = self.group_self_get_name_size(groupnumber)
+        name = create_string_buffer(size)
+        result = Tox.libtoxcore.tox_group_self_get_name(self._tox_pointer, groupnumber, name, byref(error))
+        return str(name[:size], 'utf-8')
+
+    def group_self_set_status(self, groupnumber, status):
+
+        """
+        Set the client's status for the group instance. Status must be a TOX_USER_STATUS.
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_self_set_status(self._tox_pointer, groupnumber, status, byref(error))
+        return result
+
+    def group_self_get_status(self, groupnumber):
+        """
+        returns the client's status for the group instance on success.
+        return value is unspecified on failure.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_self_get_status(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_self_get_role(self, groupnumber):
+        """
+        returns the client's role for the group instance on success.
+        return value is unspecified on failure.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_self_get_role(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_self_get_peer_id(self, groupnumber):
+        """
+        returns the client's peer id for the group instance on success.
+        return value is unspecified on failure.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_self_get_peer_id(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_self_get_public_key(self, groupnumber):
+        """
+        Write the client's group public key designated by the given group number to a byte array.
+
+        This key will be permanently tied to the client's identity for this particular group until
+        the client explicitly leaves the group or gets kicked/banned. This key is the only way for
+        other peers to reliably identify the client across client restarts.
+
+        `public_key` should have room for at least TOX_GROUP_PEER_PUBLIC_KEY_SIZE bytes.
+
+        :return public key
+        """
+
+        error = c_int()
+        key = create_string_buffer(TOX_GROUP_PEER_PUBLIC_KEY_SIZE)
+        result = Tox.libtoxcore.tox_group_self_get_public_key(self._tox_pointer, groupnumber,
+                                                              key, byref(error))
+        return bin_to_string(key, TOX_GROUP_PEER_PUBLIC_KEY_SIZE)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Peer-specific group state queries.
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_peer_get_name_size(self, groupnumber, peer_id):
+        """
+        Return the length of the peer's name. If the group number or ID is invalid, the
+        return value is unspecified.
+
+        The return value is equal to the `length` argument received by the last
+        `group_peer_name` callback.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_peer_get_name_size(self._tox_pointer, groupnumber, peer_id, byref(error))
+        return result
+
+    def group_peer_get_name(self, groupnumber, peer_id):
+        """
+        Write the name of the peer designated by the given ID to a byte
+        array.
+
+        Call tox_group_peer_get_name_size to determine the allocation size for the `name` parameter.
+
+        The data written to `name` is equal to the data received by the last
+        `group_peer_name` callback.
+
+        :param groupnumber: The group number of the group we wish to query.
+        :param peer_id: The ID of the peer whose name we want to retrieve.
+
+        :return name.
+        """
+        error = c_int()
+        size = self.group_peer_get_name_size(groupnumber, peer_id)
+        name = create_string_buffer(size)
+        result = Tox.libtoxcore.tox_group_peer_get_name(self._tox_pointer, groupnumber, peer_id, name, byref(error))
+        return str(name[:], 'utf-8')
+
+    def group_peer_get_status(self, groupnumber, peer_id):
+        """
+        Return the peer's user status (away/busy/...). If the ID or group number is
+        invalid, the return value is unspecified.
+
+        The status returned is equal to the last status received through the
+        `group_peer_status` callback.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_peer_get_status(self._tox_pointer, groupnumber, peer_id, byref(error))
+        return result
+
+    def group_peer_get_role(self, groupnumber, peer_id):
+        """
+        Return the peer's role (user/moderator/founder...). If the ID or group number is
+        invalid, the return value is unspecified.
+
+        The role returned is equal to the last role received through the
+        `group_moderation` callback.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_peer_get_role(self._tox_pointer, groupnumber, peer_id, byref(error))
+        return result
+
+    def group_peer_get_public_key(self, groupnumber, peer_id):
+        """
+        Write the group public key with the designated peer_id for the designated group number to public_key.
+
+        This key will be parmanently tied to a particular peer until they explicitly leave the group or
+        get kicked/banned, and is the only way to reliably identify the same peer across client restarts.
+
+        `public_key` should have room for at least TOX_GROUP_PEER_PUBLIC_KEY_SIZE bytes.
+
+        :return public key
+        """
+
+        error = c_int()
+        key = create_string_buffer(TOX_GROUP_PEER_PUBLIC_KEY_SIZE)
+        result = Tox.libtoxcore.tox_group_peer_get_public_key(self._tox_pointer, groupnumber, peer_id,
+                                                              key, byref(error))
+        return bin_to_string(key, TOX_GROUP_PEER_PUBLIC_KEY_SIZE)
+
+    def callback_group_peer_name(self, callback, user_data):
+        """
+        Set the callback for the `group_peer_name` event. Pass NULL to unset.
+        This event is triggered when a peer changes their nickname.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_char_p, c_size_t, c_void_p)
+        self.group_peer_name_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_peer_name(self._tox_pointer, self.group_peer_name_cb, user_data)
+
+    def callback_group_peer_status(self, callback, user_data):
+        """
+        Set the callback for the `group_peer_status` event. Pass NULL to unset.
+        This event is triggered when a peer changes their status.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_int, c_void_p)
+        self.group_peer_status_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_peer_status(self._tox_pointer, self.group_peer_status_cb, user_data)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chat state queries and events.
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_set_topic(self, groupnumber, topic):
+        """
+        Set the group topic and broadcast it to the rest of the group.
+
+        topic length cannot be longer than TOX_GROUP_MAX_TOPIC_LENGTH. If length is equal to zero or
+        topic is set to NULL, the topic will be unset.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_set_topic(self._tox_pointer, groupnumber, topic, len(topic), byref(error))
+        return result
+
+    def group_get_topic_size(self, groupnumber):
+        """
+        Return the length of the group topic. If the group number is invalid, the
+        return value is unspecified.
+
+        The return value is equal to the `length` argument received by the last
+        `group_topic` callback.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_get_topic_size(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_get_topic(self, groupnumber):
+        """
+        Write the topic designated by the given group number to a byte array.
+        Call tox_group_get_topic_size to determine the allocation size for the `topic` parameter.
+        The data written to `topic` is equal to the data received by the last
+        `group_topic` callback.
+
+        :return topic
+        """
+
+        error = c_int()
+        size = self.group_get_topic_size(groupnumber)
+        topic = create_string_buffer(size)
+        result = Tox.libtoxcore.tox_group_get_topic(self._tox_pointer, groupnumber, topic, byref(error))
+        return str(topic[:size], 'utf-8')
+
+    def group_get_name_size(self, groupnumber):
+        """
+        Return the length of the group name. If the group number is invalid, the
+        return value is unspecified.
+        """
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_get_name_size(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_get_name(self, groupnumber):
+        """
+        Write the name of the group designated by the given group number to a byte array.
+        Call tox_group_get_name_size to determine the allocation size for the `name` parameter.
+        :return true on success.
+        """
+
+        error = c_int()
+        size = self.group_get_name_size(groupnumber)
+        name = create_string_buffer(size)
+        result = Tox.libtoxcore.tox_group_get_name(self._tox_pointer, groupnumber,
+                                                   name, byref(error))
+        return str(name[:size], 'utf-8')
+
+    def group_get_chat_id(self, groupnumber):
+        """
+        Write the Chat ID designated by the given group number to a byte array.
+        `chat_id` should have room for at least TOX_GROUP_CHAT_ID_SIZE bytes.
+        :return chat id.
+        """
+
+        error = c_int()
+        buff = create_string_buffer(TOX_GROUP_CHAT_ID_SIZE)
+        result = Tox.libtoxcore.tox_group_get_chat_id(self._tox_pointer, groupnumber,
+                                                      buff, byref(error))
+        return bin_to_string(buff, TOX_GROUP_CHAT_ID_SIZE)
+
+    def group_get_number_groups(self):
+        """
+        Return the number of groups in the Tox chats array.
+        """
+
+        result = Tox.libtoxcore.tox_group_get_number_groups(self._tox_pointer)
+        return result
+
+    def group_get_privacy_state(self, groupnumber):
+        """
+        Return the privacy state of the group designated by the given group number. If group number
+        is invalid, the return value is unspecified.
+
+        The value returned is equal to the data received by the last
+        `group_privacy_state` callback.
+
+        see the `Group chat founder controls` section for the respective set function.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_get_privacy_state(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_get_peer_limit(self, groupnumber):
+        """
+        Return the maximum number of peers allowed for the group designated by the given group number.
+        If the group number is invalid, the return value is unspecified.
+
+        The value returned is equal to the data received by the last
+        `group_peer_limit` callback.
+
+        see the `Group chat founder controls` section for the respective set function.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_get_peer_limit(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_get_password_size(self, groupnumber):
+        """
+        Return the length of the group password. If the group number is invalid, the
+        return value is unspecified.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_get_password_size(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_get_password(self, groupnumber):
+        """
+        Write the password for the group designated by the given group number to a byte array.
+
+        Call tox_group_get_password_size to determine the allocation size for the `password` parameter.
+
+        The data received is equal to the data received by the last
+        `group_password` callback.
+
+        see the `Group chat founder controls` section for the respective set function.
+
+        :return password
+        """
+
+        error = c_int()
+        size = self.group_get_password_size(groupnumber)
+        password = create_string_buffer(size)
+        result = Tox.libtoxcore.tox_group_get_password(self._tox_pointer, groupnumber,
+                                                       password, byref(error))
+        return str(password[:size], 'utf-8')
+
+    def callback_group_topic(self, callback, user_data):
+        """
+        Set the callback for the `group_topic` event. Pass NULL to unset.
+        This event is triggered when a peer changes the group topic.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_char_p, c_size_t, c_void_p)
+        self.group_topic_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_topic(self._tox_pointer, self.group_topic_cb, user_data)
+
+    def callback_group_privacy_state(self, callback, user_data):
+        """
+        Set the callback for the `group_privacy_state` event. Pass NULL to unset.
+        This event is triggered when the group founder changes the privacy state.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_int, c_void_p)
+        self.group_privacy_state_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_privacy_state(self._tox_pointer, self.group_privacy_state_cb, user_data)
+
+    def callback_group_peer_limit(self, callback, user_data):
+        """
+        Set the callback for the `group_peer_limit` event. Pass NULL to unset.
+        This event is triggered when the group founder changes the maximum peer limit.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_void_p)
+        self.group_peer_limit_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_peer_limit(self._tox_pointer, self.group_peer_limit_cb, user_data)
+
+    def callback_group_password(self, callback, user_data):
+        """
+        Set the callback for the `group_password` event. Pass NULL to unset.
+        This event is triggered when the group founder changes the group password.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_char_p, c_size_t, c_void_p)
+        self.group_password_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_password(self._tox_pointer, self.group_password_cb, user_data)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group message sending
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_send_custom_packet(self, groupnumber, lossless, data):
+        """
+        Send a custom packet to the group.
+
+        If lossless is true the packet will be lossless. Lossless packet behaviour is comparable
+        to TCP (reliability, arrive in order) but with packets instead of a stream.
+
+        If lossless is false, the packet will be lossy. Lossy packets behave like UDP packets,
+        meaning they might never reach the other side or might arrive more than once (if someone
+        is messing with the connection) or might arrive in the wrong order.
+
+        Unless latency is an issue or message reliability is not important, it is recommended that you use
+        lossless custom packets.
+
+        :param groupnumber: The group number of the group the message is intended for.
+        :param lossless: True if the packet should be lossless.
+        :param data A byte array containing the packet data.
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_send_custom_packet(self._tox_pointer, groupnumber, lossless, data,
+                                                             len(data), byref(error))
+        return result
+
+    def group_send_private_message(self, groupnumber, peer_id, message):
+        """
+        Send a text chat message to the specified peer in the specified group.
+
+        This function creates a group private message packet and pushes it into the send
+        queue.
+
+        The message length may not exceed TOX_MAX_MESSAGE_LENGTH. Larger messages
+        must be split by the client and sent as separate messages. Other clients can
+        then reassemble the fragments. Messages may not be empty.
+
+        :param groupnumber: The group number of the group the message is intended for.
+        :param peer_id: The ID of the peer the message is intended for.
+        :param message: A non-NULL pointer to the first element of a byte array containing the message text.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_send_private_message(self._tox_pointer, groupnumber, peer_id, message,
+                                                               len(message), byref(error))
+        return result
+
+    def group_send_message(self, groupnumber, type, message):
+        """
+        Send a text chat message to the group.
+
+        This function creates a group message packet and pushes it into the send
+        queue.
+
+        The message length may not exceed TOX_MAX_MESSAGE_LENGTH. Larger messages
+        must be split by the client and sent as separate messages. Other clients can
+        then reassemble the fragments. Messages may not be empty.
+
+        :param groupnumber: The group number of the group the message is intended for.
+        :param type: Message type (normal, action, ...).
+        :param message: A non-NULL pointer to the first element of a byte array containing the message text.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_send_message(self._tox_pointer, groupnumber, type, message, len(message),
+                                                       byref(error))
+        return result
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group message receiving
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def callback_group_message(self, callback, user_data):
+        """
+        Set the callback for the `group_message` event. Pass NULL to unset.
+        This event is triggered when the client receives a group message.
+
+        Callback: python function with params:
+        tox Tox* instance
+        groupnumber The group number of the group the message is intended for.
+        peer_id The ID of the peer who sent the message.
+        type The type of message (normal, action, ...).
+        message The message data.
+        length The length of the message.
+        user_data - user data
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_int, c_char_p, c_size_t, c_void_p)
+        self.group_message_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_message(self._tox_pointer, self.group_message_cb, user_data)
+
+    def callback_group_private_message(self, callback, user_data):
+        """
+        Set the callback for the `group_private_message` event. Pass NULL to unset.
+        This event is triggered when the client receives a private message.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_char_p, c_size_t, c_void_p)
+        self.group_private_message_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_private_message(self._tox_pointer, self.group_private_message_cb, user_data)
+
+    def callback_group_custom_packet(self, callback, user_data):
+        """
+        Set the callback for the `group_custom_packet` event. Pass NULL to unset.
+
+        This event is triggered when the client receives a custom packet.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, POINTER(c_uint8), c_void_p)
+        self.group_custom_packet_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_custom_packet(self._tox_pointer, self.group_custom_packet_cb, user_data)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chat inviting and join/part events
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_invite_friend(self, groupnumber, friend_number):
+        """
+        Invite a friend to a group.
+
+        This function creates an invite request packet and pushes it to the send queue.
+
+        :param groupnumber: The group number of the group the message is intended for.
+        :param friend_number: The friend number of the friend the invite is intended for.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_invite_friend(self._tox_pointer, groupnumber, friend_number, byref(error))
+        return result
+
+    def group_invite_accept(self, invite_data, friend_number, password=None):
+        """
+        Accept an invite to a group chat that the client previously received from a friend. The invite
+        is only valid while the inviter is present in the group.
+
+        :param invite_data: The invite data received from the `group_invite` event.
+        :param password: The password required to join the group. Set to NULL if no password is required.
+        :return the groupnumber on success, UINT32_MAX on failure.
+        """
+
+        error = c_int()
+        f = Tox.libtoxcore.tox_group_invite_accept
+        f.restype = c_uint32
+        result = f(self._tox_pointer, friend_number, invite_data, len(invite_data), password,
+                   len(password) if password is not None else 0, byref(error))
+        print('Invite accept. Result:', result, 'Error:', error.value)
+        return result
+
+    def callback_group_invite(self, callback, user_data):
+        """
+        Set the callback for the `group_invite` event. Pass NULL to unset.
+
+        This event is triggered when the client receives a group invite from a friend. The client must store
+        invite_data which is used to join the group via tox_group_invite_accept.
+
+        Callback: python function with params:
+        tox - Tox*
+        friend_number The friend number of the contact who sent the invite.
+        invite_data The invite data.
+        length The length of invite_data.
+        user_data - user data
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, POINTER(c_uint8), c_size_t, c_void_p)
+        self.group_invite_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_invite(self._tox_pointer, self.group_invite_cb, user_data)
+
+    def callback_group_peer_join(self, callback, user_data):
+        """
+        Set the callback for the `group_peer_join` event. Pass NULL to unset.
+
+        This event is triggered when a peer other than self joins the group.
+        Callback: python function with params:
+        tox - Tox*
+        group_number - group number
+        peer_id - peer id
+        user_data - user data
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_void_p)
+        self.group_peer_join_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_peer_join(self._tox_pointer, self.group_peer_join_cb, user_data)
+
+    def callback_group_peer_exit(self, callback, user_data):
+        """
+        Set the callback for the `group_peer_exit` event. Pass NULL to unset.
+
+        This event is triggered when a peer other than self exits the group.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_char_p, c_size_t, c_void_p)
+        self.group_peer_exit_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_peer_exit(self._tox_pointer, self.group_peer_exit_cb, user_data)
+
+    def callback_group_self_join(self, callback, user_data):
+        """
+        Set the callback for the `group_self_join` event. Pass NULL to unset.
+
+        This event is triggered when the client has successfully joined a group. Use this to initialize
+        any group information the client may need.
+        Callback: python fucntion with params:
+        tox - *Tox
+        group_number - group number
+        user_data - user data
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_void_p)
+        self.group_self_join_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_self_join(self._tox_pointer, self.group_self_join_cb, user_data)
+
+    def callback_group_join_fail(self, callback, user_data):
+        """
+        Set the callback for the `group_join_fail` event. Pass NULL to unset.
+
+        This event is triggered when the client fails to join a group.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_int, c_void_p)
+        self.group_join_fail_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_join_fail(self._tox_pointer, self.group_join_fail_cb, user_data)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chat founder controls (these only work for the group founder)
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_founder_set_password(self, groupnumber, password):
+        """
+        Set or unset the group password.
+
+        This function sets the groups password, creates a new group shared state including the change,
+        and distributes it to the rest of the group.
+
+        :param groupnumber: The group number of the group for which we wish to set the password.
+        :param password: The password we want to set. Set password to NULL to unset the password.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_founder_set_password(self._tox_pointer, groupnumber, password,
+                                                               len(password), byref(error))
+        return result
+
+    def group_founder_set_privacy_state(self, groupnumber, privacy_state):
+        """
+        Set the group privacy state.
+
+        This function sets the group's privacy state, creates a new group shared state
+        including the change, and distributes it to the rest of the group.
+
+        If an attempt is made to set the privacy state to the same state that the group is already
+        in, the function call will be successful and no action will be taken.
+
+        :param groupnumber: The group number of the group for which we wish to change the privacy state.
+        :param privacy_state: The privacy state we wish to set the group to.
+
+        :return true on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_founder_set_privacy_state(self._tox_pointer, groupnumber, privacy_state,
+                                                                    byref(error))
+        return result
+
+    def group_founder_set_peer_limit(self, groupnumber, max_peers):
+        """
+        Set the group peer limit.
+
+        This function sets a limit for the number of peers who may be in the group, creates a new
+        group shared state including the change, and distributes it to the rest of the group.
+
+        :param groupnumber: The group number of the group for which we wish to set the peer limit.
+        :param max_peers: The maximum number of peers to allow in the group.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_founder_set_peer_limit(self._tox_pointer, groupnumber,
+                                                                 max_peers, byref(error))
+        return result
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chat moderation
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_toggle_ignore(self, groupnumber, peer_id, ignore):
+        """
+        Ignore or unignore a peer.
+
+        :param groupnumber: The group number of the group the in which you wish to ignore a peer.
+        :param peer_id: The ID of the peer who shall be ignored or unignored.
+        :param ignore: True to ignore the peer, false to unignore the peer.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_toggle_ignore(self._tox_pointer, groupnumber, peer_id, ignore, byref(error))
+        return result
+
+    def group_mod_set_role(self, groupnumber, peer_id, role):
+        """
+        Set a peer's role.
+
+        This function will first remove the peer's previous role and then assign them a new role.
+        It will also send a packet to the rest of the group, requesting that they perform
+        the role reassignment. Note: peers cannot be set to the founder role.
+
+        :param groupnumber: The group number of the group the in which you wish set the peer's role.
+        :param peer_id: The ID of the peer whose role you wish to set.
+        :param role: The role you wish to set the peer to.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_mod_set_role(self._tox_pointer, groupnumber, peer_id, role, byref(error))
+        return result
+
+    def group_mod_remove_peer(self, groupnumber, peer_id, set_ban):
+        """
+        Kick/ban a peer.
+
+        This function will remove a peer from the caller's peer list and optionally add their IP address
+        to the ban list. It will also send a packet to all group members requesting them
+        to do the same.
+
+        :param groupnumber: The group number of the group the ban is intended for.
+        :param peer_id: The ID of the peer who will be kicked and/or added to the ban list.
+        :param set_ban: Set to true if a ban shall be set on the peer's IP address.
+
+        :return True on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_mod_remove_peer(self._tox_pointer, groupnumber, peer_id,
+                                                          set_ban, byref(error))
+        return result
+
+    def group_mod_remove_ban(self, groupnumber, ban_id):
+        """
+        Removes a ban.
+
+        This function removes a ban entry from the ban list, and sends a packet to the rest of
+        the group requesting that they do the same.
+
+        :param groupnumber: The group number of the group in which the ban is to be removed.
+        :param ban_id: The ID of the ban entry that shall be removed.
+
+        :return True on success
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_mod_remove_ban(self._tox_pointer, groupnumber, ban_id, byref(error))
+        return result
+
+    def callback_group_moderation(self, callback, user_data):
+        """
+        Set the callback for the `group_moderation` event. Pass NULL to unset.
+
+        This event is triggered when a moderator or founder executes a moderation event.
+        """
+
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_uint32, c_int, c_void_p)
+        self.group_moderation_cb = c_callback(callback)
+        Tox.libtoxcore.tox_callback_group_moderation(self._tox_pointer, self.group_moderation_cb, user_data)
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chat ban list queries
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def group_ban_get_list_size(self, groupnumber):
+        """
+        Return the number of entries in the ban list for the group designated by
+        the given group number. If the group number is invalid, the return value is unspecified.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_ban_get_list_size(self._tox_pointer, groupnumber, byref(error))
+        return result
+
+    def group_ban_get_list(self, groupnumber):
+        """
+        Copy a list of valid ban list ID's into an array.
+
+        Call tox_group_ban_get_list_size to determine the number of elements to allocate.
+        return true on success.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_ban_get_list(self._tox_pointer, groupnumber, POINTER(c_uint32)(
+            create_string_buffer(sizeof(c_uint32) * self.group_ban_get_list_size(groupnumber)), byref(error)))
+        return result
+
+    def group_ban_get_name_size(self, groupnumber, ban_id):
+        """
+        Return the length of the name for the ban list entry designated by ban_id, in the
+        group designated by the given group number. If either groupnumber or ban_id is invalid,
+        the return value is unspecified.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_ban_get_name_size(self._tox_pointer, groupnumber, ban_id, byref(error))
+        return result
+
+    def group_ban_get_name(self, groupnumber, ban_id):
+        """
+        Write the name of the ban entry designated by ban_id in the group designated by the
+        given group number to a byte array.
+
+        Call tox_group_ban_get_name_size to find out how much memory to allocate for the result.
+
+        :return name
+        """
+
+        error = c_int()
+        size = self.group_ban_get_name_size(groupnumber, ban_id)
+        name = create_string_buffer()
+
+        result = Tox.libtoxcore.tox_group_ban_get_name(self._tox_pointer, groupnumber, ban_id,
+                                                       name, byref(error))
+        return str(name[:size], 'utf-8')
+
+    def group_ban_get_time_set(self, groupnumber, ban_id):
+        """
+        Return a time stamp indicating the time the ban was set, for the ban list entry
+        designated by ban_id, in the group designated by the given group number.
+        If either groupnumber or ban_id is invalid, the return value is unspecified.
+        """
+
+        error = c_int()
+        result = Tox.libtoxcore.tox_group_ban_get_time_set(self._tox_pointer, groupnumber, ban_id, byref(error))
+        return result

toxygen/tox_dns.py

@@ -2,7 +2,10 @@ import json
 import urllib.request
 from util import log
 import settings
-from PyQt5 import QtNetwork, QtCore
+try:
+    from PySide import QtNetwork, QtCore
+except:
+    from PyQt4 import QtNetwork, QtCore
 
 
 def tox_dns(email):

toxygen/toxav.py

@@ -12,6 +12,8 @@ class ToxAV:
     peers.
     """
 
+    libtoxav = LibToxAV()
+
     # -----------------------------------------------------------------------------------------------------------------
     # Creation and destruction
     # -----------------------------------------------------------------------------------------------------------------
@@ -22,10 +24,9 @@ class ToxAV:
 
         :param tox_pointer: pointer to Tox instance
         """
-        self.libtoxav = LibToxAV()
         toxav_err_new = c_int()
-        self.libtoxav.toxav_new.restype = POINTER(c_void_p)
+        ToxAV.libtoxav.toxav_new.restype = POINTER(c_void_p)
-        self._toxav_pointer = self.libtoxav.toxav_new(tox_pointer, byref(toxav_err_new))
+        self._toxav_pointer = ToxAV.libtoxav.toxav_new(tox_pointer, byref(toxav_err_new))
         toxav_err_new = toxav_err_new.value
         if toxav_err_new == TOXAV_ERR_NEW['NULL']:
             raise ArgumentError('One of the arguments to the function was NULL when it was not expected.')
@@ -47,7 +48,7 @@ class ToxAV:
         If any calls were ongoing, these will be forcibly terminated without notifying peers. After calling this
         function, no other functions may be called and the av pointer becomes invalid.
         """
-        self.libtoxav.toxav_kill(self._toxav_pointer)
+        ToxAV.libtoxav.toxav_kill(self._toxav_pointer)
 
     def get_tox_pointer(self):
         """
@@ -55,8 +56,8 @@ class ToxAV:
 
         :return: pointer to the Tox instance
         """
-        self.libtoxav.toxav_get_tox.restype = POINTER(c_void_p)
+        ToxAV.libtoxav.toxav_get_tox.restype = POINTER(c_void_p)
-        return self.libtoxav.toxav_get_tox(self._toxav_pointer)
+        return ToxAV.libtoxav.toxav_get_tox(self._toxav_pointer)
 
     # -----------------------------------------------------------------------------------------------------------------
     # A/V event loop
@@ -69,14 +70,14 @@ class ToxAV:
 
         :return: interval in milliseconds
         """
-        return self.libtoxav.toxav_iteration_interval(self._toxav_pointer)
+        return ToxAV.libtoxav.toxav_iteration_interval(self._toxav_pointer)
 
     def iterate(self):
         """
         Main loop for the session. This function needs to be called in intervals of toxav_iteration_interval()
         milliseconds. It is best called in the separate thread from tox_iterate.
         """
-        self.libtoxav.toxav_iterate(self._toxav_pointer)
+        ToxAV.libtoxav.toxav_iterate(self._toxav_pointer)
 
     # -----------------------------------------------------------------------------------------------------------------
     # Call setup
@@ -96,7 +97,7 @@ class ToxAV:
         :return: True on success.
         """
         toxav_err_call = c_int()
-        result = self.libtoxav.toxav_call(self._toxav_pointer, c_uint32(friend_number), c_uint32(audio_bit_rate),
+        result = ToxAV.libtoxav.toxav_call(self._toxav_pointer, c_uint32(friend_number), c_uint32(audio_bit_rate),
                                            c_uint32(video_bit_rate), byref(toxav_err_call))
         toxav_err_call = toxav_err_call.value
         if toxav_err_call == TOXAV_ERR_CALL['OK']:
@@ -130,7 +131,7 @@ class ToxAV:
         """
         c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_bool, c_bool, c_void_p)
         self.call_cb = c_callback(callback)
-        self.libtoxav.toxav_callback_call(self._toxav_pointer, self.call_cb, user_data)
+        ToxAV.libtoxav.toxav_callback_call(self._toxav_pointer, self.call_cb, user_data)
 
     def answer(self, friend_number, audio_bit_rate, video_bit_rate):
         """
@@ -145,7 +146,7 @@ class ToxAV:
         :return: True on success.
         """
         toxav_err_answer = c_int()
-        result = self.libtoxav.toxav_answer(self._toxav_pointer, c_uint32(friend_number), c_uint32(audio_bit_rate),
+        result = ToxAV.libtoxav.toxav_answer(self._toxav_pointer, c_uint32(friend_number), c_uint32(audio_bit_rate),
                                              c_uint32(video_bit_rate), byref(toxav_err_answer))
         toxav_err_answer = toxav_err_answer.value
         if toxav_err_answer == TOXAV_ERR_ANSWER['OK']:
@@ -183,7 +184,7 @@ class ToxAV:
         """
         c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_void_p)
         self.call_state_cb = c_callback(callback)
-        self.libtoxav.toxav_callback_call_state(self._toxav_pointer, self.call_state_cb, user_data)
+        ToxAV.libtoxav.toxav_callback_call_state(self._toxav_pointer, self.call_state_cb, user_data)
 
     # -----------------------------------------------------------------------------------------------------------------
     # Call control
@@ -198,7 +199,7 @@ class ToxAV:
         :return: True on success.
         """
         toxav_err_call_control = c_int()
-        result = self.libtoxav.toxav_call_control(self._toxav_pointer, c_uint32(friend_number), c_int(control),
+        result = ToxAV.libtoxav.toxav_call_control(self._toxav_pointer, c_uint32(friend_number), c_int(control),
                                                    byref(toxav_err_call_control))
         toxav_err_call_control = toxav_err_call_control.value
         if toxav_err_call_control == TOXAV_ERR_CALL_CONTROL['OK']:
@@ -240,7 +241,7 @@ class ToxAV:
         24000, or 48000.
         """
         toxav_err_send_frame = c_int()
-        result = self.libtoxav.toxav_audio_send_frame(self._toxav_pointer, c_uint32(friend_number),
+        result = ToxAV.libtoxav.toxav_audio_send_frame(self._toxav_pointer, c_uint32(friend_number),
                                                        cast(pcm, c_void_p),
                                                        c_size_t(sample_count), c_uint8(channels),
                                                        c_uint32(sampling_rate), byref(toxav_err_send_frame))
@@ -280,7 +281,7 @@ class ToxAV:
         :param v: V (Chroma) plane data.
         """
         toxav_err_send_frame = c_int()
-        result = self.libtoxav.toxav_video_send_frame(self._toxav_pointer, c_uint32(friend_number), c_uint16(width),
+        result = ToxAV.libtoxav.toxav_video_send_frame(self._toxav_pointer, c_uint32(friend_number), c_uint16(width),
                                                        c_uint16(height), c_char_p(y), c_char_p(u), c_char_p(v),
                                                        byref(toxav_err_send_frame))
         toxav_err_send_frame = toxav_err_send_frame.value
@@ -327,7 +328,7 @@ class ToxAV:
         """
         c_callback = CFUNCTYPE(None, c_void_p, c_uint32, POINTER(c_uint8), c_size_t, c_uint8, c_uint32, c_void_p)
         self.audio_receive_frame_cb = c_callback(callback)
-        self.libtoxav.toxav_callback_audio_receive_frame(self._toxav_pointer, self.audio_receive_frame_cb, user_data)
+        ToxAV.libtoxav.toxav_callback_audio_receive_frame(self._toxav_pointer, self.audio_receive_frame_cb, user_data)
 
     def callback_video_receive_frame(self, callback, user_data):
         """
@@ -359,4 +360,4 @@ class ToxAV:
         c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint16, c_uint16, POINTER(c_uint8), POINTER(c_uint8),
                                POINTER(c_uint8), c_int32, c_int32, c_int32, c_void_p)
         self.video_receive_frame_cb = c_callback(callback)
-        self.libtoxav.toxav_callback_video_receive_frame(self._toxav_pointer, self.video_receive_frame_cb, user_data)
+        ToxAV.libtoxav.toxav_callback_video_receive_frame(self._toxav_pointer, self.video_receive_frame_cb, user_data)

toxygen/toxcore_enums_and_consts.py

@@ -188,6 +188,729 @@ TOX_ERR_GET_PORT = {
     'NOT_BOUND': 1,
 }
 
+TOX_GROUP_PRIVACY_STATE = {
+
+    #
+    # The group is considered to be public. Anyone may join the group using the Chat ID.
+    #
+    # If the group is in this state, even if the Chat ID is never explicitly shared
+    # with someone outside of the group, information including the Chat ID, IP addresses,
+    # and peer ID's (but not Tox ID's) is visible to anyone with access to a node
+    # storing a DHT entry for the given group.
+    #
+    'TOX_GROUP_PRIVACY_STATE_PUBLIC': 0,
+
+    #
+    # The group is considered to be private. The only way to join the group is by having
+    # someone in your contact list send you an invite.
+    #
+    # If the group is in this state, no group information (mentioned above) is present in the DHT;
+    # the DHT is not used for any purpose at all. If a public group is set to private,
+    # all DHT information related to the group will expire shortly.
+    #
+    'TOX_GROUP_PRIVACY_STATE_PRIVATE': 1
+}
+
+TOX_GROUP_ROLE = {
+
+    #
+    # May kick and ban all other peers as well as set their role to anything (except founder).
+    # Founders may also set the group password, toggle the privacy state, and set the peer limit.
+    #
+    'TOX_GROUP_ROLE_FOUNDER': 0,
+
+    #
+    # May kick, ban and set the user and observer roles for peers below this role.
+    # May also set the group topic.
+    #
+    'TOX_GROUP_ROLE_MODERATOR': 1,
+
+    #
+    # May communicate with other peers normally.
+    #
+    'TOX_GROUP_ROLE_USER': 2,
+
+    #
+    # May observe the group and ignore peers; may not communicate with other peers or with the group.
+    #
+    'TOX_GROUP_ROLE_OBSERVER': 3
+}
+
+TOX_ERR_GROUP_NEW = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_NEW_OK': 0,
+
+    #
+    # The group name exceeded TOX_GROUP_MAX_GROUP_NAME_LENGTH.
+    #
+    'TOX_ERR_GROUP_NEW_TOO_LONG': 1,
+
+    #
+    # group_name is NULL or length is zero.
+    #
+    'TOX_ERR_GROUP_NEW_EMPTY': 2,
+
+    #
+    # TOX_GROUP_PRIVACY_STATE is an invalid type.
+    #
+    'TOX_ERR_GROUP_NEW_PRIVACY': 3,
+
+    #
+    # The group instance failed to initialize.
+    #
+    'TOX_ERR_GROUP_NEW_INIT': 4,
+
+    #
+    # The group state failed to initialize. This usually indicates that something went wrong
+    # related to cryptographic signing.
+    #
+    'TOX_ERR_GROUP_NEW_STATE': 5,
+
+    #
+    # The group failed to announce to the DHT. This indicates a network related error.
+    #
+    'TOX_ERR_GROUP_NEW_ANNOUNCE': 6,
+}
+
+TOX_ERR_GROUP_JOIN = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_JOIN_OK': 0,
+
+    #
+    # The group instance failed to initialize.
+    #
+    'TOX_ERR_GROUP_JOIN_INIT': 1,
+
+    #
+    # The chat_id pointer is set to NULL or a group with chat_id already exists. This usually
+    # happens if the client attempts to create multiple sessions for the same group.
+    #
+    'TOX_ERR_GROUP_JOIN_BAD_CHAT_ID': 2,
+
+    #
+    # Password length exceeded TOX_GROUP_MAX_PASSWORD_SIZE.
+    #
+    'TOX_ERR_GROUP_JOIN_TOO_LONG': 3,
+}
+
+TOX_ERR_GROUP_RECONNECT = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_RECONNECT_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_RECONNECT_GROUP_NOT_FOUND': 1,
+}
+
+TOX_ERR_GROUP_LEAVE = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_LEAVE_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_LEAVE_GROUP_NOT_FOUND': 1,
+
+    #
+    # Message length exceeded 'TOX_GROUP_MAX_PART_LENGTH.
+    #
+    'TOX_ERR_GROUP_LEAVE_TOO_LONG': 2,
+
+    #
+    # The parting packet failed to send.
+    #
+    'TOX_ERR_GROUP_LEAVE_FAIL_SEND': 3,
+
+    #
+    # The group chat instance failed to be deleted. This may occur due to memory related errors.
+    #
+    'TOX_ERR_GROUP_LEAVE_DELETE_FAIL': 4,
+}
+
+TOX_ERR_GROUP_SELF_QUERY = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_SELF_QUERY_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_SELF_QUERY_GROUP_NOT_FOUND': 1,
+}
+
+
+TOX_ERR_GROUP_SELF_NAME_SET = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_SELF_NAME_SET_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_SELF_NAME_SET_GROUP_NOT_FOUND': 1,
+
+    #
+    # Name length exceeded 'TOX_MAX_NAME_LENGTH.
+    #
+    'TOX_ERR_GROUP_SELF_NAME_SET_TOO_LONG': 2,
+
+    #
+    # The length given to the set function is zero or name is a NULL pointer.
+    #
+    'TOX_ERR_GROUP_SELF_NAME_SET_INVALID': 3,
+
+    #
+    # The name is already taken by another peer in the group.
+    #
+    'TOX_ERR_GROUP_SELF_NAME_SET_TAKEN': 4,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_SELF_NAME_SET_FAIL_SEND': 5
+}
+
+TOX_ERR_GROUP_SELF_STATUS_SET = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_SELF_STATUS_SET_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_SELF_STATUS_SET_GROUP_NOT_FOUND': 1,
+
+    #
+    # An invalid type was passed to the set function.
+    #
+    'TOX_ERR_GROUP_SELF_STATUS_SET_INVALID': 2,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_SELF_STATUS_SET_FAIL_SEND': 3
+}
+
+TOX_ERR_GROUP_PEER_QUERY = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_PEER_QUERY_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_PEER_QUERY_GROUP_NOT_FOUND': 1,
+
+    #
+    # The ID passed did not designate a valid peer.
+    #
+    'TOX_ERR_GROUP_PEER_QUERY_PEER_NOT_FOUND': 2
+}
+
+TOX_ERR_GROUP_STATE_QUERIES = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_STATE_QUERIES_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_STATE_QUERIES_GROUP_NOT_FOUND': 1
+}
+
+
+TOX_ERR_GROUP_TOPIC_SET = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_TOPIC_SET_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_TOPIC_SET_GROUP_NOT_FOUND': 1,
+
+    #
+    # Topic length exceeded 'TOX_GROUP_MAX_TOPIC_LENGTH.
+    #
+    'TOX_ERR_GROUP_TOPIC_SET_TOO_LONG': 2,
+
+    #
+    # The caller does not have the required permissions to set the topic.
+    #
+    'TOX_ERR_GROUP_TOPIC_SET_PERMISSIONS': 3,
+
+    #
+    # The packet could not be created. This error is usually related to cryptographic signing.
+    #
+    'TOX_ERR_GROUP_TOPIC_SET_FAIL_CREATE': 4,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_TOPIC_SET_FAIL_SEND': 5
+}
+
+TOX_ERR_GROUP_SEND_MESSAGE = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_GROUP_NOT_FOUND': 1,
+
+    #
+    # Message length exceeded 'TOX_MAX_MESSAGE_LENGTH.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_TOO_LONG': 2,
+
+    #
+    # The message pointer is null or length is zero.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_EMPTY': 3,
+
+    #
+    # The message type is invalid.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_BAD_TYPE': 4,
+
+    #
+    # The caller does not have the required permissions to send group messages.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS': 5,
+
+    #
+    # Packet failed to send.
+    #
+    'TOX_ERR_GROUP_SEND_MESSAGE_FAIL_SEND': 6
+}
+
+TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_GROUP_NOT_FOUND': 1,
+
+    #
+    # The ID passed did not designate a valid peer.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_PEER_NOT_FOUND': 2,
+
+    #
+    # Message length exceeded 'TOX_MAX_MESSAGE_LENGTH.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_TOO_LONG': 3,
+
+    #
+    # The message pointer is null or length is zero.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_EMPTY': 4,
+
+    #
+    # The caller does not have the required permissions to send group messages.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_PERMISSIONS': 5,
+
+    #
+    # Packet failed to send.
+    #
+    'TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_FAIL_SEND': 6
+}
+
+TOX_ERR_GROUP_SEND_CUSTOM_PACKET = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_SEND_CUSTOM_PACKET_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_SEND_CUSTOM_PACKET_GROUP_NOT_FOUND': 1,
+
+    #
+    # Message length exceeded 'TOX_MAX_MESSAGE_LENGTH.
+    #
+    'TOX_ERR_GROUP_SEND_CUSTOM_PACKET_TOO_LONG': 2,
+
+    #
+    # The message pointer is null or length is zero.
+    #
+    'TOX_ERR_GROUP_SEND_CUSTOM_PACKET_EMPTY': 3,
+
+    #
+    # The caller does not have the required permissions to send group messages.
+    #
+    'TOX_ERR_GROUP_SEND_CUSTOM_PACKET_PERMISSIONS': 4
+}
+
+TOX_ERR_GROUP_INVITE_FRIEND = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_INVITE_FRIEND_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_INVITE_FRIEND_GROUP_NOT_FOUND': 1,
+
+    #
+    # The friend number passed did not designate a valid friend.
+    #
+    'TOX_ERR_GROUP_INVITE_FRIEND_FRIEND_NOT_FOUND': 2,
+
+    #
+    # Creation of the invite packet failed. This indicates a network related error.
+    #
+    'TOX_ERR_GROUP_INVITE_FRIEND_INVITE_FAIL': 3,
+
+    #
+    # Packet failed to send.
+    #
+    'TOX_ERR_GROUP_INVITE_FRIEND_FAIL_SEND': 4
+}
+
+TOX_ERR_GROUP_INVITE_ACCEPT = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_INVITE_ACCEPT_OK': 0,
+
+    #
+    # The invite data is not in the expected format.
+    #
+    'TOX_ERR_GROUP_INVITE_ACCEPT_BAD_INVITE': 1,
+
+    #
+    # The group instance failed to initialize.
+    #
+    'TOX_ERR_GROUP_INVITE_ACCEPT_INIT_FAILED': 2,
+
+    #
+    # Password length exceeded 'TOX_GROUP_MAX_PASSWORD_SIZE.
+    #
+    'TOX_ERR_GROUP_INVITE_ACCEPT_TOO_LONG': 3
+}
+
+TOX_GROUP_JOIN_FAIL = {
+
+    #
+    # You are using the same nickname as someone who is already in the group.
+    #
+    'TOX_GROUP_JOIN_FAIL_NAME_TAKEN': 0,
+
+    #
+    # The group peer limit has been reached.
+    #
+    'TOX_GROUP_JOIN_FAIL_PEER_LIMIT': 1,
+
+    #
+    # You have supplied an invalid password.
+    #
+    'TOX_GROUP_JOIN_FAIL_INVALID_PASSWORD': 2,
+
+    #
+    # The join attempt failed due to an unspecified error. This often occurs when the group is
+    # not found in the DHT.
+    #
+    'TOX_GROUP_JOIN_FAIL_UNKNOWN': 3
+}
+
+TOX_ERR_GROUP_FOUNDER_SET_PASSWORD = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_GROUP_NOT_FOUND': 1,
+
+    #
+    # The caller does not have the required permissions to set the password.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_PERMISSIONS': 2,
+
+    #
+    # Password length exceeded 'TOX_GROUP_MAX_PASSWORD_SIZE.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_TOO_LONG': 3,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_FAIL_SEND': 4
+}
+
+TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_GROUP_NOT_FOUND': 1,
+
+    #
+    # 'TOX_GROUP_PRIVACY_STATE is an invalid type.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_INVALID': 2,
+
+    #
+    # The caller does not have the required permissions to set the privacy state.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_PERMISSIONS': 3,
+
+    #
+    # The privacy state could not be set. This may occur due to an error related to
+    # cryptographic signing of the new shared state.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_FAIL_SET': 4,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_FAIL_SEND': 5
+}
+
+TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_GROUP_NOT_FOUND': 1,
+
+    #
+    # The caller does not have the required permissions to set the peer limit.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_PERMISSIONS': 2,
+
+    #
+    # The peer limit could not be set. This may occur due to an error related to
+    # cryptographic signing of the new shared state.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_FAIL_SET': 3,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_FAIL_SEND': 4
+}
+
+TOX_ERR_GROUP_TOGGLE_IGNORE = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_TOGGLE_IGNORE_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_TOGGLE_IGNORE_GROUP_NOT_FOUND': 1,
+
+    #
+    # The ID passed did not designate a valid peer.
+    #
+    'TOX_ERR_GROUP_TOGGLE_IGNORE_PEER_NOT_FOUND': 2
+}
+
+TOX_ERR_GROUP_MOD_SET_ROLE = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_MOD_SET_ROLE_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_MOD_SET_ROLE_GROUP_NOT_FOUND': 1,
+
+    #
+    # The ID passed did not designate a valid peer. Note: you cannot set your own role.
+    #
+    'TOX_ERR_GROUP_MOD_SET_ROLE_PEER_NOT_FOUND': 2,
+
+    #
+    # The caller does not have the required permissions for this action.
+    #
+    'TOX_ERR_GROUP_MOD_SET_ROLE_PERMISSIONS': 3,
+
+    #
+    # The role assignment is invalid. This will occur if you try to set a peer's role to
+    # the role they already have.
+    #
+    'TOX_ERR_GROUP_MOD_SET_ROLE_ASSIGNMENT': 4,
+
+    #
+    # The role was not successfully set. This may occur if something goes wrong with role setting': ,
+    # or if the packet fails to send.
+    #
+    'TOX_ERR_GROUP_MOD_SET_ROLE_FAIL_ACTION': 5
+}
+
+TOX_ERR_GROUP_MOD_REMOVE_PEER = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_PEER_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_PEER_GROUP_NOT_FOUND': 1,
+
+    #
+    # The ID passed did not designate a valid peer.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_PEER_PEER_NOT_FOUND': 2,
+
+    #
+    # The caller does not have the required permissions for this action.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_PEER_PERMISSIONS': 3,
+
+    #
+    # The peer could not be removed from the group.
+    #
+    # If a ban was set': , this error indicates that the ban entry could not be created.
+    # This is usually due to the peer's IP address already occurring in the ban list. It may also
+    # be due to the entry containing invalid peer information': , or a failure to cryptographically
+    # authenticate the entry.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_PEER_FAIL_ACTION': 4,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_PEER_FAIL_SEND': 5
+}
+
+TOX_ERR_GROUP_MOD_REMOVE_BAN = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_BAN_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_BAN_GROUP_NOT_FOUND': 1,
+
+    #
+    # The caller does not have the required permissions for this action.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_BAN_PERMISSIONS': 2,
+
+    #
+    # The ban entry could not be removed. This may occur if ban_id does not designate
+    # a valid ban entry.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_BAN_FAIL_ACTION': 3,
+
+    #
+    # The packet failed to send.
+    #
+    'TOX_ERR_GROUP_MOD_REMOVE_BAN_FAIL_SEND': 4
+}
+
+TOX_GROUP_MOD_EVENT = {
+
+    #
+    # A peer has been kicked from the group.
+    #
+    'TOX_GROUP_MOD_EVENT_KICK': 0,
+
+    #
+    # A peer has been banned from the group.
+    #
+    'TOX_GROUP_MOD_EVENT_BAN': 1,
+
+    #
+    # A peer as been given the observer role.
+    #
+    'TOX_GROUP_MOD_EVENT_OBSERVER': 2,
+
+    #
+    # A peer has been given the user role.
+    #
+    'TOX_GROUP_MOD_EVENT_USER': 3,
+
+    #
+    # A peer has been given the moderator role.
+    #
+    'TOX_GROUP_MOD_EVENT_MODERATOR': 4,
+}
+
+TOX_ERR_GROUP_BAN_QUERY = {
+
+    #
+    # The function returned successfully.
+    #
+    'TOX_ERR_GROUP_BAN_QUERY_OK': 0,
+
+    #
+    # The group number passed did not designate a valid group.
+    #
+    'TOX_ERR_GROUP_BAN_QUERY_GROUP_NOT_FOUND': 1,
+
+    #
+    # The ban_id does not designate a valid ban list entry.
+    #
+    'TOX_ERR_GROUP_BAN_QUERY_BAD_ID': 2,
+}
+
 TOX_PUBLIC_KEY_SIZE = 32
 
 TOX_ADDRESS_SIZE = TOX_PUBLIC_KEY_SIZE + 6
@@ -196,6 +919,18 @@ TOX_MAX_FRIEND_REQUEST_LENGTH = 1016
 
 TOX_MAX_MESSAGE_LENGTH = 1372
 
+TOX_GROUP_MAX_TOPIC_LENGTH = 512
+
+TOX_GROUP_MAX_PART_LENGTH = 128
+
+TOX_GROUP_MAX_GROUP_NAME_LENGTH = 48
+
+TOX_GROUP_MAX_PASSWORD_SIZE = 32
+
+TOX_GROUP_CHAT_ID_SIZE = 32
+
+TOX_GROUP_PEER_PUBLIC_KEY_SIZE = 32
+
 TOX_MAX_NAME_LENGTH = 128
 
 TOX_MAX_STATUS_MESSAGE_LENGTH = 1007

toxygen/toxencryptsave.py

@@ -1,25 +1,65 @@
 import libtox
+import util
 from ctypes import c_size_t, create_string_buffer, byref, c_int, ArgumentError, c_char_p, c_bool
-from toxencryptsave_enums_and_consts import *
 
 
-class ToxEncryptSave:
+TOX_ERR_ENCRYPTION = {
+    # The function returned successfully.
+    'OK': 0,
+    # Some input data, or maybe the output pointer, was null.
+    'NULL': 1,
+    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
+    # functions accepting keys do not produce this error.
+    'KEY_DERIVATION_FAILED': 2,
+    # The encryption itself failed.
+    'FAILED': 3
+}
+
+TOX_ERR_DECRYPTION = {
+    # The function returned successfully.
+    'OK': 0,
+    # Some input data, or maybe the output pointer, was null.
+    'NULL': 1,
+    # The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes
+    'INVALID_LENGTH': 2,
+    # The input data is missing the magic number (i.e. wasn't created by this module, or is corrupted)
+    'BAD_FORMAT': 3,
+    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
+    # functions accepting keys do not produce this error.
+    'KEY_DERIVATION_FAILED': 4,
+    # The encrypted byte array could not be decrypted. Either the data was corrupt or the password/key was incorrect.
+    'FAILED': 5,
+}
+
+TOX_PASS_ENCRYPTION_EXTRA_LENGTH = 80
+
+
+class ToxEncryptSave(util.Singleton):
+
+    libtoxencryptsave = libtox.LibToxEncryptSave()
 
     def __init__(self):
-        self.libtoxencryptsave = libtox.LibToxEncryptSave()
+        super().__init__()
+        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):
-        """
-        Checks if given data is encrypted
-        """
         func = self.libtoxencryptsave.tox_is_data_encrypted
         func.restype = c_bool
         result = func(c_char_p(bytes(data)))
         return result
 
-    def pass_encrypt(self, data, password):
+    def pass_encrypt(self, data):
         """
-        Encrypts the given data with the given password.
+        Encrypts the given data with the given passphrase.
 
         :return: output array
         """
@@ -27,8 +67,8 @@ class ToxEncryptSave:
         tox_err_encryption = c_int()
         self.libtoxencryptsave.tox_pass_encrypt(c_char_p(data),
                                                 c_size_t(len(data)),
-                                                c_char_p(bytes(password, 'utf-8')),
+                                                c_char_p(bytes(self._passphrase, 'utf-8')),
-                                                c_size_t(len(password)),
+                                                c_size_t(len(self._passphrase)),
                                                 out,
                                                 byref(tox_err_encryption))
         tox_err_encryption = tox_err_encryption.value
@@ -42,9 +82,9 @@ class ToxEncryptSave:
         elif tox_err_encryption == TOX_ERR_ENCRYPTION['FAILED']:
             raise RuntimeError('The encryption itself failed.')
 
-    def pass_decrypt(self, data, password):
+    def pass_decrypt(self, data):
         """
-        Decrypts the given data with the given password.
+        Decrypts the given data with the given passphrase.
 
         :return: output array
         """
@@ -52,8 +92,8 @@ class ToxEncryptSave:
         tox_err_decryption = c_int()
         self.libtoxencryptsave.tox_pass_decrypt(c_char_p(bytes(data)),
                                                 c_size_t(len(data)),
-                                                c_char_p(bytes(password, 'utf-8')),
+                                                c_char_p(bytes(self._passphrase, 'utf-8')),
-                                                c_size_t(len(password)),
+                                                c_size_t(len(self._passphrase)),
                                                 out,
                                                 byref(tox_err_decryption))
         tox_err_decryption = tox_err_decryption.value

toxygen/toxencryptsave_enums_and_consts.py

@@ -1,29 +0,0 @@
-TOX_ERR_ENCRYPTION = {
-    # The function returned successfully.
-    'OK': 0,
-    # Some input data, or maybe the output pointer, was null.
-    'NULL': 1,
-    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
-    # functions accepting keys do not produce this error.
-    'KEY_DERIVATION_FAILED': 2,
-    # The encryption itself failed.
-    'FAILED': 3
-}
-
-TOX_ERR_DECRYPTION = {
-    # The function returned successfully.
-    'OK': 0,
-    # Some input data, or maybe the output pointer, was null.
-    'NULL': 1,
-    # The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes
-    'INVALID_LENGTH': 2,
-    # The input data is missing the magic number (i.e. wasn't created by this module, or is corrupted)
-    'BAD_FORMAT': 3,
-    # The crypto lib was unable to derive a key from the given passphrase, which is usually a lack of memory issue. The
-    # functions accepting keys do not produce this error.
-    'KEY_DERIVATION_FAILED': 4,
-    # The encrypted byte array could not be decrypted. Either the data was corrupt or the password/key was incorrect.
-    'FAILED': 5,
-}
-
-TOX_PASS_ENCRYPTION_EXTRA_LENGTH = 80

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/toxygen.pro

@@ -1,2 +1,2 @@
-SOURCES = main.py  profile.py  menu.py  list_items.py  loginscreen.py  mainscreen.py plugins/plugin_super_class.py callbacks.py widgets.py avwidgets.py mainscreen_widgets.py passwordscreen.py
+SOURCES = main.py  profile.py  menu.py  list_items.py  loginscreen.py  mainscreen.py plugins/plugin_super_class.py callbacks.py widgets.py avwidgets.py mainscreen_widgets.py
 TRANSLATIONS = translations/en_GB.ts  translations/ru_RU.ts  translations/fr_FR.ts

toxygen/updater.py

@@ -1,106 +0,0 @@
-import util
-import os
-import settings
-import platform
-import urllib
-from PyQt5 import QtNetwork, QtCore
-import subprocess
-
-
-def connection_available():
-    try:
-        urllib.request.urlopen('http://216.58.192.142', timeout=1)  # google.com
-        return True
-    except:
-        return False
-
-
-def updater_available():
-    if is_from_sources():
-        return os.path.exists(util.curr_directory() + '/toxygen_updater.py')
-    elif platform.system() == 'Windows':
-        return os.path.exists(util.curr_directory() + '/toxygen_updater.exe')
-    else:
-        return os.path.exists(util.curr_directory() + '/toxygen_updater')
-
-
-def check_for_updates():
-    current_version = util.program_version
-    major, minor, patch = list(map(lambda x: int(x), current_version.split('.')))
-    versions = generate_versions(major, minor, patch)
-    for version in versions:
-        if send_request(version):
-            return version
-    return None  # no new version was found
-
-
-def is_from_sources():
-    return __file__.endswith('.py')
-
-
-def test_url(version):
-    return 'https://github.com/toxygen-project/toxygen/releases/tag/v' + version
-
-
-def get_url(version):
-    if is_from_sources():
-        return 'https://github.com/toxygen-project/toxygen/archive/v' + version + '.zip'
-    else:
-        if platform.system() == 'Windows':
-            name = 'toxygen_windows.zip'
-        elif util.is_64_bit():
-            name = 'toxygen_linux_64.tar.gz'
-        else:
-            name = 'toxygen_linux.tar.gz'
-        return 'https://github.com/toxygen-project/toxygen/releases/download/v{}/{}'.format(version, name)
-
-
-def get_params(url, version):
-    if is_from_sources():
-        return ['python3', 'toxygen_updater.py', url, version]
-    elif platform.system() == 'Windows':
-        return [util.curr_directory() + '/toxygen_updater.exe', url, version]
-    else:
-        return ['./toxygen_updater', url, version]
-
-
-def download(version):
-    os.chdir(util.curr_directory())
-    url = get_url(version)
-    params = get_params(url, version)
-    print('Updating Toxygen')
-    util.log('Updating Toxygen')
-    try:
-        subprocess.Popen(params)
-    except Exception as ex:
-        util.log('Exception: running updater failed with ' + str(ex))
-
-
-def send_request(version):
-    s = settings.Settings.get_instance()
-    netman = QtNetwork.QNetworkAccessManager()
-    proxy = QtNetwork.QNetworkProxy()
-    if s['proxy_type']:
-        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)
-    url = test_url(version)
-    try:
-        request = QtNetwork.QNetworkRequest(url)
-        reply = netman.get(request)
-        while not reply.isFinished():
-            QtCore.QThread.msleep(1)
-            QtCore.QCoreApplication.processEvents()
-        attr = reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
-        return attr is not None and 200 <= attr < 300
-    except Exception as ex:
-        util.log('TOXYGEN UPDATER ERROR: ' + str(ex))
-        return False
-
-
-def generate_versions(major, minor, patch):
-    new_major = '.'.join([str(major + 1), '0', '0'])
-    new_minor = '.'.join([str(major), str(minor + 1), '0'])
-    new_patch = '.'.join([str(major), str(minor), str(patch + 1)])
-    return new_major, new_minor, new_patch

toxygen/util.py

@@ -1,10 +1,8 @@
 import os
 import time
 import shutil
-import sys
-import re
 
-program_version = '0.2.8'
+program_version = '0.2.2'
 
 
 def log(data):
@@ -32,53 +30,14 @@ def copy(src, dest):
             copy(full_file_name, os.path.join(dest, file_name))
 
 
-def remove(folder):
-    if os.path.isdir(folder):
-        shutil.rmtree(folder)
-
-
 def convert_time(t):
-    offset = time.timezone + time_offset() * 60
+    sec = int(t) - time.timezone
-    sec = int(t) - offset
     m, s = divmod(sec, 60)
     h, m = divmod(m, 60)
     d, h = divmod(h, 24)
     return '%02d:%02d' % (h, m)
 
 
-def time_offset():
-    if hasattr(time_offset, 'offset'):
-        return time_offset.offset
-    hours = int(time.strftime('%H'))
-    minutes = int(time.strftime('%M'))
-    sec = int(time.time()) - time.timezone
-    m, s = divmod(sec, 60)
-    h, m = divmod(m, 60)
-    d, h = divmod(h, 24)
-    result = hours * 60 + minutes - h * 60 - m
-    time_offset.offset = result
-    return result
-
-
-def append_slash(s):
-    if len(s) and s[-1] not in ('\\', '/'):
-        s += '/'
-    return s
-
-
-def is_64_bit():
-    return sys.maxsize > 2 ** 32
-
-
-def is_re_valid(regex):
-    try:
-        re.compile(regex)
-    except re.error:
-        return False
-    else:
-        return True
-
-
 class Singleton:
     _instance = None
 

toxygen/widgets.py

@@ -1,25 +1,21 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
 
 
-class DataLabel(QtWidgets.QLabel):
+class DataLabel(QtGui.QLabel):
     """
     Label with elided text
     """
     def setText(self, text):
-        text = ''.join('\u25AF' if len(bytes(c, 'utf-8')) >= 4 else c for c in text)
+        text = ''.join(c if c <= '\u10FFFF' else '\u25AF' for c in text)
         metrics = QtGui.QFontMetrics(self.font())
         text = metrics.elidedText(text, QtCore.Qt.ElideRight, self.width())
         super().setText(text)
 
 
-class ComboBox(QtWidgets.QComboBox):
+class CenteredWidget(QtGui.QWidget):
-
-    def __init__(self, *args):
-        super().__init__(*args)
-        self.view().setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
-
-
-class CenteredWidget(QtWidgets.QWidget):
 
     def __init__(self):
         super(CenteredWidget, self).__init__()
@@ -27,12 +23,12 @@ class CenteredWidget(QtWidgets.QWidget):
 
     def center(self):
         qr = self.frameGeometry()
-        cp = QtWidgets.QDesktopWidget().availableGeometry().center()
+        cp = QtGui.QDesktopWidget().availableGeometry().center()
         qr.moveCenter(cp)
         self.move(qr.topLeft())
 
 
-class LineEdit(QtWidgets.QLineEdit):
+class LineEdit(QtGui.QLineEdit):
 
     def __init__(self, parent=None):
         super(LineEdit, self).__init__(parent)
@@ -43,27 +39,25 @@ class LineEdit(QtWidgets.QLineEdit):
         del menu
 
 
-class QRightClickButton(QtWidgets.QPushButton):
+class QRightClickButton(QtGui.QPushButton):
     """
     Button with right click support
     """
 
-    rightClicked = QtCore.pyqtSignal()
-
     def __init__(self, parent):
         super(QRightClickButton, self).__init__(parent)
 
     def mousePressEvent(self, event):
         if event.button() == QtCore.Qt.RightButton:
-            self.rightClicked.emit()
+            self.emit(QtCore.SIGNAL("rightClicked()"))
         else:
             super(QRightClickButton, self).mousePressEvent(event)
 
 
-class RubberBand(QtWidgets.QRubberBand):
+class RubberBand(QtGui.QRubberBand):
 
     def __init__(self):
-        super(RubberBand, self).__init__(QtWidgets.QRubberBand.Rectangle, None)
+        super(RubberBand, self).__init__(QtGui.QRubberBand.Rectangle, None)
         self.setPalette(QtGui.QPalette(QtCore.Qt.transparent))
         self.pen = QtGui.QPen(QtCore.Qt.blue, 4)
         self.pen.setStyle(QtCore.Qt.SolidLine)
@@ -85,21 +79,29 @@ def create_menu(menu):
         text = action.text()
         if 'Link Location' in text:
             text = text.replace('Copy &Link Location',
-                                QtWidgets.QApplication.translate("MainWindow", "Copy link location"))
+                                QtGui.QApplication.translate("MainWindow", "Copy link location", None,
+                                                             QtGui.QApplication.UnicodeUTF8))
         elif '&Copy' in text:
-            text = text.replace('&Copy', QtWidgets.QApplication.translate("MainWindow", "Copy"))
+            text = text.replace('&Copy', QtGui.QApplication.translate("MainWindow", "Copy", None,
+                                                                      QtGui.QApplication.UnicodeUTF8))
         elif 'All' in text:
-            text = text.replace('Select All', QtWidgets.QApplication.translate("MainWindow", "Select all"))
+            text = text.replace('Select All', QtGui.QApplication.translate("MainWindow", "Select all", None,
+                                                                           QtGui.QApplication.UnicodeUTF8))
         elif 'Delete' in text:
-            text = text.replace('Delete', QtWidgets.QApplication.translate("MainWindow", "Delete"))
+            text = text.replace('Delete', QtGui.QApplication.translate("MainWindow", "Delete", None,
+                                                                       QtGui.QApplication.UnicodeUTF8))
         elif '&Paste' in text:
-            text = text.replace('&Paste', QtWidgets.QApplication.translate("MainWindow", "Paste"))
+            text = text.replace('&Paste', QtGui.QApplication.translate("MainWindow", "Paste", None,
+                                                                       QtGui.QApplication.UnicodeUTF8))
         elif 'Cu&t' in text:
-            text = text.replace('Cu&t', QtWidgets.QApplication.translate("MainWindow", "Cut"))
+            text = text.replace('Cu&t', QtGui.QApplication.translate("MainWindow", "Cut", None,
+                                                                     QtGui.QApplication.UnicodeUTF8))
         elif '&Undo' in text:
-            text = text.replace('&Undo', QtWidgets.QApplication.translate("MainWindow", "Undo"))
+            text = text.replace('&Undo', QtGui.QApplication.translate("MainWindow", "Undo", None,
+                                                                      QtGui.QApplication.UnicodeUTF8))
         elif '&Redo' in text:
-            text = text.replace('&Redo', QtWidgets.QApplication.translate("MainWindow", "Redo"))
+            text = text.replace('&Redo', QtGui.QApplication.translate("MainWindow", "Redo", None,
+                                                                      QtGui.QApplication.UnicodeUTF8))
         else:
             menu.removeAction(action)
             continue
@@ -115,12 +117,12 @@ class MultilineEdit(CenteredWidget):
         self.setMinimumSize(QtCore.QSize(350, 200))
         self.setMaximumSize(QtCore.QSize(350, 200))
         self.setWindowTitle(title)
-        self.edit = QtWidgets.QTextEdit(self)
+        self.edit = QtGui.QTextEdit(self)
         self.edit.setGeometry(QtCore.QRect(0, 0, 350, 150))
         self.edit.setText(text)
-        self.button = QtWidgets.QPushButton(self)
+        self.button = QtGui.QPushButton(self)
         self.button.setGeometry(QtCore.QRect(0, 150, 350, 50))
-        self.button.setText(QtWidgets.QApplication.translate("MainWindow", "Save"))
+        self.button.setText(QtGui.QApplication.translate("MainWindow", "Save", None, QtGui.QApplication.UnicodeUTF8))
         self.button.clicked.connect(self.button_click)
         self.center()
         self.save = save