Fix group join by chat id

.gitignore

@@ -1,17 +1,23 @@
 *.pyc
 *.pyo
 *.ui
-src/toxcore
+toxygen/toxcore
 tests/tests
 tests/libs
 tests/.cache
 tests/__pycache__
-src/libs
+toxygen/libs
 .idea
 *~
 *.iml
 *.so
 *.log
-src/build
-src/dist
+toxygen/build
+toxygen/dist
 *.spec
+dist/
+toxygen/avatars
+toxygen/__pycache__
+/*.egg-info
+/*.egg
+

MANIFEST.in

@@ -0,0 +1,18 @@
+include toxygen/images/*.png
+include toxygen/images/*.ico
+include toxygen/images/*.gif
+include toxygen/sounds/*.wav
+include toxygen/stickers/tox/*.png
+include toxygen/smileys/default/*.png
+include toxygen/smileys/default/config.json
+include toxygen/smileys/animated/*.gif
+include toxygen/smileys/animated/config.json
+include toxygen/smileys/starwars/*.gif
+include toxygen/smileys/starwars/*.png
+include toxygen/smileys/starwars/config.json
+include toxygen/styles/style.qss
+include toxygen/translations/*.qm
+include toxygen/libs/libtox.dll
+include toxygen/libs/libsodium.a
+include toxygen/libs/libtox64.dll
+include toxygen/libs/libsodium64.a

docs/install.md

@@ -3,17 +3,33 @@
 ## Use precompiled binary:
 [Check our releases page](https://github.com/xveduk/toxygen/releases)
 
+##Using pip3
+
+### Windows  (32-bit interpreter)
+
+``pip3.4 install toxygen``
+Run app using ``toxygen`` command.
+
+##Linux
+
+1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
+2. Install PortAudio: 
+``sudo apt-get install portaudio19-dev``
+3. Install toxygen: 
+``sudo pip3.4 install toxygen``
+4 Run toxygen using ``toxygen`` command.
+
 ## 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) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
-3. Install PyAudio: ``pip3 install pyaudio``
+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 \src\main.py
+7. Run \src\main.py.
 
 [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)
 
@@ -30,19 +46,14 @@ Dependencies:
 
 1. Install latest Python3.4: 
 ``sudo apt-get install python3``
-2. [Install PySide](https://wiki.qt.io/PySide_Binaries_Linux) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
+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: 
-```bash
-sudo apt-get install portaudio19-dev
-sudo apt-get install python3-pyaudio
-```
-Toxygen:
-
-1. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
-2. Unpack archive 
-3. Run app:
-``python3 main.py``
+``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``
 
 ## Compile Toxygen
 Check [compile.md](/docs/compile.md) for more info

docs/plugin_api.md

@@ -3,7 +3,7 @@
 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. 
 
-Every plugin has it's own full name and unique short name (1-5 symbols). Main app can get it using special methods. 
+Every plugin has its own full name and unique short name (1-5 symbols). Main app can get it using special methods. 
 
 All plugin's data should be stored in following structure:
 
@@ -16,36 +16,39 @@ All plugin's data should be stored in following structure:
 	|---other_files
 ```
 
+Plugin MUST override:
+-  __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. 
-- get_menu - plugins allowed to add items in friend menu. You can open this menu making right click on friend in friends list. This method should return list of QAction's. Plugin must connect to QAction's triggered() signal. 
+- get_menu - plugins allowed to add items in friend menu. User can open this menu making right click on friend in friends list. This method should return list of QAction's. Plugin must connect to QAction's triggered() signal. 
 - get_window - plugins can have GUI, this method should return window instance or None for plugins without GUI.
 - start - plugin was started.
 - stop - plugin was stopped.
 - close - app is closing, stop plugin.
-- command - new command to plugin. Command can be entered in message field in format '/plugin <plugin_short_name> <command>'. Command 'help' should show user list of supported commands.
+- command - new command to plugin. Command can be entered in message field in format '/plugin <plugin_short_name> <command>'. Command 'help' should show list of supported commands.
 - lossless_packet - callback - incoming lossless packet from friend.
 - lossy_packet - callback - incoming lossy packet from friend.
-- friend_connected - callback - friend became online.
+- friend_connected - callback - friend became online. Note that it called from friend_connection_status callback so friend is not really connected and ready for sending packets.
 
 Other methods:
-- send_lossless - this method send custom lossless packet. Plugins MUST send lossless packets using this method.
-- send_lossy - this method send custom lossy packet. Plugins MUST send lossy packets using this method.
+- send_lossless - this method sends custom lossless packet. Plugins MUST send lossless packets using this method.
+- send_lossy - this method sends custom lossy packet. Plugins MUST send lossy packets using this method.
 - load_settings - loads settings stored in default location.
 - save_settings - saves settings to default location.
-- load_translator - loads translations. Translations must be stored in directory with plugin's data. Files with translations must have the same name as in main app.
+- load_translator - loads translations. Translations must be stored in directory with plugin's data. Files with translations must have the same name as in main app (example: ru_RU.qm).
 
 About import:
 
-import statement will not work in case you import module that wasn't previously imported by main program and user use precompiled binary. It's recommended to use dynamic import instead.
+Import statement will not work in case you import module that wasn't previously imported by main program and user uses precompiled binary. It's recommended to use importlib module instead: importlib.import_module(module_name)
 
 About GUI:
 
-It's strictly recommended to support both PySide and PyQt4 in GUI. Plugin can not have GUI at all.
+It's strictly recommended to support both PySide and PyQt4 in GUI. Plugin can have no GUI at all.
 
 Exceptions:
 
-Plugin's methods should not raise exceptions.
+Plugin's methods MUST NOT raise exceptions.
 
 #Examples
 

docs/plugins.md

@@ -10,7 +10,7 @@ Check [Plugin API](/docs/plugin_api.md) for more info
 
 Toxygen comes without preinstalled plugins.
 
-1. Put plugin and directory with its data into /src/plugins/
+1. Put plugin and directory with its data into /src/plugins/ or import it via GUI (In menu: Plugins -> Import plugin)
 2. Restart Toxygen
 
 ##Note: /src/plugins/ should contain plugin_super_class.py and __init__.py

docs/smileys_and_stickers.md

@@ -8,4 +8,6 @@ Animated smileys (.gif) are supported too.
 
 #Stickers
 
-Sticker is inline image. If you want to create your own smiley pack, create directory in src/stickers/ and place your stickers there.
+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 plugins and stickers packs using menu: Settings -> Interface

setup.py

@@ -0,0 +1,51 @@
+from setuptools import setup
+from setuptools.command.install import install
+from platform import system
+from subprocess import call
+from toxygen.util import program_version
+
+
+version = program_version + '.0'
+
+MODULES = ['PyAudio']
+
+if system() == 'Windows':
+    MODULES.append('PySide')
+
+
+class InstallScript(install):
+    """This class configures Toxygen after installation"""
+
+    def run(self):
+        install.run(self)
+        OS = system()
+        if OS == 'Windows':
+            call(["toxygen", "--configure"])
+        elif OS == 'Linux':
+            call(["toxygen", "--clean"])
+
+setup(name='Toxygen',
+      version=version,
+      description='Toxygen - Tox client',
+      long_description='Toxygen is powerful Tox client written in Python3',
+      url='https://github.com/xveduk/toxygen/',
+      keywords='toxygen tox messenger',
+      author='Ingvar',
+      maintainer='Ingvar',
+      license='GPL3',
+      packages=['toxygen', 'toxygen.plugins', 'toxygen.styles'],
+      install_requires=MODULES,
+      include_package_data=True,
+      classifiers=[
+          'Programming Language :: Python :: 3 :: Only',
+          'Programming Language :: Python :: 3.2',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+      ],
+      entry_points={
+          'console_scripts': ['toxygen=toxygen.main:main'],
+      },
+      cmdclass={
+          'install': InstallScript,
+      },
+      )

src/passwordscreen.py

@@ -1,77 +0,0 @@
-from widgets import CenteredWidget, LineEdit
-try:
-    from PySide import QtCore, QtGui
-except ImportError:
-    from PyQt4 import QtCore, QtGui
-
-
-class PasswordArea(LineEdit):
-
-    def __init__(self, parent):
-        super(PasswordArea, self).__init__(parent)
-        self.parent = parent
-        self.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
-
-    def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_Return:
-            self.parent.button_click()
-        else:
-            super(PasswordArea, self).keyPressEvent(event)
-
-
-class PasswordScreen(CenteredWidget):
-
-    def __init__(self, encrypt, data):
-        super(PasswordScreen, self).__init__()
-        self._encrypt = encrypt
-        self._data = data
-        self.initUI()
-
-    def initUI(self):
-        self.resize(360, 170)
-        self.setMinimumSize(QtCore.QSize(360, 170))
-        self.setMaximumSize(QtCore.QSize(360, 170))
-
-        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 = 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 = QtGui.QLabel(self)
-        self.warning.setGeometry(QtCore.QRect(30, 130, 300, 30))
-        self.warning.setStyleSheet('QLabel { color: #F70D1A; }')
-        self.warning.setVisible(False)
-
-        self.retranslateUi()
-        self.center()
-        QtCore.QMetaObject.connectSlotsByName(self)
-
-    def button_click(self):
-        if self.password.text():
-            try:
-                self._encrypt.set_password(self.password.text())
-                new_data = self._encrypt.pass_decrypt(self._data[0])
-            except Exception as ex:
-                self.warning.setVisible(True)
-                print('Decryption error:', ex)
-            else:
-                self._data[0] = new_data
-                self.close()
-
-    def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_Enter:
-            self.button_click()
-        else:
-            super(PasswordScreen, self).keyPressEvent(event)
-
-    def retranslateUi(self):
-        self.setWindowTitle(QtGui.QApplication.translate("pass", "Enter password", None, QtGui.QApplication.UnicodeUTF8))
-        self.enter_pass.setText(QtGui.QApplication.translate("pass", "Password:", None, QtGui.QApplication.UnicodeUTF8))
-        self.warning.setText(QtGui.QApplication.translate("pass", "Incorrect password", None, QtGui.QApplication.UnicodeUTF8))
-

src/tox_dns.py

@@ -1,30 +0,0 @@
-import json
-import urllib.request
-from util import log
-
-
-def tox_dns(email):
-    """
-    TOX DNS 4
-    :param email: data like 'groupbot@toxme.io'
-    :return: tox id on success else None
-    """
-    site = email.split('@')[1]
-    data = {"action": 3, "name": "{}".format(email)}
-    for url in ('https://{}/api'.format(site), 'http://{}/api'.format(site)):
-        try:
-            return send_request(url, data)
-        except Exception as ex:  # try http
-            log('TOX DNS ERROR: ' + str(ex))
-    return None  # error
-
-
-def send_request(url, data):
-    req = urllib.request.Request(url)
-    req.add_header('Content-Type', 'application/json')
-    response = urllib.request.urlopen(req, bytes(json.dumps(data), 'utf-8'))
-    res = json.loads(str(response.read(), 'utf-8'))
-    if not res['c']:
-        return res['tox_id']
-    else:
-        raise LookupError()

src/toxcore_enums_and_consts.py

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

tests/tests.py

@@ -1,40 +1,22 @@
-from src.bootstrap import node_generator
-from src.profile import *
-from src.settings import ProfileHelper
-from src.tox_dns import tox_dns
-from src.toxencryptsave import LibToxEncryptSave
+from toxygen.bootstrap import node_generator
+from toxygen.profile import *
+from toxygen.settings import ProfileHelper
+from toxygen.tox_dns import tox_dns
+import toxygen.toxencryptsave as encr
 
 
-class TestProfile():
+class TestProfile:
 
     def test_search(self):
         arr = ProfileHelper.find_profiles()
-        assert arr
         assert len(arr) >= 2
 
     def test_open(self):
         data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
         assert data
 
-    def test_open_save(self):
-        data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
-        ProfileHelper.get_instance().save_profile(data)
-        new_data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
-        assert new_data == data
 
-
-class TestNodeGen():
-
-    def test_generator(self):
-        for elem in node_generator():
-            assert len(elem) == 3
-
-    def test_ports(self):
-        for elem in node_generator():
-            assert elem[1] in [33445, 443, 5190, 2306, 1813]
-
-
-class TestTox():
+class TestTox:
 
     def test_loading(self):
         data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
@@ -45,16 +27,16 @@ class TestTox():
         del tox
 
     def test_creation(self):
-        name = 'Toxygen User'
-        status_message = 'Toxing on Toxygen'
+        name = b'Toxygen User'
+        status_message = b'Toxing on Toxygen'
         tox = tox_factory()
         tox.self_set_name(name)
         tox.self_set_status_message(status_message)
         data = tox.get_savedata()
         del tox
         tox = tox_factory(data)
-        assert tox.self_get_name() == name
-        assert tox.self_get_status_message() == status_message
+        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):
         data = ProfileHelper(Settings.get_default_path(), 'bob').open_profile()
@@ -67,7 +49,7 @@ class TestTox():
         del tox
 
 
-class TestDNS():
+class TestDNS:
 
     def test_dns(self):
         bot_id = '56A1ADE4B65B86BCD51CC73E2CD4E542179F47959FE3E0E21B4B0ACDADE51855D34D34D37CB5'
@@ -75,12 +57,13 @@ class TestDNS():
         assert tox_id == bot_id
 
 
-class TestEncryption():
+class TestEncryption:
 
     def test_encr_decr(self):
-        with open(settings.Settings.get_default_path() + '/alice.tox') as fl:
+        with open(settings.Settings.get_default_path() + '/alice.tox', 'rb') as fl:
             data = fl.read()
-        lib = LibToxEncryptSave('easypassword')
+        lib = encr.ToxEncryptSave()
+        lib.set_password('easypassword')
         copy_data = data[:]
         data = lib.pass_encrypt(data)
         data = lib.pass_decrypt(data)

toxygen/__init__.py

@@ -0,0 +1,8 @@
+import os
+import sys
+
+path = os.path.dirname(os.path.realpath(__file__))  # curr dir
+
+sys.path.insert(0, os.path.join(path, 'styles'))
+sys.path.insert(0, os.path.join(path, 'plugins'))
+sys.path.insert(0, path)

toxygen/basecontact.py

@@ -7,7 +7,7 @@ except ImportError:
 from toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE
 
 
-class Contact:
+class BaseContact:
     """
     Class encapsulating TOX contact
     Properties: name (alias of contact or name), status_message, status (connection status)
@@ -29,7 +29,7 @@ class Contact:
         self.load_avatar()
 
     # -----------------------------------------------------------------------------------------------------------------
-    # name - current name or alias of user
+    # Name - current name or alias of user
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_name(self):
@@ -43,7 +43,7 @@ class Contact:
     name = property(get_name, set_name)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Status message
+    # Status message or group topic
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_status_message(self):
@@ -82,19 +82,20 @@ class Contact:
     # Avatars
     # -----------------------------------------------------------------------------------------------------------------
 
-    def load_avatar(self):
+    def load_avatar(self, default_path='avatar.png'):
         """
         Tries to load avatar of contact or uses default avatar
         """
         avatar_path = '{}.png'.format(self._tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
         os.chdir(ProfileHelper.get_path() + 'avatars/')
         if not os.path.isfile(avatar_path):  # load default image
-            avatar_path = 'avatar.png'
+            avatar_path = default_path
             os.chdir(curr_directory() + '/images/')
-        pixmap = QtGui.QPixmap(QtCore.QSize(64, 64))
+        width = self._widget.avatar_label.width()
+        pixmap = QtGui.QPixmap(QtCore.QSize(width, width))
         pixmap.load(avatar_path)
         self._widget.avatar_label.setScaledContents(False)
-        self._widget.avatar_label.setPixmap(pixmap.scaled(64, 64, QtCore.Qt.KeepAspectRatio))
+        self._widget.avatar_label.setPixmap(pixmap.scaled(width, width, QtCore.Qt.KeepAspectRatio))
         self._widget.avatar_label.repaint()
 
     def reset_avatar(self):

toxygen/bootstrap.py

@@ -6,7 +6,7 @@ class Node:
         self._ip, self._port, self._tox_key, self.rand = ip, port, tox_key, rand
 
     def get_data(self):
-        return self._ip, self._port, self._tox_key
+        return bytes(self._ip, 'utf-8'), self._port, self._tox_key
 
 
 def node_generator():

toxygen/callbacks.py

@@ -62,7 +62,7 @@ def friend_status(tox, friend_num, new_status, user_data):
     """
     Check friend's status (none, busy, away)
     """
-    print("Friend's #{} status changed! New status: {}".format(friend_num, new_status))
+    print("Friend's #{} status changed!".format(friend_num))
     profile = Profile.get_instance()
     friend = profile.get_friend_by_number(friend_num)
     if friend.status is None and Settings.get_instance()['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
@@ -94,7 +94,7 @@ def friend_name(tox, friend_num, name, size, user_data):
     Friend changed his name
     """
     profile = Profile.get_instance()
-    print('New name: ', friend_num, name)
+    print('New name friend #' + str(friend_num))
     invoke_in_main_thread(profile.new_name, friend_num, name)
 
 
@@ -106,7 +106,7 @@ def friend_status_message(tox, friend_num, status_message, size, user_data):
     profile = Profile.get_instance()
     friend = profile.get_friend_by_number(friend_num)
     invoke_in_main_thread(friend.set_status_message, status_message)
-    print('User #{} has new status: {}'.format(friend_num, status_message))
+    print('User #{} has new status'.format(friend_num))
     invoke_in_main_thread(profile.send_messages, friend_num)
     if profile.get_active_number() == friend_num:
         invoke_in_main_thread(profile.set_active)
@@ -123,7 +123,7 @@ def friend_message(window, tray):
         invoke_in_main_thread(profile.new_message, friend_number, message_type, message)
         if not window.isActiveWindow():
             friend = profile.get_friend_by_number(friend_number)
-            if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
+            if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
                 invoke_in_main_thread(tray_notification, friend.name, message, tray, window)
             if settings['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
                 sound_notification(SOUND_NOTIFICATION['MESSAGE'])
@@ -178,14 +178,14 @@ def tox_file_recv(window, tray):
                                   file_name)
             if not window.isActiveWindow():
                 friend = profile.get_friend_by_number(friend_number)
-                if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
+                if settings['notifications'] and profile.status != TOX_USER_STATUS['BUSY'] and not settings.locked:
                     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'])
                 invoke_in_main_thread(tray.setIcon, QtGui.QIcon(curr_directory() + '/images/icon_new_messages.png'))
         else:  # AVATAR
-            print ('Avatar')
+            print('Avatar')
             invoke_in_main_thread(profile.incoming_avatar,
                                   friend_number,
                                   file_number,
@@ -287,6 +287,49 @@ def callback_audio(toxav, friend_number, samples, audio_samples_per_channel, aud
         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
 # -----------------------------------------------------------------------------------------------------------------
@@ -323,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,30 +1,37 @@
-import contact
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
+import basecontact
 from messages import *
 from history import *
-import util
 import file_transfers as ft
+import util
 
 
-class Friend(contact.Contact):
+class Contact(basecontact.BaseContact):
     """
-    Friend in list of friends. Can be hidden, properties 'has unread messages' and 'has alias' added
+    Class encapsulating TOX contact
+    Properties: name (alias of contact or name), status_message, status (connection status)
+    widget - widget for update
     """
 
-    def __init__(self, message_getter, number, *args):
+    def __init__(self, number, message_getter, name, status_message, widget, tox_id):
         """
-        :param message_getter: gets messages from db
-        :param number: number of friend.
+        :param name: name, example: 'Toxygen user'
+        :param status_message: status message, example: 'Toxing on Toxygen'
+        :param widget: ContactItem instance
+        :param tox_id: tox id of contact
         """
-        super(Friend, self).__init__(*args)
-        self._number = number
+        super().__init__(name, status_message, widget, tox_id)
+        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._receipts = 0
         self._curr_text = ''
 
     def __del__(self):
@@ -33,23 +40,6 @@ class Friend(contact.Contact):
         if hasattr(self, '_message_getter'):
             del self._message_getter
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # History support
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def get_receipts(self):
-        return self._receipts
-
-    receipts = property(get_receipts)  # read receipts
-
-    def inc_receipts(self):
-        self._receipts += 1
-
-    def dec_receipt(self):
-        if self._receipts:
-            self._receipts -= 1
-            self.mark_as_sent()
-
     def load_corr(self, first_time=True):
         """
         :param first_time: friend became active, load first part of messages
@@ -112,6 +102,14 @@ class Friend(contact.Contact):
             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]
@@ -132,7 +130,7 @@ class Friend(contact.Contact):
             self._unsaved_messages = 0
         else:
             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']),
+                                               or (x.get_type() <= 1 and x.get_owner() == MESSAGE_OWNER['NOT_SENT']),
                                      self._corr))
             self._unsaved_messages = len(self.get_unsent_messages())
 
@@ -144,50 +142,6 @@ class Friend(contact.Contact):
 
     curr_text = property(get_curr_text, set_curr_text)
 
-    # -----------------------------------------------------------------------------------------------------------------
-    # 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))
-
-    # -----------------------------------------------------------------------------------------------------------------
-    # Alias support
-    # -----------------------------------------------------------------------------------------------------------------
-
-    def set_name(self, value):
-        """
-        Set new name or ignore if alias exists
-        :param value: new name
-        """
-        if not self._alias:
-            super(Friend, self).set_name(value)
-
-    def set_alias(self, alias):
-        self._alias = bool(alias)
-
     # -----------------------------------------------------------------------------------------------------------------
     # Visibility in friends' list
     # -----------------------------------------------------------------------------------------------------------------
@@ -201,7 +155,7 @@ class Friend(contact.Contact):
     visibility = property(get_visibility, set_visibility)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Unread messages from friend
+    # Unread messages and actions
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_actions(self):
@@ -231,7 +185,7 @@ class Friend(contact.Contact):
     messages = property(get_messages)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Friend's number (can be used in toxcore)
+    # Number (can be used in toxcore)
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_number(self):
@@ -241,3 +195,18 @@ class Friend(contact.Contact):
         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/friend.py

@@ -0,0 +1,64 @@
+import contact
+from messages import *
+
+
+class Friend(contact.Contact):
+    """
+    Friend in list of friends. Can be hidden, properties 'has unread messages' and 'has alias' added
+    """
+
+    def __init__(self, *args):
+        """
+        :param number: number of friend.
+        """
+        super(Friend, self).__init__(*args)
+        self._receipts = 0
+
+    def __del__(self):
+        super().__del__()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # History support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_receipts(self):
+        return self._receipts
+
+    receipts = property(get_receipts)  # read receipts
+
+    def inc_receipts(self):
+        self._receipts += 1
+
+    def dec_receipt(self):
+        if self._receipts:
+            self._receipts -= 1
+            self.mark_as_sent()
+
+    # -----------------------------------------------------------------------------------------------------------------
+    # 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

@@ -3,11 +3,13 @@ from sqlite3 import connect
 import settings
 from os import chdir
 import os.path
-from toxencryptsave import LibToxEncryptSave
+from toxencryptsave import ToxEncryptSave
 
 
 PAGE_SIZE = 42
 
+SAVE_MESSAGES = 150
+
 MESSAGE_OWNER = {
     'ME': 0,
     'FRIEND': 1,
@@ -22,7 +24,7 @@ class History:
         chdir(settings.ProfileHelper.get_path())
         path = settings.ProfileHelper.get_path() + self._name + '.hstr'
         if os.path.exists(path):
-            decr = LibToxEncryptSave.get_instance()
+            decr = ToxEncryptSave.get_instance()
             try:
                 with open(path, 'rb') as fin:
                     data = fin.read()
@@ -40,7 +42,7 @@ class History:
         db.close()
 
     def save(self):
-        encr = LibToxEncryptSave.get_instance()
+        encr = ToxEncryptSave.get_instance()
         if encr.has_password():
             path = settings.ProfileHelper.get_path() + self._name + '.hstr'
             with open(path, 'rb') as fin:
@@ -54,7 +56,7 @@ class History:
         new_path = directory + self._name + '.hstr'
         with open(path, 'rb') as fin:
             data = fin.read()
-        encr = LibToxEncryptSave.get_instance()
+        encr = ToxEncryptSave.get_instance()
         if encr.has_password():
             data = encr.pass_encrypt(data)
         with open(new_path, 'wb') as fout:

toxygen/list_items.py

@@ -167,26 +167,28 @@ class ContactItem(QtGui.QWidget):
 
     def __init__(self, parent=None):
         QtGui.QWidget.__init__(self, parent)
-        self.setBaseSize(QtCore.QSize(250, 70))
+        mode = settings.Settings.get_instance()['compact_mode']
+        self.setBaseSize(QtCore.QSize(250, 40 if mode else 70))
         self.avatar_label = QtGui.QLabel(self)
-        self.avatar_label.setGeometry(QtCore.QRect(3, 3, 64, 64))
+        size = 32 if mode else 64
+        self.avatar_label.setGeometry(QtCore.QRect(3, 4, size, size))
         self.avatar_label.setScaledContents(True)
         self.name = DataLabel(self)
-        self.name.setGeometry(QtCore.QRect(75, 10, 150, 25))
+        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("Times New Roman")
-        font.setPointSize(12)
+        font.setPointSize(10 if mode else 12)
         font.setBold(True)
         self.name.setFont(font)
         self.status_message = DataLabel(self)
-        self.status_message.setGeometry(QtCore.QRect(75, 30, 170, 20))
+        self.status_message.setGeometry(QtCore.QRect(50 if mode else 75, 20 if mode else 30, 170, 15 if mode else 20))
         font.setPointSize(10)
         font.setBold(False)
         self.status_message.setFont(font)
         self.connection_status = StatusCircle(self)
-        self.connection_status.setGeometry(QtCore.QRect(230, 5, 32, 32))
+        self.connection_status.setGeometry(QtCore.QRect(230, -2 if mode else 5, 32, 32))
         self.messages = UnreadMessagesCount(self)
-        self.messages.setGeometry(QtCore.QRect(52, 50, 30, 20))
+        self.messages.setGeometry(QtCore.QRect(20 if mode else 52, 20 if mode else 50, 30, 20))
 
 
 class StatusCircle(QtGui.QWidget):
@@ -349,7 +351,7 @@ class FileTransferItem(QtGui.QListWidget):
             directory = QtGui.QFileDialog.getExistingDirectory(self,
                                                                QtGui.QApplication.translate("MainWindow", 'Choose folder', None, QtGui.QApplication.UnicodeUTF8),
                                                                curr_directory(),
-                                                               QtGui.QFileDialog.ShowDirsOnly)
+                                                               QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
             self.pb.setVisible(True)
             if directory:
                 pr = profile.Profile.get_instance()
@@ -483,7 +485,7 @@ class InlineImageItem(QtGui.QScrollArea):
                                                                                             'Choose folder', None,
                                                                                             QtGui.QApplication.UnicodeUTF8),
                                                                curr_directory(),
-                                                               QtGui.QFileDialog.ShowDirsOnly)
+                                                               QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
             if directory:
                 fl = QtCore.QFile(directory + '/toxygen_inline_' + curr_time().replace(':', '_') + '.png')
                 self._pixmap.save(fl, 'PNG')

toxygen/main.py

@@ -1,5 +1,6 @@
 import sys
 from loginscreen import LoginScreen
+import profile
 from settings import *
 try:
     from PySide import QtCore, QtGui
@@ -7,13 +8,11 @@ except ImportError:
     from PyQt4 import QtCore, QtGui
 from bootstrap import node_generator
 from mainscreen import MainWindow
-from profile import tox_factory
 from callbacks import init_callbacks
-from util import curr_directory
+from util import curr_directory, program_version
 import styles.style
 import toxencryptsave
-from passwordscreen import PasswordScreen
-import profile
+from passwordscreen import PasswordScreen, UnlockAppScreen, SetProfilePasswordScreen
 from plugin_support import PluginLoader
 
 
@@ -36,7 +35,7 @@ class Toxygen:
         Show password screen
         """
         tmp = [data]
-        p = PasswordScreen(toxencryptsave.LibToxEncryptSave.get_instance(), tmp)
+        p = PasswordScreen(toxencryptsave.ToxEncryptSave.get_instance(), tmp)
         p.show()
         self.app.connect(self.app, QtCore.SIGNAL("lastWindowClosed()"), self.app, QtCore.SLOT("quit()"))
         self.app.exec_()
@@ -58,7 +57,7 @@ class Toxygen:
             dark_style = fl.read()
         app.setStyleSheet(dark_style)
 
-        encrypt_save = toxencryptsave.LibToxEncryptSave()
+        encrypt_save = toxencryptsave.ToxEncryptSave()
 
         if self.path is not None:
             path = os.path.dirname(self.path) + '/'
@@ -67,7 +66,7 @@ class Toxygen:
             if encrypt_save.is_data_encrypted(data):
                 data = self.enter_pass(data)
             settings = Settings(name)
-            self.tox = tox_factory(data, settings)
+            self.tox = profile.tox_factory(data, settings)
         else:
             auto_profile = Settings.get_auto_profile()
             if not auto_profile[0]:
@@ -95,12 +94,39 @@ class Toxygen:
                 elif _login.t == 1:  # create new profile
                     _login.name = _login.name.strip()
                     name = _login.name if _login.name else 'toxygen_user'
-                    self.tox = tox_factory()
+                    pr = map(lambda x: x[1], ProfileHelper.find_profiles())
+                    if name in list(pr):
+                        msgBox = QtGui.QMessageBox()
+                        msgBox.setWindowTitle(
+                            QtGui.QApplication.translate("MainWindow", "Error", None, QtGui.QApplication.UnicodeUTF8))
+                        text = (QtGui.QApplication.translate("MainWindow",
+                                                             '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 = QtGui.QMessageBox.question(None,
+                                                       'Profile {}'.format(name),
+                                                       QtGui.QApplication.translate("login",
+                                                                                    'Do you want to set profile password?',
+                                                                                    None,
+                                                                                    QtGui.QApplication.UnicodeUTF8),
+                                                       QtGui.QMessageBox.Yes,
+                                                       QtGui.QMessageBox.No)
+                    if reply == QtGui.QMessageBox.Yes:
+                        set_pass = SetProfilePasswordScreen(encrypt_save)
+                        set_pass.show()
+                        self.app.connect(self.app, QtCore.SIGNAL("lastWindowClosed()"), self.app, QtCore.SLOT("quit()"))
+                        self.app.exec_()
                     ProfileHelper(Settings.get_default_path(), name).save_profile(self.tox.get_savedata())
                     path = Settings.get_default_path()
                     settings = Settings(name)
+                    if curr_lang in langs:
+                        settings['language'] = curr_lang
+                    settings.save()
                 else:  # load existing profile
                     path, name = _login.get_data()
                     if _login.default:
@@ -109,19 +135,19 @@ class Toxygen:
                     if encrypt_save.is_data_encrypted(data):
                         data = self.enter_pass(data)
                     settings = Settings(name)
-                    self.tox = tox_factory(data, settings)
+                    self.tox = profile.tox_factory(data, settings)
             else:
                 path, name = auto_profile
                 data = ProfileHelper(path, name).open_profile()
                 if encrypt_save.is_data_encrypted(data):
                     data = self.enter_pass(data)
                 settings = Settings(name)
-                self.tox = tox_factory(data, settings)
+                self.tox = profile.tox_factory(data, settings)
 
         if Settings.is_active_profile(path, name):  # profile is in use
             reply = QtGui.QMessageBox.question(None,
                                                'Profile {}'.format(name),
-                                               QtGui.QApplication.translate("login", 'Looks like other instance of Toxygen uses this profile! Continue?', None, QtGui.QApplication.UnicodeUTF8),
+                                               QtGui.QApplication.translate("login", 'Other instance of Toxygen uses this profile or profile was not properly closed. Continue?', None, QtGui.QApplication.UnicodeUTF8),
                                                QtGui.QMessageBox.Yes,
                                                QtGui.QMessageBox.No)
             if reply != QtGui.QMessageBox.Yes:
@@ -151,7 +177,7 @@ class Toxygen:
             def aboutToShow(self):
                 status = profile.Profile.get_instance().status
                 act = self.act
-                if status is None:
+                if status is None or Settings.get_instance().locked:
                     self.actions()[1].setVisible(False)
                 else:
                     self.actions()[1].setVisible(True)
@@ -159,6 +185,7 @@ class Toxygen:
                     act.actions()[1].setChecked(False)
                     act.actions()[2].setChecked(False)
                     act.actions()[status].setChecked(True)
+                self.actions()[2].setVisible(not Settings.get_instance().locked)
 
             def languageChange(self, *args, **kwargs):
                 self.actions()[0].setText(QtGui.QApplication.translate('tray', 'Open Toxygen', None, QtGui.QApplication.UnicodeUTF8))
@@ -181,10 +208,19 @@ class Toxygen:
         exit = m.addAction(QtGui.QApplication.translate('tray', 'Exit', None, QtGui.QApplication.UnicodeUTF8))
 
         def show_window():
-            if not self.ms.isActiveWindow():
-                self.ms.setWindowState(self.ms.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
-                self.ms.activateWindow()
-            self.ms.show()
+            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 Settings.get_instance().locked:
+                show()
+            else:
+                def correct_pass():
+                    show()
+                    Settings.get_instance().locked = False
+                self.p = UnlockAppScreen(toxencryptsave.ToxEncryptSave.get_instance(), correct_pass)
+                self.p.show()
 
         m.connect(show, QtCore.SIGNAL("triggered()"), show_window)
         m.connect(exit, QtCore.SIGNAL("triggered()"), lambda: app.exit())
@@ -243,7 +279,7 @@ class Toxygen:
         ProfileHelper.get_instance().save_profile(data)
         del self.tox
         # create new tox instance
-        self.tox = tox_factory(data, Settings.get_instance())
+        self.tox = profile.tox_factory(data, Settings.get_instance())
         # init thread
         self.init = self.InitThread(self.tox, self.ms, self.tray)
         self.init.start()
@@ -280,6 +316,7 @@ class Toxygen:
                     if self.stop:
                         return
                     self.tox.bootstrap(*data)
+                    self.tox.add_tcp_relay(*data)
             except:
                 pass
             for _ in range(10):
@@ -292,6 +329,7 @@ class Toxygen:
                         if self.stop:
                             return
                         self.tox.bootstrap(*data)
+                        self.tox.add_tcp_relay(*data)
                 except:
                     pass
                 finally:
@@ -342,9 +380,56 @@ class Toxygen:
             return self.arr[self.num]
 
 
-if __name__ == '__main__':
+def clean():
+    """Removes all windows libs from libs folder"""
+    d = curr_directory() + '/libs/'
+    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 = sys.maxsize > 2 ** 32
+    if not is_64bits:
+        if os.path.exists(d + 'libtox64.dll'):
+            os.remove(d + 'libtox64.dll')
+        if os.path.exists(d + 'libsodium64.a'):
+            os.remove(d + 'libsodium64.a')
+    else:
+        if os.path.exists(d + 'libtox.dll'):
+            os.remove(d + 'libtox.dll')
+        if os.path.exists(d + 'libsodium.a'):
+            os.remove(d + 'libsodium.a')
+        try:
+            os.rename(d + 'libtox64.dll', d + 'libtox.dll')
+            os.rename(d + 'libsodium64.a', d + 'libsodium.a')
+        except:
+            pass
+
+
+def main():
     if len(sys.argv) == 1:
         toxygen = Toxygen()
-    else:  # path to profile or tox: uri
-        toxygen = Toxygen(sys.argv[1])
+    else:  # started with argument(s)
+        arg = sys.argv[1]
+        if arg == '--version':
+            print('Toxygen ' + program_version)
+            return
+        elif arg == '--help':
+            print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version')
+            return
+        elif arg == '--configure':
+            configure()
+            return
+        elif arg == '--clean':
+            clean()
+            return
+        else:
+            toxygen = Toxygen(arg)
     toxygen.main()
+
+
+if __name__ == '__main__':
+    main()

toxygen/mainscreen.py

@@ -16,6 +16,8 @@ class MainWindow(QtGui.QMainWindow):
         self.tray = tray
         self.setAcceptDrops(True)
         self.initUI(tox)
+        if settings.Settings.get_instance()['show_welcome_screen']:
+            self.ws = WelcomeScreen()
 
     def setup_menu(self, MainWindow):
         self.menubar = QtGui.QMenuBar(MainWindow)
@@ -27,6 +29,8 @@ class MainWindow(QtGui.QMainWindow):
 
         self.menuProfile = QtGui.QMenu(self.menubar)
         self.menuProfile.setObjectName("menuProfile")
+        self.menuGroupChats = QtGui.QMenu(self.menubar)
+        self.menuGroupChats.setObjectName("menuGroupChats")
         self.menuSettings = QtGui.QMenu(self.menubar)
         self.menuSettings.setObjectName("menuSettings")
         self.menuPlugins = QtGui.QMenu(self.menubar)
@@ -36,8 +40,8 @@ class MainWindow(QtGui.QMainWindow):
 
         self.actionAdd_friend = QtGui.QAction(MainWindow)
         self.actionAdd_friend.setObjectName("actionAdd_friend")
-        self.actionProfile_settings = QtGui.QAction(MainWindow)
-        self.actionProfile_settings.setObjectName("actionProfile_settings")
+        self.actionprofilesettings = QtGui.QAction(MainWindow)
+        self.actionprofilesettings.setObjectName("actionprofilesettings")
         self.actionPrivacy_settings = QtGui.QAction(MainWindow)
         self.actionPrivacy_settings.setObjectName("actionPrivacy_settings")
         self.actionInterface_settings = QtGui.QAction(MainWindow)
@@ -52,16 +56,27 @@ class MainWindow(QtGui.QMainWindow):
         self.actionSettings.setObjectName("actionSettings")
         self.audioSettings = QtGui.QAction(MainWindow)
         self.pluginData = QtGui.QAction(MainWindow)
+        self.importPlugin = QtGui.QAction(MainWindow)
+        self.lockApp = QtGui.QAction(MainWindow)
+        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)
         self.menuSettings.addAction(self.actionPrivacy_settings)
         self.menuSettings.addAction(self.actionInterface_settings)
         self.menuSettings.addAction(self.actionNotifications)
         self.menuSettings.addAction(self.actionNetwork)
         self.menuSettings.addAction(self.audioSettings)
         self.menuPlugins.addAction(self.pluginData)
+        self.menuPlugins.addAction(self.importPlugin)
         self.menuAbout.addAction(self.actionAbout_program)
         self.menubar.addAction(self.menuProfile.menuAction())
+        self.menubar.addAction(self.menuGroupChats.menuAction())
         self.menubar.addAction(self.menuSettings.menuAction())
         self.menubar.addAction(self.menuPlugins.menuAction())
         self.menubar.addAction(self.menuAbout.menuAction())
@@ -75,6 +90,12 @@ class MainWindow(QtGui.QMainWindow):
         self.actionNotifications.triggered.connect(self.notification_settings)
         self.audioSettings.triggered.connect(self.audio_settings)
         self.pluginData.triggered.connect(self.plugins_menu)
+
+        self.lockApp.triggered.connect(self.lock_app)
+        self.importPlugin.triggered.connect(self.import_plugin)
+        self.createGC.triggered.connect(self.create_groupchat)
+        self.joinGC.triggered.connect(self.join_groupchat)
+
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def languageChange(self, *args, **kwargs):
@@ -86,13 +107,18 @@ class MainWindow(QtGui.QMainWindow):
         return super(MainWindow, self).event(event)
 
     def retranslateUi(self):
+        self.joinGC.setText(QtGui.QApplication.translate("MainWindow", "Join group chat", None, QtGui.QApplication.UnicodeUTF8))
+        self.lockApp.setText(QtGui.QApplication.translate("MainWindow", "Lock", None, QtGui.QApplication.UnicodeUTF8))
+        self.menuGroupChats.setTitle(QtGui.QApplication.translate("MainWindow", "Group chats", None, QtGui.QApplication.UnicodeUTF8))
+        self.createGC.setText(QtGui.QApplication.translate("MainWindow", "Create group chat", None, QtGui.QApplication.UnicodeUTF8))
+        self.gcRequests.setText(QtGui.QApplication.translate("MainWindow", "Groupchat requests", None, QtGui.QApplication.UnicodeUTF8))
         self.menuPlugins.setTitle(QtGui.QApplication.translate("MainWindow", "Plugins", None, QtGui.QApplication.UnicodeUTF8))
         self.pluginData.setText(QtGui.QApplication.translate("MainWindow", "List of plugins", None, QtGui.QApplication.UnicodeUTF8))
         self.menuProfile.setTitle(QtGui.QApplication.translate("MainWindow", "Profile", None, QtGui.QApplication.UnicodeUTF8))
         self.menuSettings.setTitle(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
         self.menuAbout.setTitle(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
         self.actionAdd_friend.setText(QtGui.QApplication.translate("MainWindow", "Add contact", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionProfile_settings.setText(QtGui.QApplication.translate("MainWindow", "Profile", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionprofilesettings.setText(QtGui.QApplication.translate("MainWindow", "Profile", None, QtGui.QApplication.UnicodeUTF8))
         self.actionPrivacy_settings.setText(QtGui.QApplication.translate("MainWindow", "Privacy", None, QtGui.QApplication.UnicodeUTF8))
         self.actionInterface_settings.setText(QtGui.QApplication.translate("MainWindow", "Interface", None, QtGui.QApplication.UnicodeUTF8))
         self.actionNotifications.setText(QtGui.QApplication.translate("MainWindow", "Notifications", None, QtGui.QApplication.UnicodeUTF8))
@@ -107,6 +133,7 @@ class MainWindow(QtGui.QMainWindow):
         self.online_contacts.addItem(QtGui.QApplication.translate("MainWindow", "All", None, QtGui.QApplication.UnicodeUTF8))
         self.online_contacts.addItem(QtGui.QApplication.translate("MainWindow", "Online", None, QtGui.QApplication.UnicodeUTF8))
         self.online_contacts.setCurrentIndex(int(Settings.get_instance()['show_online_friends']))
+        self.importPlugin.setText(QtGui.QApplication.translate("MainWindow", "Import plugin", None, QtGui.QApplication.UnicodeUTF8))
 
     def setup_right_bottom(self, Form):
         Form.resize(650, 60)
@@ -210,6 +237,11 @@ class MainWindow(QtGui.QMainWindow):
         font.setBold(False)
         self.account_status.setFont(font)
         self.account_status.setObjectName("account_status")
+
+        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")
@@ -387,15 +419,61 @@ class MainWindow(QtGui.QMainWindow):
         self.audio_s = AudioSettings()
         self.audio_s.show()
 
+    def import_plugin(self):
+        import util
+        directory = QtGui.QFileDialog.getExistingDirectory(self,
+                                                           QtGui.QApplication.translate("MainWindow", 'Choose folder with plugin',
+                                                                                        None,
+                                                                                        QtGui.QApplication.UnicodeUTF8),
+                                                           util.curr_directory(),
+                                                           QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
+        if directory:
+            src = directory + '/'
+            dest = curr_directory() + '/plugins/'
+            util.copy(src, dest)
+            msgBox = QtGui.QMessageBox()
+            msgBox.setWindowTitle(
+                QtGui.QApplication.translate("MainWindow", "Restart Toxygen", None, QtGui.QApplication.UnicodeUTF8))
+            msgBox.setText(
+                QtGui.QApplication.translate("MainWindow", 'Plugin will be loaded after restart', None,
+                                             QtGui.QApplication.UnicodeUTF8))
+            msgBox.exec_()
+
+    def lock_app(self):
+        if toxencryptsave.ToxEncryptSave.get_instance().has_password():
+            Settings.get_instance().locked = True
+            self.hide()
+        else:
+            msgBox = QtGui.QMessageBox()
+            msgBox.setWindowTitle(
+                QtGui.QApplication.translate("MainWindow", "Cannot lock app", None, QtGui.QApplication.UnicodeUTF8))
+            msgBox.setText(
+                QtGui.QApplication.translate("MainWindow", 'Error. Profile password is not set.', None,
+                                             QtGui.QApplication.UnicodeUTF8))
+            msgBox.exec_()
+
     def show_menu(self):
         if not hasattr(self, 'menu'):
             self.menu = DropdownMenu(self)
         self.menu.setGeometry(QtCore.QRect(0 if Settings.get_instance()['mirror_mode'] else 270,
-                                           self.height() - 100,
-                                           150,
-                                           100))
+                                           self.height() - 120,
+                                           180,
+                                           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
     # -----------------------------------------------------------------------------------------------------------------
@@ -406,14 +484,18 @@ class MainWindow(QtGui.QMainWindow):
 
     def send_file(self):
         self.menu.hide()
+        if not self.profile.is_active_a_friend():
+            return
         if self.profile.active_friend + 1:
             choose = QtGui.QApplication.translate("MainWindow", 'Choose file', None, QtGui.QApplication.UnicodeUTF8)
-            name = QtGui.QFileDialog.getOpenFileName(self, choose)
+            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()
@@ -432,6 +514,8 @@ class MainWindow(QtGui.QMainWindow):
 
     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(),
@@ -468,29 +552,60 @@ class MainWindow(QtGui.QMainWindow):
     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)
         settings = Settings.get_instance()
         allowed = friend.tox_id in settings['auto_accept_from_friends']
         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 = QtGui.QMenu()
-            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))
-            copy_key_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Copy public key', None, QtGui.QApplication.UnicodeUTF8))
-            auto_accept_item = self.listMenu.addAction(auto)
-            remove_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Remove friend', None, QtGui.QApplication.UnicodeUTF8))
-            notes_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Notes', None, QtGui.QApplication.UnicodeUTF8))
+            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))
+
+                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))
+                copy_menu = self.listMenu.addMenu(QtGui.QApplication.translate("MainWindow", 'Copy', None, QtGui.QApplication.UnicodeUTF8))
+                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))
+
+                auto_accept_item = self.listMenu.addAction(auto)
+                remove_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Remove friend', None, QtGui.QApplication.UnicodeUTF8))
+                notes_item = self.listMenu.addAction(QtGui.QApplication.translate("MainWindow", 'Notes', None, QtGui.QApplication.UnicodeUTF8))
+
+                submenu = plugin_support.PluginLoader.get_instance().get_menu(self.listMenu, num)
+                if len(submenu):
+                    plug = self.listMenu.addMenu(QtGui.QApplication.translate("MainWindow", 'Plugins', None, QtGui.QApplication.UnicodeUTF8))
+                    plug.addActions(submenu)
+                self.connect(remove_item, QtCore.SIGNAL("triggered()"), lambda: self.remove_friend(num))
+                self.connect(auto_accept_item, QtCore.SIGNAL("triggered()"), lambda: self.auto_accept(num, not allowed))
+            else:
+                copy_menu = self.listMenu.addMenu(
+                    QtGui.QApplication.translate("MainWindow", 'Copy', None, QtGui.QApplication.UnicodeUTF8))
+                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", 'Topic', None, QtGui.QApplication.UnicodeUTF8))
+                copy_key_item = copy_menu.addAction(
+                    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))
 
-            submenu = plugin_support.PluginLoader.get_instance().get_menu(self.listMenu, num)
-            if len(submenu):
-                plug = self.listMenu.addMenu(QtGui.QApplication.translate("MainWindow", 'Plugins', None, QtGui.QApplication.UnicodeUTF8))
-                plug.addActions(submenu)
-            self.connect(set_alias_item, QtCore.SIGNAL("triggered()"), lambda: self.set_alias(num))
-            self.connect(remove_item, QtCore.SIGNAL("triggered()"), lambda: self.remove_friend(num))
-            self.connect(copy_key_item, QtCore.SIGNAL("triggered()"), lambda: self.copy_friend_key(num))
-            self.connect(clear_history_item, QtCore.SIGNAL("triggered()"), lambda: self.clear_history(num))
-            self.connect(auto_accept_item, QtCore.SIGNAL("triggered()"), lambda: self.auto_accept(num, not allowed))
             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()
@@ -514,13 +629,21 @@ class MainWindow(QtGui.QMainWindow):
         self.profile.set_alias(num)
 
     def remove_friend(self, num):
-        self.profile.delete_friend(num)
+        self.profile.delete_friend_or_gc(num)
 
     def copy_friend_key(self, num):
         tox_id = self.profile.friend_public_key(num)
         clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(tox_id)
 
+    def copy_name(self, friend):
+        clipboard = QtGui.QApplication.clipboard()
+        clipboard.setText(friend.name)
+
+    def copy_status(self, friend):
+        clipboard = QtGui.QApplication.clipboard()
+        clipboard.setText(friend.status_message)
+
     def clear_history(self, num):
         self.profile.clear_history(num)
 

toxygen/mainscreen_widgets.py

@@ -2,7 +2,7 @@ try:
     from PySide import QtCore, QtGui
 except ImportError:
     from PyQt4 import QtCore, QtGui
-from widgets import RubberBand, create_menu, QRightClickButton
+from widgets import RubberBand, create_menu, QRightClickButton, CenteredWidget
 from profile import Profile
 import smileys
 import util
@@ -198,52 +198,52 @@ class DropdownMenu(QtGui.QWidget):
         super(DropdownMenu, self).__init__(parent)
         self.installEventFilter(self)
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
-        self.setMaximumSize(150, 100)
-        self.setMinimumSize(150, 100)
+        self.setMaximumSize(180, 120)
+        self.setMinimumSize(180, 120)
         self.screenshotButton = QRightClickButton(self)
-        self.screenshotButton.setGeometry(QtCore.QRect(0, 50, 50, 50))
+        self.screenshotButton.setGeometry(QtCore.QRect(0, 60, 60, 60))
         self.screenshotButton.setObjectName("screenshotButton")
 
         self.fileTransferButton = QtGui.QPushButton(self)
-        self.fileTransferButton.setGeometry(QtCore.QRect(50, 50, 50, 50))
+        self.fileTransferButton.setGeometry(QtCore.QRect(60, 60, 60, 60))
         self.fileTransferButton.setObjectName("fileTransferButton")
 
         self.audioMessageButton = QtGui.QPushButton(self)
-        self.audioMessageButton.setGeometry(QtCore.QRect(100, 50, 50, 50))
+        self.audioMessageButton.setGeometry(QtCore.QRect(120, 60, 60, 60))
 
         self.smileyButton = QtGui.QPushButton(self)
-        self.smileyButton.setGeometry(QtCore.QRect(0, 0, 50, 50))
+        self.smileyButton.setGeometry(QtCore.QRect(0, 0, 60, 60))
 
         self.videoMessageButton = QtGui.QPushButton(self)
-        self.videoMessageButton.setGeometry(QtCore.QRect(100, 0, 50, 50))
+        self.videoMessageButton.setGeometry(QtCore.QRect(120, 0, 60, 60))
 
         self.stickerButton = QtGui.QPushButton(self)
-        self.stickerButton.setGeometry(QtCore.QRect(50, 0, 50, 50))
+        self.stickerButton.setGeometry(QtCore.QRect(60, 0, 60, 60))
 
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/file.png')
         icon = QtGui.QIcon(pixmap)
         self.fileTransferButton.setIcon(icon)
-        self.fileTransferButton.setIconSize(QtCore.QSize(40, 40))
+        self.fileTransferButton.setIconSize(QtCore.QSize(50, 50))
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/screenshot.png')
         icon = QtGui.QIcon(pixmap)
         self.screenshotButton.setIcon(icon)
-        self.screenshotButton.setIconSize(QtCore.QSize(40, 50))
+        self.screenshotButton.setIconSize(QtCore.QSize(50, 60))
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/audio_message.png')
         icon = QtGui.QIcon(pixmap)
         self.audioMessageButton.setIcon(icon)
-        self.audioMessageButton.setIconSize(QtCore.QSize(40, 40))
+        self.audioMessageButton.setIconSize(QtCore.QSize(50, 50))
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/smiley.png')
         icon = QtGui.QIcon(pixmap)
         self.smileyButton.setIcon(icon)
-        self.smileyButton.setIconSize(QtCore.QSize(40, 40))
+        self.smileyButton.setIconSize(QtCore.QSize(50, 50))
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/video_message.png')
         icon = QtGui.QIcon(pixmap)
         self.videoMessageButton.setIcon(icon)
-        self.videoMessageButton.setIconSize(QtCore.QSize(45, 45))
+        self.videoMessageButton.setIconSize(QtCore.QSize(55, 55))
         pixmap = QtGui.QPixmap(util.curr_directory() + '/images/sticker.png')
         icon = QtGui.QIcon(pixmap)
         self.stickerButton.setIcon(icon)
-        self.stickerButton.setIconSize(QtCore.QSize(45, 45))
+        self.stickerButton.setIconSize(QtCore.QSize(55, 55))
 
         self.screenshotButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send screenshot", None, QtGui.QApplication.UnicodeUTF8))
         self.fileTransferButton.setToolTip(QtGui.QApplication.translate("MenuWindow", "Send file", None, QtGui.QApplication.UnicodeUTF8))
@@ -312,3 +312,67 @@ class StickerWindow(QtGui.QWidget):
         self.close()
 
 
+class WelcomeScreen(CenteredWidget):
+
+    def __init__(self):
+        super().__init__()
+        self.setMaximumSize(250, 200)
+        self.setMinimumSize(250, 200)
+        self.center()
+        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        self.text = QtGui.QTextBrowser(self)
+        self.text.setGeometry(QtCore.QRect(0, 0, 250, 170))
+        self.text.setOpenExternalLinks(True)
+        self.checkbox = QtGui.QCheckBox(self)
+        self.checkbox.setGeometry(QtCore.QRect(5, 170, 240, 30))
+        self.checkbox.setText(QtGui.QApplication.translate('WelcomeScreen', "Don't show again",
+                                                           None, QtGui.QApplication.UnicodeUTF8))
+        self.setWindowTitle(QtGui.QApplication.translate('WelcomeScreen', 'Tip of the day',
+                                                         None, QtGui.QApplication.UnicodeUTF8))
+        import random
+        num = random.randint(0, 8)
+        if num == 0:
+            text = QtGui.QApplication.translate('WelcomeScreen', 'Press Esc if you want hide app to tray.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 1:
+            text = QtGui.QApplication.translate('WelcomeScreen',
+                                                'Right click on screenshot button hides app to tray during screenshot.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 2:
+            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>',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 3:
+            text = QtGui.QApplication.translate('WelcomeScreen',
+                                                'Use Settings -> Interface to customize interface.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 4:
+            text = QtGui.QApplication.translate('WelcomeScreen',
+                                                'Set profile password via Profile -> Settings. Password allows Toxygen encrypt your history and settings.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 5:
+            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>',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 6:
+            text = QtGui.QApplication.translate('WelcomeScreen',
+                                                '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',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        elif num == 7:
+            text = QtGui.QApplication.translate('WelcomeScreen',
+                                                'Toxygen supports faux offline messages and file transfers. Send message or file to offline friend and he will get it later.',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+        else:
+            text = QtGui.QApplication.translate('WelcomeScreen',
+                                                '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)
+
+    def not_show(self):
+        import settings
+        s = settings.Settings.get_instance()
+        s['show_welcome_screen'] = False
+        s.save()
+

toxygen/menu.py

@@ -4,19 +4,111 @@ except ImportError:
     from PyQt4 import QtCore, QtGui
 from settings import *
 from profile import Profile
-from util import curr_directory
+from util import curr_directory, copy
 from widgets import CenteredWidget, DataLabel, LineEdit
 import pyaudio
 import toxencryptsave
 import plugin_support
 
 
+class AddGroupchat(CenteredWidget):
+
+    def __init__(self):
+        super().__init__()
+        self.initUI()
+        self.retranslateUi()
+        self.center()
+
+    def initUI(self):
+        self.setObjectName('AddGC')
+        self.resize(570, 240)
+        self.setMaximumSize(QtCore.QSize(570, 240))
+        self.setMinimumSize(QtCore.QSize(570, 240))
+        self.label = QtGui.QLabel(self)
+        self.label.setGeometry(QtCore.QRect(50, 20, 470, 20))
+        self.createGCButton = QtGui.QPushButton(self)
+        self.createGCButton.setGeometry(QtCore.QRect(50, 190, 470, 30))
+        self.name = LineEdit(self)
+        self.name.setGeometry(QtCore.QRect(50, 40, 470, 27))
+        self.privacy_type = QtGui.QLabel(self)
+        self.privacy_type.setGeometry(QtCore.QRect(50, 70, 470, 20))
+        self.privacy_combobox = QtGui.QComboBox(self)
+        self.privacy_combobox.setGeometry(QtCore.QRect(50, 90, 470, 30))
+        self.pass_label = QtGui.QLabel(self)
+        self.pass_label.setGeometry(QtCore.QRect(50, 130, 470, 20))
+        self.password = LineEdit(self)
+        self.password.setGeometry(QtCore.QRect(50, 150, 470, 27))
+        self.password.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
+
+        self.createGCButton.clicked.connect(self.button_click)
+        QtCore.QMetaObject.connectSlotsByName(self)
+
+    def retranslateUi(self):
+        self.setWindowTitle(QtGui.QApplication.translate('AddGC', "Create group chat", None, QtGui.QApplication.UnicodeUTF8))
+        self.createGCButton.setText(QtGui.QApplication.translate("AddGC", "Create", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate('AddGC', "Name:", None, QtGui.QApplication.UnicodeUTF8))
+        self.privacy_type.setText(QtGui.QApplication.translate('AddGC', "Privacy type:", None, QtGui.QApplication.UnicodeUTF8))
+        self.privacy_combobox.addItem(QtGui.QApplication.translate('AddGC', "Public", None, QtGui.QApplication.UnicodeUTF8))
+        self.privacy_combobox.addItem(QtGui.QApplication.translate('AddGC', "Private", None, QtGui.QApplication.UnicodeUTF8))
+        self.name.setPlaceholderText(QtGui.QApplication.translate('AddGC', "Not empty group name", None, QtGui.QApplication.UnicodeUTF8))
+        self.password.setPlaceholderText(QtGui.QApplication.translate('AddGC', "Optional password", None, QtGui.QApplication.UnicodeUTF8))
+        self.pass_label.setText(QtGui.QApplication.translate('AddGC', "Password:", None, QtGui.QApplication.UnicodeUTF8))
+
+    def button_click(self):
+        if self.name.text():
+            Profile.get_instance().create_gc(self.name.text(),
+                                             self.privacy_combobox.currentIndex() == 0,
+                                             self.password.text())
+            self.close()
+
+
+class JoinGroupchat(CenteredWidget):
+
+    def __init__(self):
+        super().__init__()
+        self.initUI()
+        self.retranslateUi()
+        self.center()
+
+    def initUI(self):
+        self.setObjectName('AddGC')
+        self.resize(570, 150)
+        self.setMaximumSize(QtCore.QSize(570, 150))
+        self.setMinimumSize(QtCore.QSize(570, 150))
+        self.joinGCButton = QtGui.QPushButton(self)
+        self.joinGCButton.setGeometry(QtCore.QRect(50, 110, 470, 30))
+        self.id = LineEdit(self)
+        self.id.setGeometry(QtCore.QRect(50, 10, 470, 30))
+        self.password = LineEdit(self)
+        self.password.setGeometry(QtCore.QRect(50, 50, 470, 30))
+        self.password.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
+
+        self.joinGCButton.clicked.connect(self.button_click)
+        QtCore.QMetaObject.connectSlotsByName(self)
+
+    def retranslateUi(self):
+        self.setWindowTitle(
+            QtGui.QApplication.translate('JoinGC', "Join group chat", None, QtGui.QApplication.UnicodeUTF8))
+        self.joinGCButton.setText(
+            QtGui.QApplication.translate("JoinGC", "Join", None, QtGui.QApplication.UnicodeUTF8))
+        self.id.setPlaceholderText(
+            QtGui.QApplication.translate('JoinGC', "Group ID", None, QtGui.QApplication.UnicodeUTF8))
+        self.password.setPlaceholderText(
+            QtGui.QApplication.translate('JoinGC', "Optional password", None, QtGui.QApplication.UnicodeUTF8))
+
+    def button_click(self):
+        if self.id.text():
+            Profile.get_instance().join_gc(self.id.text().strip(), self.password.text())
+            self.close()
+
+
 class AddContact(CenteredWidget):
     """Add contact form"""
 
     def __init__(self, tox_id=''):
         super(AddContact, self).__init__()
         self.initUI(tox_id)
+        self._adding = False
 
     def initUI(self, tox_id):
         self.setObjectName('AddContact')
@@ -58,8 +150,12 @@ class AddContact(CenteredWidget):
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def add_friend(self):
+        if self._adding:
+            return
+        self._adding = True
         profile = Profile.get_instance()
-        send = profile.send_friend_request(self.tox_id.text(), self.message_edit.toPlainText())
+        send = profile.send_friend_request(self.tox_id.text().strip(), self.message_edit.toPlainText())
+        self._adding = False
         if send is True:
             # request was successful
             self.close()
@@ -122,17 +218,19 @@ class ProfileSettings(CenteredWidget):
         self.new_nospam = QtGui.QPushButton(self)
         self.new_nospam.setGeometry(QtCore.QRect(420, 250, 180, 30))
         self.new_nospam.clicked.connect(self.new_no_spam)
-
+        self.copy_pk = QtGui.QPushButton(self)
+        self.copy_pk.setGeometry(QtCore.QRect(40, 300, 180, 30))
+        self.copy_pk.clicked.connect(self.copy_public_key)
         self.new_avatar = QtGui.QPushButton(self)
-        self.new_avatar.setGeometry(QtCore.QRect(40, 300, 180, 30))
+        self.new_avatar.setGeometry(QtCore.QRect(230, 300, 180, 30))
         self.delete_avatar = QtGui.QPushButton(self)
-        self.delete_avatar.setGeometry(QtCore.QRect(230, 300, 180, 30))
+        self.delete_avatar.setGeometry(QtCore.QRect(420, 300, 180, 30))
         self.delete_avatar.clicked.connect(self.reset_avatar)
         self.new_avatar.clicked.connect(self.set_avatar)
-        self.profile_pass = QtGui.QLabel(self)
-        self.profile_pass.setGeometry(QtCore.QRect(40, 340, 300, 30))
+        self.profilepass = QtGui.QLabel(self)
+        self.profilepass.setGeometry(QtCore.QRect(40, 340, 300, 30))
         font.setPointSize(18)
-        self.profile_pass.setFont(font)
+        self.profilepass.setFont(font)
         self.password = LineEdit(self)
         self.password.setGeometry(QtCore.QRect(40, 380, 300, 30))
         self.password.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
@@ -173,7 +271,7 @@ class ProfileSettings(CenteredWidget):
         self.new_avatar.setText(QtGui.QApplication.translate("ProfileSettingsForm", "New avatar", None, QtGui.QApplication.UnicodeUTF8))
         self.delete_avatar.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Reset avatar", None, QtGui.QApplication.UnicodeUTF8))
         self.new_nospam.setText(QtGui.QApplication.translate("ProfileSettingsForm", "New NoSpam", None, QtGui.QApplication.UnicodeUTF8))
-        self.profile_pass.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Profile password", None, QtGui.QApplication.UnicodeUTF8))
+        self.profilepass.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Profile password", None, QtGui.QApplication.UnicodeUTF8))
         self.password.setPlaceholderText(QtGui.QApplication.translate("ProfileSettingsForm", "Password (at least 8 symbols)", None, QtGui.QApplication.UnicodeUTF8))
         self.confirm_password.setPlaceholderText(QtGui.QApplication.translate("ProfileSettingsForm", "Confirm password", None, QtGui.QApplication.UnicodeUTF8))
         self.set_password.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Set password", None, QtGui.QApplication.UnicodeUTF8))
@@ -183,6 +281,7 @@ class ProfileSettings(CenteredWidget):
         self.status.addItem(QtGui.QApplication.translate("ProfileSettingsForm", "Online", None, QtGui.QApplication.UnicodeUTF8))
         self.status.addItem(QtGui.QApplication.translate("ProfileSettingsForm", "Away", None, QtGui.QApplication.UnicodeUTF8))
         self.status.addItem(QtGui.QApplication.translate("ProfileSettingsForm", "Busy", None, QtGui.QApplication.UnicodeUTF8))
+        self.copy_pk.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Copy public key", None, QtGui.QApplication.UnicodeUTF8))
         if self.auto:
             self.default.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Mark as not default profile", None, QtGui.QApplication.UnicodeUTF8))
         else:
@@ -205,7 +304,7 @@ class ProfileSettings(CenteredWidget):
     def new_password(self):
         if self.password.text() == self.confirm_password.text():
             if not len(self.password.text()) or len(self.password.text()) >= 8:
-                e = toxencryptsave.LibToxEncryptSave.get_instance()
+                e = toxencryptsave.ToxEncryptSave.get_instance()
                 e.set_password(self.password.text())
                 self.close()
             else:
@@ -227,6 +326,15 @@ class ProfileSettings(CenteredWidget):
         self.copyId.setIcon(icon)
         self.copyId.setIconSize(QtCore.QSize(10, 10))
 
+    def copy_public_key(self):
+        clipboard = QtGui.QApplication.clipboard()
+        profile = Profile.get_instance()
+        clipboard.setText(profile.tox_id[:64])
+        pixmap = QtGui.QPixmap(curr_directory() + '/images/accept.png')
+        icon = QtGui.QIcon(pixmap)
+        self.copy_pk.setIcon(icon)
+        self.copy_pk.setIconSize(QtCore.QSize(10, 10))
+
     def new_no_spam(self):
         self.tox_id.setText(Profile.get_instance().new_nospam())
 
@@ -235,7 +343,8 @@ class ProfileSettings(CenteredWidget):
 
     def set_avatar(self):
         choose = QtGui.QApplication.translate("ProfileSettingsForm", "Choose avatar", None, QtGui.QApplication.UnicodeUTF8)
-        name = QtGui.QFileDialog.getOpenFileName(self, choose, None, 'Images (*.png)')
+        name = QtGui.QFileDialog.getOpenFileName(self, choose, None, 'Images (*.png)',
+                                                 options=QtGui.QFileDialog.DontUseNativeDialog)
         if name[0]:
             bitmap = QtGui.QPixmap(name[0])
             bitmap.scaled(QtCore.QSize(128, 128), aspectMode=QtCore.Qt.KeepAspectRatio,
@@ -248,7 +357,7 @@ class ProfileSettings(CenteredWidget):
             Profile.get_instance().set_avatar(str(byte_array.data()))
 
     def export_profile(self):
-        directory = QtGui.QFileDialog.getExistingDirectory() + '/'
+        directory = QtGui.QFileDialog.getExistingDirectory(options=QtGui.QFileDialog.DontUseNativeDialog) + '/'
         if directory != '/':
             ProfileHelper.get_instance().export_profile(directory)
             settings = Settings.get_instance()
@@ -378,7 +487,7 @@ class PrivacySettings(CenteredWidget):
         self.auto_path = QtGui.QLabel(self)
         self.auto_path.setGeometry(QtCore.QRect(10, 230, 350, 30))
         self.path = QtGui.QPlainTextEdit(self)
-        self.path.setGeometry(QtCore.QRect(10, 265, 330, 45))
+        self.path.setGeometry(QtCore.QRect(10, 265, 350, 45))
         self.change_path = QtGui.QPushButton(self)
         self.change_path.setGeometry(QtCore.QRect(10, 320, 350, 30))
         settings = Settings.get_instance()
@@ -477,7 +586,7 @@ class PrivacySettings(CenteredWidget):
         settings.save()
 
     def new_path(self):
-        directory = QtGui.QFileDialog.getExistingDirectory() + '/'
+        directory = QtGui.QFileDialog.getExistingDirectory(options=QtGui.QFileDialog.DontUseNativeDialog) + '/'
         if directory != '/':
             self.path.setPlainText(directory)
 
@@ -492,28 +601,33 @@ class NotificationsSettings(CenteredWidget):
 
     def initUI(self):
         self.setObjectName("notificationsForm")
-        self.resize(350, 180)
-        self.setMinimumSize(QtCore.QSize(350, 180))
-        self.setMaximumSize(QtCore.QSize(350, 180))
+        self.resize(350, 200)
+        self.setMinimumSize(QtCore.QSize(350, 200))
+        self.setMaximumSize(QtCore.QSize(350, 200))
         self.enableNotifications = QtGui.QCheckBox(self)
         self.enableNotifications.setGeometry(QtCore.QRect(10, 20, 340, 18))
         self.callsSound = QtGui.QCheckBox(self)
         self.callsSound.setGeometry(QtCore.QRect(10, 120, 340, 18))
         self.soundNotifications = QtGui.QCheckBox(self)
         self.soundNotifications.setGeometry(QtCore.QRect(10, 70, 340, 18))
+        self.gcNotifications = QtGui.QCheckBox(self)
+        self.gcNotifications.setGeometry(QtCore.QRect(10, 170, 340, 18))
         font = QtGui.QFont()
         font.setPointSize(12)
         self.callsSound.setFont(font)
         self.soundNotifications.setFont(font)
         self.enableNotifications.setFont(font)
+        self.gcNotifications.setFont(font)
         s = Settings.get_instance()
         self.enableNotifications.setChecked(s['notifications'])
         self.soundNotifications.setChecked(s['sound_notifications'])
         self.callsSound.setChecked(s['calls_sound'])
+        self.gcNotifications.setChecked(s['notify_all_gc'])
         self.retranslateUi()
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def retranslateUi(self):
+        self.gcNotifications.setText(QtGui.QApplication.translate("notificationsForm", "Enable group chat notifications", None, QtGui.QApplication.UnicodeUTF8))
         self.setWindowTitle(QtGui.QApplication.translate("notificationsForm", "Notification settings", None, QtGui.QApplication.UnicodeUTF8))
         self.enableNotifications.setText(QtGui.QApplication.translate("notificationsForm", "Enable notifications", None, QtGui.QApplication.UnicodeUTF8))
         self.callsSound.setText(QtGui.QApplication.translate("notificationsForm", "Enable call\'s sound", None, QtGui.QApplication.UnicodeUTF8))
@@ -524,6 +638,7 @@ class NotificationsSettings(CenteredWidget):
         settings['notifications'] = self.enableNotifications.isChecked()
         settings['sound_notifications'] = self.soundNotifications.isChecked()
         settings['calls_sound'] = self.callsSound.isChecked()
+        settings['notify_all_gc'] = self.gcNotifications.isChecked()
         settings.save()
 
 
@@ -536,8 +651,8 @@ class InterfaceSettings(CenteredWidget):
 
     def initUI(self):
         self.setObjectName("interfaceForm")
-        self.setMinimumSize(QtCore.QSize(400, 450))
-        self.setMaximumSize(QtCore.QSize(400, 450))
+        self.setMinimumSize(QtCore.QSize(400, 550))
+        self.setMaximumSize(QtCore.QSize(400, 550))
         self.label = QtGui.QLabel(self)
         self.label.setGeometry(QtCore.QRect(30, 10, 370, 20))
         font = QtGui.QFont()
@@ -557,7 +672,7 @@ class InterfaceSettings(CenteredWidget):
         self.themeSelect.setCurrentIndex(index)
         self.lang_choose = QtGui.QComboBox(self)
         self.lang_choose.setGeometry(QtCore.QRect(30, 110, 120, 30))
-        supported = Settings.supported_languages()
+        supported = sorted(Settings.supported_languages().keys(), reverse=True)
         for key in supported:
             self.lang_choose.insertItem(0, key)
             if settings['language'] == key:
@@ -592,9 +707,21 @@ class InterfaceSettings(CenteredWidget):
         self.messages_font_size.setCurrentIndex(settings['message_font_size'] - 10)
 
         self.unread = QtGui.QPushButton(self)
-        self.unread.setGeometry(QtCore.QRect(30, 380, 340, 40))
+        self.unread.setGeometry(QtCore.QRect(30, 425, 340, 30))
         self.unread.clicked.connect(self.select_color)
 
+        self.compact_mode = QtGui.QCheckBox(self)
+        self.compact_mode.setGeometry(QtCore.QRect(30, 380, 370, 20))
+        self.compact_mode.setChecked(settings['compact_mode'])
+
+        self.import_smileys = QtGui.QPushButton(self)
+        self.import_smileys.setGeometry(QtCore.QRect(30, 465, 340, 30))
+        self.import_smileys.clicked.connect(self.import_sm)
+
+        self.import_stickers = QtGui.QPushButton(self)
+        self.import_stickers.setGeometry(QtCore.QRect(30, 505, 340, 30))
+        self.import_stickers.clicked.connect(self.import_st)
+
         self.retranslateUi()
         QtCore.QMetaObject.connectSlotsByName(self)
 
@@ -607,6 +734,37 @@ class InterfaceSettings(CenteredWidget):
         self.mirror_mode.setText(QtGui.QApplication.translate("interfaceForm", "Mirror mode", None, QtGui.QApplication.UnicodeUTF8))
         self.messages_font_size_label.setText(QtGui.QApplication.translate("interfaceForm", "Messages font size:", None, QtGui.QApplication.UnicodeUTF8))
         self.unread.setText(QtGui.QApplication.translate("interfaceForm", "Select unread messages notification color", None, QtGui.QApplication.UnicodeUTF8))
+        self.compact_mode.setText(QtGui.QApplication.translate("interfaceForm", "Compact contact list", None, QtGui.QApplication.UnicodeUTF8))
+        self.import_smileys.setText(QtGui.QApplication.translate("interfaceForm", "Import smiley pack", None, QtGui.QApplication.UnicodeUTF8))
+        self.import_stickers.setText(QtGui.QApplication.translate("interfaceForm", "Import sticker pack", None, QtGui.QApplication.UnicodeUTF8))
+
+    def import_st(self):
+        directory = QtGui.QFileDialog.getExistingDirectory(self,
+                                                           QtGui.QApplication.translate("MainWindow",
+                                                                                        'Choose folder with sticker pack',
+                                                                                        None,
+                                                                                        QtGui.QApplication.UnicodeUTF8),
+                                                           curr_directory(),
+                                                           QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
+
+        if directory:
+            src = directory + '/'
+            dest = curr_directory() + '/stickers/' + os.path.basename(directory) + '/'
+            copy(src, dest)
+
+    def import_sm(self):
+        directory = QtGui.QFileDialog.getExistingDirectory(self,
+                                                           QtGui.QApplication.translate("MainWindow",
+                                                                                        'Choose folder with smiley pack',
+                                                                                        None,
+                                                                                        QtGui.QApplication.UnicodeUTF8),
+                                                           curr_directory(),
+                                                           QtGui.QFileDialog.ShowDirsOnly | QtGui.QFileDialog.DontUseNativeDialog)
+
+        if directory:
+            src = directory + '/'
+            dest = curr_directory() + '/smileys/' + os.path.basename(directory) + '/'
+            copy(src, dest)
 
     def select_color(self):
         col = QtGui.QColorDialog.getColor()
@@ -621,15 +779,13 @@ class InterfaceSettings(CenteredWidget):
         settings = Settings.get_instance()
         settings['theme'] = str(self.themeSelect.currentText())
         settings['smileys'] = self.smileys.isChecked()
+        restart = False
         if settings['mirror_mode'] != self.mirror_mode.isChecked():
             settings['mirror_mode'] = self.mirror_mode.isChecked()
-            msgBox = QtGui.QMessageBox()
-            text = QtGui.QApplication.translate("interfaceForm", 'Restart app to apply settings', None,
-                                                QtGui.QApplication.UnicodeUTF8)
-            msgBox.setWindowTitle(QtGui.QApplication.translate("interfaceForm", 'Restart required', None,
-                                                               QtGui.QApplication.UnicodeUTF8))
-            msgBox.setText(text)
-            msgBox.exec_()
+            restart = True
+        if settings['compact_mode'] != self.compact_mode.isChecked():
+            settings['compact_mode'] = self.compact_mode.isChecked()
+            restart = True
         settings['smiley_pack'] = self.smiley_pack.currentText()
         smileys.SmileyLoader.get_instance().load_pack()
         language = self.lang_choose.currentText()
@@ -644,6 +800,14 @@ class InterfaceSettings(CenteredWidget):
         settings['message_font_size'] = self.messages_font_size.currentIndex() + 10
         Profile.get_instance().update()
         settings.save()
+        if restart:
+            msgBox = QtGui.QMessageBox()
+            text = QtGui.QApplication.translate("interfaceForm", 'Restart app to apply settings', None,
+                                                QtGui.QApplication.UnicodeUTF8)
+            msgBox.setWindowTitle(QtGui.QApplication.translate("interfaceForm", 'Restart required', None,
+                                                               QtGui.QApplication.UnicodeUTF8))
+            msgBox.setText(text)
+            msgBox.exec_()
 
 
 class AudioSettings(CenteredWidget):

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/passwordscreen.py

@@ -0,0 +1,164 @@
+from widgets import CenteredWidget, LineEdit
+try:
+    from PySide import QtCore, QtGui
+except ImportError:
+    from PyQt4 import QtCore, QtGui
+
+
+class PasswordArea(LineEdit):
+
+    def __init__(self, parent):
+        super(PasswordArea, self).__init__(parent)
+        self.parent = parent
+        self.setEchoMode(QtGui.QLineEdit.EchoMode.Password)
+
+    def keyPressEvent(self, event):
+        if event.key() == QtCore.Qt.Key_Return:
+            self.parent.button_click()
+        else:
+            super(PasswordArea, self).keyPressEvent(event)
+
+
+class PasswordScreenBase(CenteredWidget):
+
+    def __init__(self, encrypt):
+        super(PasswordScreenBase, self).__init__()
+        self._encrypt = encrypt
+        self.initUI()
+
+    def initUI(self):
+        self.resize(360, 170)
+        self.setMinimumSize(QtCore.QSize(360, 170))
+        self.setMaximumSize(QtCore.QSize(360, 170))
+
+        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 = 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 = QtGui.QLabel(self)
+        self.warning.setGeometry(QtCore.QRect(30, 130, 300, 30))
+        self.warning.setStyleSheet('QLabel { color: #F70D1A; }')
+        self.warning.setVisible(False)
+
+        self.retranslateUi()
+        self.center()
+        QtCore.QMetaObject.connectSlotsByName(self)
+
+    def button_click(self):
+        pass
+
+    def keyPressEvent(self, event):
+        if event.key() == QtCore.Qt.Key_Enter:
+            self.button_click()
+        else:
+            super(PasswordScreenBase, self).keyPressEvent(event)
+
+    def retranslateUi(self):
+        self.setWindowTitle(QtGui.QApplication.translate("pass", "Enter password", None, QtGui.QApplication.UnicodeUTF8))
+        self.enter_pass.setText(QtGui.QApplication.translate("pass", "Password:", None, QtGui.QApplication.UnicodeUTF8))
+        self.warning.setText(QtGui.QApplication.translate("pass", "Incorrect password", None, QtGui.QApplication.UnicodeUTF8))
+
+
+class PasswordScreen(PasswordScreenBase):
+
+    def __init__(self, encrypt, data):
+        super(PasswordScreen, self).__init__(encrypt)
+        self._data = data
+
+    def button_click(self):
+        if self.password.text():
+            try:
+                self._encrypt.set_password(self.password.text())
+                new_data = self._encrypt.pass_decrypt(self._data[0])
+            except Exception as ex:
+                self.warning.setVisible(True)
+                print('Decryption error:', ex)
+            else:
+                self._data[0] = new_data
+                self.close()
+
+
+class UnlockAppScreen(PasswordScreenBase):
+
+    def __init__(self, encrypt, callback):
+        super(UnlockAppScreen, self).__init__(encrypt)
+        self._callback = callback
+        self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
+
+    def button_click(self):
+        if self.password.text():
+            if self._encrypt.is_password(self.password.text()):
+                self._callback()
+                self.close()
+            else:
+                self.warning.setVisible(True)
+                print('Wrong password!')
+
+
+class SetProfilePasswordScreen(CenteredWidget):
+
+    def __init__(self, encrypt):
+        super(SetProfilePasswordScreen, self).__init__()
+        self._encrypt = encrypt
+        self.initUI()
+        self.retranslateUi()
+        self.center()
+
+    def initUI(self):
+        self.setMinimumSize(QtCore.QSize(700, 200))
+        self.setMaximumSize(QtCore.QSize(700, 200))
+        self.password = LineEdit(self)
+        self.password.setGeometry(QtCore.QRect(40, 10, 300, 30))
+        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(QtGui.QLineEdit.EchoMode.Password)
+        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 = 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 = QtGui.QLabel(self)
+        self.warning.setGeometry(QtCore.QRect(40, 160, 500, 30))
+        self.warning.setStyleSheet('QLabel { color: #BC1C1C; }')
+
+    def retranslateUi(self):
+        self.setWindowTitle(QtGui.QApplication.translate("PasswordScreen", "Profile password", None,
+                                                              QtGui.QApplication.UnicodeUTF8))
+        self.password.setPlaceholderText(
+            QtGui.QApplication.translate("PasswordScreen", "Password (at least 8 symbols)", None,
+                                         QtGui.QApplication.UnicodeUTF8))
+        self.confirm_password.setPlaceholderText(
+            QtGui.QApplication.translate("PasswordScreen", "Confirm password", None,
+                                         QtGui.QApplication.UnicodeUTF8))
+        self.set_password.setText(
+            QtGui.QApplication.translate("PasswordScreen", "Set password", None, QtGui.QApplication.UnicodeUTF8))
+        self.not_match.setText(QtGui.QApplication.translate("PasswordScreen", "Passwords do not match", None,
+                                                            QtGui.QApplication.UnicodeUTF8))
+        self.warning.setText(
+            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():
+            if len(self.password.text()) >= 8:
+                self._encrypt.set_password(self.password.text())
+                self.close()
+            else:
+                self.not_match.setText(
+                    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(QtGui.QApplication.translate("PasswordScreen", "Passwords do not match", None,
+                                                                QtGui.QApplication.UnicodeUTF8))
+            self.not_match.setVisible(True)

toxygen/plugin_support.py

@@ -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 = toxencryptsave.LibToxEncryptSave.get_instance()
+        self._encr = toxencryptsave.ToxEncryptSave.get_instance()
 
     def set_tox(self, tox):
         """
@@ -152,5 +152,6 @@ class PluginLoader(util.Singleton):
         App is closing, stop all plugins
         """
         for key in list(self._plugins.keys()):
-            self._plugins[key][0].close()
+            if self._plugins[key][1]:
+                self._plugins[key][0].close()
             del self._plugins[key]

toxygen/plugins/plugin_super_class.py

@@ -37,6 +37,7 @@ class PluginSuperClass:
 
     def __init__(self, name, short_name, tox=None, profile=None, settings=None, encrypt_save=None):
         """
+        Constructor. In plugin __init__ should take only 4 last arguments
         :param name: plugin full name
         :param short_name: plugin unique short name (length of short name should not exceed MAX_SHORT_NAME_LENGTH)
         :param tox: tox instance

toxygen/profile.py

@@ -15,9 +15,11 @@ import time
 import calls
 import avwidgets
 import plugin_support
+import basecontact
+from groupchat import *
 
 
-class Profile(contact.Contact, Singleton):
+class Profile(basecontact.BaseContact, Singleton):
     """
     Profile of current toxygen user. Contains friends list, tox instance
     """
@@ -26,11 +28,11 @@ class Profile(contact.Contact, Singleton):
         :param tox: tox instance
         :param screen: ref to main screen
         """
-        contact.Contact.__init__(self,
-                                 tox.self_get_name(),
-                                 tox.self_get_status_message(),
-                                 screen.user_info,
-                                 tox.self_get_address())
+        basecontact.BaseContact.__init__(self,
+                                         tox.self_get_name(),
+                                         tox.self_get_status_message(),
+                                         screen.user_info,
+                                         tox.self_get_address())
         Singleton.__init__(self)
         self._screen = screen
         self._messages = screen.messages
@@ -38,13 +40,15 @@ class Profile(contact.Contact, Singleton):
         self._file_transfers = {}  # dict of file transfers. key - tuple (friend_number, file_number)
         self._call = calls.AV(tox.AV)  # object with data about calls
         self._incoming_calls = set()
+        self._load_history = True
+        self._gc_invites = {}  # dict of gc invites. key - friend number, value - list of gc data
         settings = Settings.get_instance()
         self._show_online = settings['show_online_friends']
         screen.online_contacts.setCurrentIndex(int(self._show_online))
         aliases = settings['friends_aliases']
         data = tox.self_get_friend_list()
         self._history = History(tox.self_get_public_key())  # connection to db
-        self._friends, self._active_friend = [], -1
+        self._friends_and_gc, self._active_friend_or_gc = [], -1
         for i in data:  # creates list of friends
             tox_id = tox.friend_get_public_key(i)
             try:
@@ -54,10 +58,30 @@ class Profile(contact.Contact, Singleton):
             item = self.create_friend_item()
             name = alias or tox.friend_get_name(i) or tox_id
             status_message = tox.friend_get_status_message(i)
+            if not self._history.friend_exists_in_db(tox_id):
+                self._history.add_friend_to_db(tox_id)
             message_getter = self._history.messages_getter(tox_id)
-            friend = Friend(message_getter, i, name, status_message, item, tox_id)
+            friend = Friend(i, message_getter, name, status_message, item, tox_id)
             friend.set_alias(alias)
-            self._friends.append(friend)
+            self._friends_and_gc.append(friend)
+
+        l = self._tox.group_get_number_groups()
+        for i in range(l):  # creates list of group chats
+            tox_id = tox.group_get_chat_id(i)
+            try:
+                alias = list(filter(lambda x: x[0] == tox_id, aliases))[0][1]
+            except:
+                alias = ''
+            item = self.create_friend_item()
+            name = alias or tox.group_get_name(i) or tox_id
+            status_message = tox.group_get_topic(i)
+            if not self._history.friend_exists_in_db(tox_id):
+                self._history.add_friend_to_db(tox_id)
+            message_getter = self._history.messages_getter(tox_id)
+            gc = GroupChat(self._tox, i, message_getter, name, status_message, item, tox_id)
+            gc.set_alias(alias)
+            self._friends_and_gc.append(gc)
+
         self.filtration(self._show_online)
 
     # -----------------------------------------------------------------------------------------------------------------
@@ -72,6 +96,9 @@ class Profile(contact.Contact, Singleton):
             self.set_status((self._status + 1) % 3)
 
     def set_status(self, status):
+        if self.status is None:
+            for gc in filter(lambda x: type(x) is GroupChat, self._friends_and_gc):
+                self._tox.group_reconnect(gc.number)
         super(Profile, self).set_status(status)
         if status is not None:
             self._tox.self_set_status(status)
@@ -84,11 +111,11 @@ class Profile(contact.Contact, Singleton):
         self._tox.self_set_name(self._name.encode('utf-8'))
         message = QtGui.QApplication.translate("MainWindow", 'User {} is now known as {}', None,
                                                QtGui.QApplication.UnicodeUTF8)
-        message = message.format(tmp, value)
-        for friend in self._friends:
+        message = message.format(tmp, str(value, 'utf-8'))
+        for friend in self._friends_and_gc:
             friend.append_message(InfoMessage(message, time.time()))
-        if self._active_friend + 1:
-            self.create_message_item(message, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
+        if self._active_friend_or_gc + 1:
+            self.create_message_item(message, curr_time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
             self._messages.scrollToBottom()
 
     def set_status_message(self, value):
@@ -113,15 +140,16 @@ class Profile(contact.Contact, Singleton):
         :param filter_str: show contacts which name contains this substring
         """
         filter_str = filter_str.lower()
-        for index, friend in enumerate(self._friends):
+        settings = Settings.get_instance()
+        for index, friend in enumerate(self._friends_and_gc):
             friend.visibility = (friend.status is not None or not show_online) and (filter_str in friend.name.lower())
             friend.visibility = friend.visibility or friend.messages or friend.actions
             if friend.visibility:
-                self._screen.friends_list.item(index).setSizeHint(QtCore.QSize(250, 70))
+                self._screen.friends_list.item(index).setSizeHint(QtCore.QSize(250,
+                                                                               40 if settings['compact_mode'] else 70))
             else:
                 self._screen.friends_list.item(index).setSizeHint(QtCore.QSize(250, 0))
         self._show_online, self._filter_string = show_online, filter_str
-        settings = Settings.get_instance()
         settings['show_online_friends'] = self._show_online
         settings.save()
 
@@ -132,29 +160,32 @@ class Profile(contact.Contact, Singleton):
         self.filtration(self._show_online, self._filter_string)
 
     def get_friend_by_number(self, num):
-        return list(filter(lambda x: x.number == num, self._friends))[0]
+        return list(filter(lambda x: x.number == num and type(x) is Friend, self._friends_and_gc))[0]
 
-    def get_friend(self, num):
-        return self._friends[num]
+    def get_gc_by_number(self, num):
+        return list(filter(lambda x: x.number == num and type(x) is not Friend, self._friends_and_gc))[0]
+
+    def get_friend_or_gc(self, num):
+        return self._friends_and_gc[num]
 
     # -----------------------------------------------------------------------------------------------------------------
     # Work with active friend
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_active(self):
-        return self._active_friend
+        return self._active_friend_or_gc
 
     def set_active(self, value=None):
         """
         Change current active friend or update info
         :param value: number of new active friend in friend's list or None to update active user's data
         """
-        if value is None and self._active_friend == -1:  # nothing to update
+        if value is None and self._active_friend_or_gc == -1:  # nothing to update
             return
         if value == -1:  # all friends were deleted
             self._screen.account_name.setText('')
             self._screen.account_status.setText('')
-            self._active_friend = -1
+            self._active_friend_or_gc = -1
             self._screen.account_avatar.setHidden(True)
             self._messages.clear()
             self._screen.messageEdit.clear()
@@ -163,25 +194,30 @@ class Profile(contact.Contact, Singleton):
             self.send_typing(False)
             self._screen.typing.setVisible(False)
             if value is not None:
-                if self._active_friend + 1:
+                if self._active_friend_or_gc + 1:
                     try:
-                        self._friends[self._active_friend].curr_text = self._screen.messageEdit.toPlainText()
+                        self._friends_and_gc[self._active_friend_or_gc].curr_text = self._screen.messageEdit.toPlainText()
                     except:
                         pass
-                self._active_friend = value
-                friend = self._friends[value]
-                self._friends[value].reset_messages()
-                self._screen.messageEdit.setPlainText(friend.curr_text)
+                self._active_friend_or_gc = value
+                friend_or_gc = self._friends_and_gc[value]
+                friend_or_gc.reset_messages()
+                friend_or_gc.delete_old_messages()
+                self._screen.messageEdit.setPlainText(friend_or_gc.curr_text)
                 self._messages.clear()
-                friend.load_corr()
-                messages = friend.get_corr()[-PAGE_SIZE:]
+                friend_or_gc.load_corr()
+                messages = friend_or_gc.get_corr()[-PAGE_SIZE:]
+                self._load_history = False
+
                 for message in messages:
                     if message.get_type() <= 1:
                         data = message.get_data()
                         self.create_message_item(data[0],
                                                  data[2],
                                                  data[1],
-                                                 data[3])
+                                                 data[3],
+                                                 True,
+                                                 data[4] if len(data) == 5 else None)
                     elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']:
                         if message.get_status() is None:
                             self.create_unsent_file_item(message)
@@ -203,6 +239,7 @@ class Profile(contact.Contact, Singleton):
                                                  '',
                                                  data[3])
                 self._messages.scrollToBottom()
+                self._load_history = True
                 if value in self._call:
                     self._screen.active_call()
                 elif value in self._incoming_calls:
@@ -210,19 +247,23 @@ class Profile(contact.Contact, Singleton):
                 else:
                     self._screen.call_finished()
             else:
-                friend = self._friends[self._active_friend]
+                friend_or_gc = self._friends_and_gc[self._active_friend_or_gc]
 
-            self._screen.account_name.setText(friend.name)
-            self._screen.account_status.setText(friend.status_message)
-            avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(friend.tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
+            self._screen.account_name.setText(friend_or_gc.name)
+            self._screen.account_status.setText(friend_or_gc.status_message)
+            avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(friend_or_gc.tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
             if not os.path.isfile(avatar_path):  # load default image
-                avatar_path = curr_directory() + '/images/avatar.png'
+                if type(friend_or_gc) is Friend:
+                    avatar_path = curr_directory() + '/images/avatar.png'
+                else:
+                    avatar_path = curr_directory() + '/images/group.png'
             os.chdir(os.path.dirname(avatar_path))
             pixmap = QtGui.QPixmap(QtCore.QSize(64, 64))
             pixmap.load(avatar_path)
             self._screen.account_avatar.setScaledContents(False)
             self._screen.account_avatar.setPixmap(pixmap.scaled(64, 64, QtCore.Qt.KeepAspectRatio))
             self._screen.account_avatar.repaint()  # comment?
+            self.update_filtration()
         except Exception as ex:  # no friend found. ignore
             log('Friend value: ' + str(value))
             log('Error: ' + str(ex))
@@ -230,17 +271,20 @@ class Profile(contact.Contact, Singleton):
 
     active_friend = property(get_active, set_active)
 
+    def is_active_a_friend(self):
+        return type(self._friends_and_gc[self._active_friend_or_gc]) is Friend
+
     def get_last_message(self):
-        return self._friends[self._active_friend].get_last_message_text()
+        return self._friends_and_gc[self._active_friend_or_gc].get_last_message_text()
 
     def get_active_number(self):
-        return self._friends[self._active_friend].number if self._active_friend + 1 else -1
+        return self._friends_and_gc[self._active_friend_or_gc].number if self._active_friend_or_gc + 1 else -1
 
     def get_active_name(self):
-        return self._friends[self._active_friend].name if self._active_friend + 1 else ''
+        return self._friends_and_gc[self._active_friend_or_gc].name if self._active_friend_or_gc + 1 else ''
 
     def is_active_online(self):
-        return self._active_friend + 1 and self._friends[self._active_friend].status is not None
+        return self._active_friend_or_gc + 1 and self._friends_and_gc[self._active_friend_or_gc].status is not None
 
     def new_name(self, number, name):
         friend = self.get_friend_by_number(number)
@@ -258,8 +302,8 @@ class Profile(contact.Contact, Singleton):
             self.set_active(None)
 
     def update(self):
-        if self._active_friend + 1:
-            self.set_active(self._active_friend)
+        if self._active_friend_or_gc + 1:
+            self.set_active(self._active_friend_or_gc)
 
     # -----------------------------------------------------------------------------------------------------------------
     # Friend connection status callbacks
@@ -299,8 +343,8 @@ class Profile(contact.Contact, Singleton):
         """
         Send typing notification to a friend
         """
-        if Settings.get_instance()['typing_notifications'] and self._active_friend + 1:
-            friend = self._friends[self._active_friend]
+        if Settings.get_instance()['typing_notifications'] and self._active_friend_or_gc + 1:
+            friend = self._friends_and_gc[self._active_friend_or_gc]
             if friend.status is not None:
                 self._tox.self_set_typing(friend.number, typing)
 
@@ -334,12 +378,13 @@ class Profile(contact.Contact, Singleton):
         except:
             pass
 
-    def split_and_send(self, number, message_type, message):
+    def split_and_send(self, number, message_type, message, is_group=False):
         """
         Message splitting
-        :param number: friend's number
+        :param number: friend or gc number
         :param message_type: type of message
         :param message: message text
+        :param is_group: send to group
         """
         while len(message) > TOX_MAX_MESSAGE_LENGTH:
             size = TOX_MAX_MESSAGE_LENGTH * 4 / 5
@@ -353,57 +398,95 @@ class Profile(contact.Contact, Singleton):
             else:
                 index = TOX_MAX_MESSAGE_LENGTH - size - 1
             index += size + 1
-            self._tox.friend_send_message(number, message_type, message[:index])
+            if not is_group:
+                self._tox.friend_send_message(number, message_type, message[:index])
+            else:
+                self._tox.group_send_message(number, message_type, message[:index])
             message = message[index:]
-        self._tox.friend_send_message(number, message_type, message)
+        if not is_group:
+            self._tox.friend_send_message(number, message_type, message)
+        else:
+            self._tox.group_send_message(number, message_type, message)
 
-    def new_message(self, friend_num, message_type, message):
+    def new_message(self, num, message_type, message, is_group=False, peer_id=-1):
         """
         Current user gets new message
-        :param friend_num: friend_num of friend who sent message
+        :param num: num of friend or gc who sent message
         :param message_type: message type - plain text or action message (/me)
         :param message: text of message
+        :param is_group: is group chat message or not
+        :param peer_id: if gc - peer id
         """
-        if friend_num == self.get_active_number():  # add message to list
-            t = time.time()
-            self.create_message_item(message, t, MESSAGE_OWNER['FRIEND'], message_type)
+        t = time.time()
+        active = False
+        if num == self.get_active_number() and is_group != self.is_active_a_friend():  # add message to list
+            if not is_group:
+                self.create_message_item(message, t, MESSAGE_OWNER['FRIEND'], message_type)
+            else:
+                self.create_message_item(message, t, MESSAGE_OWNER['FRIEND'], message_type, True,
+                                         self._tox.group_peer_get_name(num, peer_id))
             self._messages.scrollToBottom()
-            self._friends[self._active_friend].append_message(
-                TextMessage(message, MESSAGE_OWNER['FRIEND'], t, message_type))
+            active = True
+        if is_group:
+            friend_or_gc = self.get_gc_by_number(num)
+            friend_or_gc.append_message(GroupChatTextMessage(self._tox.group_peer_get_name(num, peer_id),
+                                                             message, MESSAGE_OWNER['FRIEND'],
+                                                             time.time(), message_type))
         else:
-            friend = self.get_friend_by_number(friend_num)
-            friend.inc_messages()
-            friend.append_message(
-                TextMessage(message, MESSAGE_OWNER['FRIEND'], time.time(), message_type))
-            if not friend.visibility:
-                self.update_filtration()
+            friend_or_gc = self.get_friend_by_number(num)
+            friend_or_gc.append_message(TextMessage(message, MESSAGE_OWNER['FRIEND'], time.time(), message_type))
+        if not active:
+            friend_or_gc.inc_messages()
+        if not friend_or_gc.visibility:
+            self.update_filtration()
 
-    def send_message(self, text):
+    def send_message(self, text, number=None, is_gc=False):
         """
-        Send message to active friend
+        Send message
         :param text: message text
+        :param number: num of friend or gc
+        :param is_gc: is group chat
         """
+        if number is None:
+            number = self.get_active_number()
+            is_gc = not self.is_active_a_friend()
         if text.startswith('/plugin '):
             plugin_support.PluginLoader.get_instance().command(text[8:])
             self._screen.messageEdit.clear()
-        elif text and self._active_friend + 1:
+        elif text and number + 1:
+            text = ''.join(c if c <= '\u10FFFF' else '\u25AF' for c in text)
+
             if text.startswith('/me '):
                 message_type = TOX_MESSAGE_TYPE['ACTION']
                 text = text[4:]
             else:
                 message_type = TOX_MESSAGE_TYPE['NORMAL']
-            friend = self._friends[self._active_friend]
-            friend.inc_receipts()
-            if friend.status is not None:
-                self.split_and_send(friend.number, message_type, text.encode('utf-8'))
+
+            if not is_gc:
+                friend_or_gc = self.get_friend_by_number(number)
+            else:
+                friend_or_gc = self.get_gc_by_number(number)
             t = time.time()
-            self.create_message_item(text, t, MESSAGE_OWNER['NOT_SENT'], message_type)
-            self._screen.messageEdit.clear()
-            self._messages.scrollToBottom()
-            friend.append_message(TextMessage(text, MESSAGE_OWNER['NOT_SENT'], t, message_type))
+
+            if not is_gc:
+                friend_or_gc.inc_receipts()
+                if friend_or_gc.status is not None:
+                    self.split_and_send(friend_or_gc.number, message_type, text.encode('utf-8'))
+                if friend_or_gc.number == self.get_active_number() and self.is_active_a_friend():
+                    self.create_message_item(text, t, MESSAGE_OWNER['NOT_SENT'], message_type)
+                    self._screen.messageEdit.clear()
+                    self._messages.scrollToBottom()
+                friend_or_gc.append_message(TextMessage(text, MESSAGE_OWNER['NOT_SENT'], t, message_type))
+            else:
+                self.split_and_send(friend_or_gc.number, message_type, text.encode('utf-8'), True)
+                if friend_or_gc.number == self.get_active_number() and not self.is_active_a_friend():
+                    self.create_message_item(text, t, MESSAGE_OWNER['ME'], message_type)
+                    self._screen.messageEdit.clear()
+                    self._messages.scrollToBottom()
+                friend_or_gc.append_message(TextMessage(text, MESSAGE_OWNER['ME'], t, message_type))
 
     def delete_message(self, time):
-        friend = self._friends[self._active_friend]
+        friend = self._friends_and_gc[self._active_friend_or_gc]
         friend.delete_message(time)
         self._history.delete_message(friend.tox_id, time)
         self.update()
@@ -417,20 +500,21 @@ class Profile(contact.Contact, Singleton):
         Save history to db
         """
         s = Settings.get_instance()
+        # TODO: different saving for friends and gc
         if hasattr(self, '_history'):
             if s['save_history']:
-                for friend in self._friends:
-                    if not self._history.friend_exists_in_db(friend.tox_id):
-                        self._history.add_friend_to_db(friend.tox_id)
+                for friend_or_gc in self._friends_and_gc:
+                    if not self._history.friend_exists_in_db(friend_or_gc.tox_id):
+                        self._history.add_friend_to_db(friend_or_gc.tox_id)
                     if not s['save_unsent_only']:
-                        messages = friend.get_corr_for_saving()
+                        messages = friend_or_gc.get_corr_for_saving()
                     else:
-                        messages = friend.get_unsent_messages_for_saving()
-                        self._history.delete_messages(friend.tox_id)
-                    self._history.save_messages_to_db(friend.tox_id, messages)
-                    unsent_messages = friend.get_unsent_messages()
+                        messages = friend_or_gc.get_unsent_messages_for_saving()
+                        self._history.delete_messages(friend_or_gc.tox_id)
+                    self._history.save_messages_to_db(friend_or_gc.tox_id, messages)
+                    unsent_messages = friend_or_gc.get_unsent_messages()
                     unsent_time = unsent_messages[0].get_data()[2] if len(unsent_messages) else time.time() + 1
-                    self._history.update_messages(friend.tox_id, unsent_time)
+                    self._history.update_messages(friend_or_gc.tox_id, unsent_time)
             self._history.save()
             del self._history
 
@@ -439,14 +523,15 @@ class Profile(contact.Contact, Singleton):
         Clear chat history
         """
         if num is not None:
-            friend = self._friends[num]
+            friend = self._friends_and_gc[num]
             friend.clear_corr(save_unsent)
             if self._history.friend_exists_in_db(friend.tox_id):
                 self._history.delete_messages(friend.tox_id)
                 self._history.delete_friend_from_db(friend.tox_id)
         else:  # clear all history
-            for number in range(len(self._friends)):
+            for number in range(len(self._friends_and_gc)):
                 self.clear_history(number, save_unsent)
+
         if num is None or num == self.get_active_number():
             self.update()
 
@@ -454,9 +539,13 @@ class Profile(contact.Contact, Singleton):
         """
         Tries to load next part of messages
         """
-        friend = self._friends[self._active_friend]
-        friend.load_corr(False)
-        data = friend.get_corr()
+        if not self._load_history:
+            return
+        self._load_history = False
+        friend_or_gc = self._friends_and_gc[self._active_friend_or_gc]
+
+        friend_or_gc.load_corr(False)
+        data = friend_or_gc.get_corr()
         if not data:
             return
         data.reverse()
@@ -489,6 +578,7 @@ class Profile(contact.Contact, Singleton):
                                          data[2],
                                          '',
                                          data[3])
+        self._load_history = True
 
     def export_history(self, directory):
         self._history.export(directory)
@@ -504,16 +594,16 @@ class Profile(contact.Contact, Singleton):
         """
         item = ContactItem()
         elem = QtGui.QListWidgetItem(self._screen.friends_list)
-        elem.setSizeHint(QtCore.QSize(250, 70))
+        elem.setSizeHint(QtCore.QSize(250, item.height()))
         self._screen.friends_list.addItem(elem)
         self._screen.friends_list.setItemWidget(elem, item)
         return item
 
-    def create_message_item(self, text, time, owner, message_type, append=True):
+    def create_message_item(self, text, time, owner, message_type, append=True, friend_name=None):
         if message_type == MESSAGE_TYPE['INFO_MESSAGE']:
             name = ''
         elif owner == MESSAGE_OWNER['FRIEND']:
-            name = self.get_active_name()
+            name = friend_name or self.get_active_name()
         else:
             name = self._name
         item = MessageItem(text, time, name, owner != MESSAGE_OWNER['NOT_SENT'], message_type, self._messages)
@@ -572,7 +662,7 @@ class Profile(contact.Contact, Singleton):
         """
         Set new alias for friend
         """
-        friend = self._friends[num]
+        friend = self._friends_and_gc[num]
         name = friend.name
         dialog = QtGui.QApplication.translate('MainWindow',
                                               "Enter new alias for friend {} or leave empty to use friend's name:",
@@ -610,14 +700,16 @@ class Profile(contact.Contact, Singleton):
             self.update()
 
     def friend_public_key(self, num):
-        return self._friends[num].tox_id
+        return self._friends_and_gc[num].tox_id
 
-    def delete_friend(self, num):
+    def delete_friend_or_gc(self, num, is_gc=False, message=None):
         """
-        Removes friend from contact list
-        :param num: number of friend in list
+        Removes friend or gc from contact list
+        :param num: number of friend or gc in list
+        :param is_gc: is a group chat
+        :param message: message in gc
         """
-        friend = self._friends[num]
+        friend = self._friends_and_gc[num]
         settings = Settings.get_instance()
         try:
             index = list(map(lambda x: x[0], settings['friends_aliases'])).index(friend.tox_id)
@@ -630,11 +722,14 @@ class Profile(contact.Contact, Singleton):
         self.clear_history(num)
         if self._history.friend_exists_in_db(friend.tox_id):
             self._history.delete_friend_from_db(friend.tox_id)
-        self._tox.friend_delete(friend.number)
-        del self._friends[num]
+        if not is_gc:
+            self._tox.friend_delete(friend.number)
+        else:
+            self._tox.group_leave(friend.number, message.encode('utf-8') if message is not None else None)
+        del self._friends_and_gc[num]
         self._screen.friends_list.takeItem(num)
-        if num == self._active_friend:  # active friend was deleted
-            if not len(self._friends):  # last friend was deleted
+        if num == self._active_friend_or_gc:  # active friend or gc was deleted
+            if not len(self._friends_and_gc):  # last contact was deleted
                 self.set_active(-1)
             else:
                 self.set_active(0)
@@ -655,7 +750,7 @@ class Profile(contact.Contact, Singleton):
             log('Accept friend request failed! ' + str(ex))
             message_getter = None
         friend = Friend(message_getter, num, tox_id, '', item, tox_id)
-        self._friends.append(friend)
+        self._friends_and_gc.append(friend)
 
     def block_user(self, tox_id):
         """
@@ -670,7 +765,7 @@ class Profile(contact.Contact, Singleton):
             settings.save()
         try:
             num = self._tox.friend_by_public_key(tox_id)
-            self.delete_friend(num)
+            self.delete_friend_or_gc(num)
             data = self._tox.get_savedata()
             ProfileHelper.get_instance().save_profile(data)
         except:  # not in friend list
@@ -722,7 +817,7 @@ class Profile(contact.Contact, Singleton):
                     self._history.add_friend_to_db(tox_id)
                 message_getter = self._history.messages_getter(tox_id)
                 friend = Friend(message_getter, result, tox_id, '', item, tox_id)
-                self._friends.append(friend)
+                self._friends_and_gc.append(friend)
             data = self._tox.get_savedata()
             ProfileHelper.get_instance().save_profile(data)
             return True
@@ -757,22 +852,24 @@ class Profile(contact.Contact, Singleton):
         Recreate tox instance
         :param restart: method which calls restart and returns new tox instance
         """
-        for key in self._file_transfers.keys():
-            self._file_transfers[key].cancel()
+        # TODO: file transfers!!
+        for key in list(self._file_transfers.keys()):
+            self._file_transfers[key].cancelled()
             del self._file_transfers[key]
         self._call.stop()
         del self._tox
         self._tox = restart()
         self.status = None
-        for friend in self._friends:
+        for friend in self._friends_and_gc:
             friend.status = None
+        self.update_filtration()
 
     def close(self):
         if hasattr(self, '_call'):
             self._call.stop()
             del self._call
-        for i in range(len(self._friends)):
-            del self._friends[0]
+        for i in range(len(self._friends_and_gc)):
+            del self._friends_and_gc[0]
 
     # -----------------------------------------------------------------------------------------------------------------
     # File transfers support
@@ -802,22 +899,12 @@ class Profile(contact.Contact, Singleton):
 
         elif auto:
             path = settings['auto_accept_path'] or curr_directory()
-            if not os.path.isdir(path):
-                path = curr_directory()
-            new_file_name, i = file_name, 1
-            while os.path.isfile(path + '/' + new_file_name):  # file with same name already exists
-                if '.' in file_name:  # has extension
-                    d = file_name.rindex('.')
-                else:  # no extension
-                    d = len(file_name)
-                new_file_name = file_name[:d] + ' ({})'.format(i) + file_name[d:]
-                i += 1
-            self.accept_transfer(None, path + '/' + new_file_name, friend_number, file_number, size)
+            self.accept_transfer(None, path + '/' + file_name, friend_number, file_number, size)
             tm = TransferMessage(MESSAGE_OWNER['FRIEND'],
                                  time.time(),
                                  TOX_FILE_TRANSFER_STATE['RUNNING'],
                                  size,
-                                 new_file_name,
+                                 file_name,
                                  friend_number,
                                  file_number)
         else:
@@ -866,7 +953,7 @@ class Profile(contact.Contact, Singleton):
                                                                                0, -1)
 
     def cancel_not_started_transfer(self, time):
-        self._friends[self._active_friend].delete_one_unsent_file(time)
+        self._friends_and_gc[self._active_friend_or_gc].delete_one_unsent_file(time)
         self.update()
 
     def pause_transfer(self, friend_number, file_number, by_friend=False):
@@ -904,6 +991,16 @@ class Profile(contact.Contact, Singleton):
         :param size: file size
         :param inline: is inline image
         """
+        path, file_name = os.path.split(path)
+        new_file_name, i = file_name, 1
+        while os.path.isfile(path + '/' + new_file_name):  # file with same name already exists
+            if '.' in file_name:  # has extension
+                d = file_name.rindex('.')
+            else:  # no extension
+                d = len(file_name)
+            new_file_name = file_name[:d] + ' ({})'.format(i) + file_name[d:]
+            i += 1
+        path = os.path.join(path, new_file_name)
         if not inline:
             rt = ReceiveTransfer(path, self._tox, friend_number, size, file_number)
         else:
@@ -979,7 +1076,7 @@ class Profile(contact.Contact, Singleton):
                              st.get_file_number())
         item = self.create_file_transfer_item(tm)
         st.set_state_changed_handler(item.update)
-        self._friends[self._active_friend].append_message(tm)
+        self._friends_and_gc[self._active_friend_or_gc].append_message(tm)
         self._messages.scrollToBottom()
 
     def incoming_chunk(self, friend_number, file_number, position, data):
@@ -1072,12 +1169,12 @@ class Profile(contact.Contact, Singleton):
 
     def reset_avatar(self):
         super(Profile, self).reset_avatar()
-        for friend in filter(lambda x: x.status is not None, self._friends):
+        for friend in filter(lambda x: x.status is not None, self._friends_and_gc):
             self.send_avatar(friend.number)
 
     def set_avatar(self, data):
         super(Profile, self).set_avatar(data)
-        for friend in filter(lambda x: x.status is not None, self._friends):
+        for friend in filter(lambda x: x.status is not None, self._friends_and_gc):
             self.send_avatar(friend.number)
 
     # -----------------------------------------------------------------------------------------------------------------
@@ -1091,6 +1188,8 @@ class Profile(contact.Contact, Singleton):
 
     def call_click(self, audio=True, video=False):
         """User clicked audio button in main window"""
+        if not self.is_active_a_friend():
+            return
         num = self.get_active_number()
         if num not in self._call and self.is_active_online():  # start call
             self._call(num, audio, video)
@@ -1101,7 +1200,8 @@ class Profile(contact.Contact, Singleton):
             else:
                 text = QtGui.QApplication.translate("incoming_call", "Outgoing audio call", None,
                                                     QtGui.QApplication.UnicodeUTF8)
-            self._friends[self._active_friend].append_message(InfoMessage(text, time.time()))
+
+            self._friends_and_gc[self._active_friend_or_gc].append_message(InfoMessage(text, time.time()))
             self.create_message_item(text, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
             self._messages.scrollToBottom()
         elif num in self._call:  # finish or cancel call if you call with active friend
@@ -1159,6 +1259,74 @@ class Profile(contact.Contact, Singleton):
             self.create_message_item(text, time.time(), '', MESSAGE_TYPE['INFO_MESSAGE'])
             self._messages.scrollToBottom()
 
+    # -----------------------------------------------------------------------------------------------------------------
+    # Group chats support
+    # -----------------------------------------------------------------------------------------------------------------
+
+    def get_all_gc(self):
+        return list(filter(lambda x: type(x) is GroupChat, self._friends_and_gc))
+
+    def add_gc(self, num):
+        try:
+            tox_id = self._tox.group_get_chat_id(num)
+            name = self._tox.group_get_name(num)
+            topic = self._tox.group_get_topic(num)
+        except:
+            tox_id = name = topic = ''
+        item = self.create_friend_item()
+        try:
+            if not self._history.friend_exists_in_db(tox_id):
+                self._history.add_friend_to_db(tox_id)
+            message_getter = self._history.messages_getter(tox_id)
+        except Exception as ex:  # something is wrong
+            log('Accept friend request failed! ' + str(ex))
+            message_getter = None
+        gc = GroupChat(self._tox, num, message_getter, name, topic, item, tox_id)
+        self._friends_and_gc.append(gc)
+
+    def join_gc(self, chat_id, password):
+        num = self._tox.group_join(chat_id, password if password else None)
+        if num != 2 ** 32 - 1:
+            self.add_gc(num)
+        else:
+            pass  # TODO: join failed, show error
+
+    def create_gc(self, name, is_public, password):
+        privacy_state = TOX_GROUP_PRIVACY_STATE['TOX_GROUP_PRIVACY_STATE_PUBLIC'] if is_public else TOX_GROUP_PRIVACY_STATE['TOX_GROUP_PRIVACY_STATE_PRIVATE']
+        num = self._tox.group_new(privacy_state, bytes(name, 'utf-8'))
+        if password:
+            self._tox.group_founder_set_password(num, bytes(password, 'utf-8'))
+        self.add_gc(num)
+        self.get_gc_by_number(num).set_status(TOX_USER_STATUS['NONE'])
+
+    def process_group_invite(self, friend_num, data):
+        # TODO: support password
+        try:
+            text = QtGui.QApplication.translate('MainWindow', 'User {} invites you to group',
+                                                None, QtGui.QApplication.UnicodeUTF8)
+            info = text.format(self.get_friend_by_number(friend_num).name)
+            fr_req = QtGui.QApplication.translate('MainWindow', 'Group chat invite', None, QtGui.QApplication.UnicodeUTF8)
+            reply = QtGui.QMessageBox.question(None, fr_req, info, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+            if reply == QtGui.QMessageBox.Yes:  # accepted
+                num = self._tox.group_invite_accept(data, friend_num)
+                data = self._tox.get_savedata()
+                ProfileHelper.get_instance().save_profile(data)
+                print('In gc invite', num)
+                self.add_gc(num)
+            elif reply != QtGui.QMessageBox.No:
+                if friend_num in self._gc_invites:
+                    self._gc_invites[friend_num].append(data)
+                else:
+                    self._gc_invites[friend_num] = data
+        except Exception as ex:  # something is wrong
+            log('Accept group chat invite failed! ' + str(ex))
+
+    def invite_friend(self, group_number, friend_number):
+        self._tox.group_invite_friend(group_number, friend_number)
+
+    def leave_group(self, num, message=None):
+        self.delete_friend_or_gc(num, True, message)
+
 
 def tox_factory(data=None, settings=None):
     """

toxygen/settings.py

@@ -4,7 +4,7 @@ import os
 import locale
 from util import Singleton, curr_directory, log
 import pyaudio
-from toxencryptsave import LibToxEncryptSave
+from toxencryptsave import ToxEncryptSave
 import smileys
 
 
@@ -20,7 +20,7 @@ class Settings(dict, Singleton):
         if os.path.isfile(self.path):
             with open(self.path, 'rb') as fl:
                 data = fl.read()
-            inst = LibToxEncryptSave.get_instance()
+            inst = ToxEncryptSave.get_instance()
             try:
                 if inst.is_data_encrypted(data):
                     data = inst.pass_decrypt(data)
@@ -35,6 +35,7 @@ class Settings(dict, Singleton):
             self.save()
         smileys.SmileyLoader(self)
         p = pyaudio.PyAudio()
+        self.locked = False
         self.audio = {'input': p.get_default_input_device_info()['index'],
                       'output': p.get_default_output_device_info()['index']}
 
@@ -94,8 +95,8 @@ class Settings(dict, Singleton):
             'ipv6_enabled': True,
             'udp_enabled': True,
             'proxy_type': 0,
-            'proxy_host': '0',
-            'proxy_port': 0,
+            'proxy_host': '127.0.0.1',
+            'proxy_port': 9050,
             'start_port': 0,
             'end_port': 0,
             'tcp_port': 0,
@@ -123,7 +124,10 @@ class Settings(dict, Singleton):
             'y': 400,
             'message_font_size': 14,
             'unread_color': 'red',
-            'save_unsent_only': False
+            'save_unsent_only': False,
+            'compact_mode': False,
+            'show_welcome_screen': True,
+            'notify_all_gc': False
         }
 
     @staticmethod
@@ -144,7 +148,7 @@ class Settings(dict, Singleton):
 
     def save(self):
         text = json.dumps(self)
-        inst = LibToxEncryptSave.get_instance()
+        inst = ToxEncryptSave.get_instance()
         if inst.has_password():
             text = bytes(inst.pass_encrypt(bytes(text, 'utf-8')))
         else:
@@ -179,8 +183,8 @@ class Settings(dict, Singleton):
             app_settings = {}
         if 'active_profile' not in app_settings:
             app_settings['active_profile'] = []
-        profile_path = ProfileHelper.get_path()
-        app_settings['active_profile'].append(str(profile_path + str(self.name) + '.tox'))
+        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(data)
@@ -223,7 +227,7 @@ class ProfileHelper(Singleton):
         return self._directory
 
     def save_profile(self, data):
-        inst = LibToxEncryptSave.get_instance()
+        inst = ToxEncryptSave.get_instance()
         if inst.has_password():
             data = inst.pass_encrypt(data)
         with open(self._path, 'wb') as fl: