version 0.1.2

Fixed missing french translations

README.md

@@ -1,10 +1,13 @@
 # Toxygen 
-Toxygen is simple [Tox](https://tox.chat/) client written on pure Python
+Toxygen is cross-platform [Tox](https://tox.chat/) client written on Python
-### [How to install](/docs/install.md)
 
-### [Contributing](/docs/contributing.md)
+[![Release](https://img.shields.io/github/release/xveduk/toxygen.svg?style=flat)](https://github.com/xveduk/toxygen/releases/latest)
+[![Open issues](https://img.shields.io/github/issues/xveduk/toxygen.svg?style=flat)](https://github.com/xveduk/toxygen/issues)
+[![License](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/xveduk/toxygen/master/LICENSE.md)
 
-# Supported OS:
+### [Install](/docs/install.md) - [Contribute](/docs/contributing.md)
+
+### Supported OS:
 - Windows
 - Linux
 
@@ -25,10 +28,10 @@ Toxygen is simple [Tox](https://tox.chat/) client written on pure Python
 - [x] Contact aliases
 - [x] Contact blocking
 - [x] Typing notifications
+- [x] Changing nospam
+- [x] File resuming
 - [ ] Video
 - [ ] Save file encryption
-- [ ] File resuming
-- [ ] Changing nospam
 - [ ] Plugins support
 - [ ] Group chats
 - [ ] Read receipts
@@ -43,7 +46,7 @@ Toxygen is simple [Tox](https://tox.chat/) client written on pure Python
 [Releases](https://github.com/xveduk/toxygen/releases)
 
 ###Screenshots
-*Toxygen running on Ubuntu and Windows*
+*Toxygen on Ubuntu and Windows*
 ![Ubuntu](/docs/ubuntu.png)
 ![Windows](/docs/windows.png)
 

docs/compile.md

@@ -1,4 +1,7 @@
+#Compile Toxygen
+
 You can compile Toxygen using [PyInstaller](http://www.pyinstaller.org/)
+
 Install PyInstaller: 
 ``pip install pyinstaller``
 

src/callbacks.py

@@ -76,7 +76,7 @@ def friend_connection_status(tox, friend_num, new_status, user_data):
     profile = Profile.get_instance()
     friend = profile.get_friend_by_number(friend_num)
     if new_status == TOX_CONNECTION['NONE']:
-        invoke_in_main_thread(friend.set_status, None)
+        invoke_in_main_thread(profile.friend_exit, friend_num)
         invoke_in_main_thread(profile.update_filtration)
         if Settings.get_instance()['sound_notifications'] and profile.status != TOX_USER_STATUS['BUSY']:
             sound_notification(SOUND_NOTIFICATION['FRIEND_CONNECTION_STATUS'])
@@ -183,11 +183,14 @@ def file_recv_chunk(tox, friend_number, file_number, position, chunk, length, us
     """
     Incoming chunk
     """
-    invoke_in_main_thread(Profile.get_instance().incoming_chunk,
+    if not length:
-                          friend_number,
+        invoke_in_main_thread(Profile.get_instance().incoming_chunk,
-                          file_number,
+                              friend_number,
-                          position,
+                              file_number,
-                          chunk[:length] if length else None)
+                              position,
+                              None)
+    else:
+        Profile.get_instance().incoming_chunk(friend_number, file_number, position,chunk[:length])
 
 
 def file_chunk_request(tox, friend_number, file_number, position, size, user_data):
@@ -210,6 +213,10 @@ def file_recv_control(tox, friend_number, file_number, file_control, user_data):
     """
     if file_control == TOX_FILE_CONTROL['CANCEL']:
         Profile.get_instance().cancel_transfer(friend_number, file_number, True)
+    elif file_control == TOX_FILE_CONTROL['PAUSE']:
+        Profile.get_instance().pause_transfer(friend_number, file_number, True)
+    elif file_control == TOX_FILE_CONTROL['RESUME']:
+        Profile.get_instance().resume_transfer(friend_number, file_number, True)
 
 
 # -----------------------------------------------------------------------------------------------------------------

src/file_transfers.py

@@ -12,11 +12,12 @@ TOX_FILE_TRANSFER_STATE = {
     'PAUSED': 1,
     'CANCELED': 2,
     'FINISHED': 3,
+    'PAUSED_BY_FRIEND': 4
 }
 
 
 class StateSignal(QtCore.QObject):
-    signal = QtCore.Signal(int, float)
+    signal = QtCore.Signal(int, float)  # state and progress
 
 
 class FileTransfer(QtCore.QObject):
@@ -42,6 +43,9 @@ class FileTransfer(QtCore.QObject):
     def set_state_changed_handler(self, handler):
         self._state_changed.signal.connect(handler)
 
+    def signal(self):
+        self._state_changed.signal.emit(self.state, self._done / self._size if self._size else 0)
+
     def get_file_number(self):
         return self._file_number
 
@@ -58,12 +62,20 @@ class FileTransfer(QtCore.QObject):
         if hasattr(self, '_file'):
             sleep(0.1)
             self._file.close()
-        self._state_changed.signal.emit(TOX_FILE_CONTROL['CANCEL'], 1)
+        self.state = TOX_FILE_TRANSFER_STATE['CANCELED']
+        self._state_changed.signal.emit(self.state, 1)
+
+    def pause(self, by_friend):
+        if not by_friend:
+            self.send_control(TOX_FILE_CONTROL['PAUSE'])
+        else:
+            self.state = TOX_FILE_TRANSFER_STATE['PAUSED_BY_FRIEND']
+        self.signal()
 
     def send_control(self, control):
         if self._tox.file_control(self._friend_number, self._file_number, control):
             self.state = control
-            self._state_changed.signal.emit(self.state, self._done / self._size if self._size else 0)
+            self.signal()
 
     def get_file_id(self):
         return self._tox.file_get_file_id(self._friend_number, self._file_number)
@@ -96,9 +108,10 @@ class SendTransfer(FileTransfer):
             data = self._file.read(size)
             self._tox.file_send_chunk(self._friend_number, self._file_number, position, data)
             self._done += size
-            self._state_changed.signal.emit(self.state, self._done / self._size)
+            self.signal()
         else:
-            self._file.close()
+            if hasattr(self, '_file'):
+                self._file.close()
             self.state = TOX_FILE_TRANSFER_STATE['FINISHED']
             self._state_changed.signal.emit(self.state, 1)
 
@@ -208,7 +221,7 @@ class ReceiveToBuffer(FileTransfer):
             if position + l > self._data_size:
                 self._data_size = position + l
             self._done += l
-            self._state_changed.signal.emit(self.state, self._done / self._size)
+            self.signal()
 
 
 class ReceiveAvatar(ReceiveTransfer):
@@ -226,7 +239,6 @@ class ReceiveAvatar(ReceiveTransfer):
         elif exists(path):
             if not size:
                 self.send_control(TOX_FILE_CONTROL['CANCEL'])
-                self.state = TOX_FILE_TRANSFER_STATE['CANCELED']
                 self._file.close()
                 remove(path)
                 remove(path + '.tmp')
@@ -237,7 +249,6 @@ class ReceiveAvatar(ReceiveTransfer):
                 existing_hash = Tox.hash(data)
                 if hash == existing_hash:
                     self.send_control(TOX_FILE_CONTROL['CANCEL'])
-                    self.state = TOX_FILE_TRANSFER_STATE['CANCELED']
                     remove(path + '.tmp')
                 else:
                     self.send_control(TOX_FILE_CONTROL['RESUME'])

src/list_items.py

@@ -136,17 +136,21 @@ class StatusCircle(QtGui.QWidget):
 
 class FileTransferItem(QtGui.QListWidget):
 
-    def __init__(self, file_name, size, time, user, friend_number, file_number, state, parent=None):
+    def __init__(self, file_name, size, time, user, friend_number, file_number, state, width, parent=None):
 
         QtGui.QListWidget.__init__(self, parent)
-        self.resize(QtCore.QSize(620, 50))
+        self.resize(QtCore.QSize(width, 34))
-        if state != FILE_TRANSFER_MESSAGE_STATUS['CANCELLED']:
+        if state == FILE_TRANSFER_MESSAGE_STATUS['CANCELLED']:
-            self.setStyleSheet('QWidget { background-color: green; }')
+            self.setStyleSheet('QListWidget { border: 1px solid #B40404; }')
+        elif state in (FILE_TRANSFER_MESSAGE_STATUS['INCOMING_NOT_STARTED'], FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_FRIEND']):
+            self.setStyleSheet('QListWidget { border: 1px solid #FF8000; }')
         else:
-            self.setStyleSheet('QWidget { background-color: #B40404; }')
+            self.setStyleSheet('QListWidget { border: 1px solid green; }')
+
+        self.state = state
 
         self.name = DataLabel(self)
-        self.name.setGeometry(QtCore.QRect(1, 15, 95, 20))
+        self.name.setGeometry(QtCore.QRect(3, 7, 95, 20))
         self.name.setTextFormat(QtCore.Qt.PlainText)
         font = QtGui.QFont()
         font.setFamily("Times New Roman")
@@ -154,45 +158,50 @@ class FileTransferItem(QtGui.QListWidget):
         font.setBold(True)
         self.name.setFont(font)
         self.name.setText(user)
-        self.name.setStyleSheet('QLabel { color: black; }')
 
         self.time = QtGui.QLabel(self)
-        self.time.setGeometry(QtCore.QRect(570, 2, 50, 46))
+        self.time.setGeometry(QtCore.QRect(width - 53, 7, 50, 20))
         font.setPointSize(10)
         font.setBold(False)
         self.time.setFont(font)
         self.time.setText(convert_time(time))
-        self.time.setStyleSheet('QLabel { color: black; }')
 
         self.cancel = QtGui.QPushButton(self)
-        self.cancel.setGeometry(QtCore.QRect(500, 2, 46, 46))
+        self.cancel.setGeometry(QtCore.QRect(width - 120, 2, 30, 30))
         pixmap = QtGui.QPixmap(curr_directory() + '/images/decline.png')
         icon = QtGui.QIcon(pixmap)
         self.cancel.setIcon(icon)
         self.cancel.setIconSize(QtCore.QSize(30, 30))
         self.cancel.setVisible(state > 1)
         self.cancel.clicked.connect(lambda: self.cancel_transfer(friend_number, file_number))
-        self.cancel.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; }')
+        self.cancel.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; background-color: none;}')
 
-        self.accept = QtGui.QPushButton(self)
+        self.accept_or_pause = QtGui.QPushButton(self)
-        self.accept.setGeometry(QtCore.QRect(450, 2, 46, 46))
+        self.accept_or_pause.setGeometry(QtCore.QRect(width - 170, 2, 30, 30))
-        pixmap = QtGui.QPixmap(curr_directory() + '/images/accept.png')
+        if state == FILE_TRANSFER_MESSAGE_STATUS['INCOMING_NOT_STARTED']:
-        icon = QtGui.QIcon(pixmap)
+            self.accept_or_pause.setVisible(True)
-        self.accept.setIcon(icon)
+            self.button_update('accept')
-        self.accept.setIconSize(QtCore.QSize(30, 30))
+        elif state in (0, 1, 5):
-        self.accept.clicked.connect(lambda: self.accept_transfer(friend_number, file_number, size))
+            self.accept_or_pause.setVisible(False)
-        self.accept.setVisible(state == FILE_TRANSFER_MESSAGE_STATUS['INCOMING_NOT_STARTED'])
+        elif state == FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_USER']:  # setup for continue
-        self.accept.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; }')
+            self.accept_or_pause.setVisible(True)
+            self.button_update('resume')
+        else:  # pause
+            self.accept_or_pause.setVisible(True)
+            self.button_update('pause')
+        self.accept_or_pause.clicked.connect(lambda: self.accept_or_pause_transfer(friend_number, file_number, size))
+
+        self.accept_or_pause.setStyleSheet('QPushButton:hover { border: 1px solid #3A3939; background-color: none}')
 
         self.pb = QtGui.QProgressBar(self)
-        self.pb.setGeometry(QtCore.QRect(100, 15, 100, 20))
+        self.pb.setGeometry(QtCore.QRect(100, 7, 100, 20))
         self.pb.setValue(0)
         self.pb.setStyleSheet('QProgressBar { background-color: #302F2F; }')
         if state < 2:
             self.pb.setVisible(False)
 
         self.file_name = DataLabel(self)
-        self.file_name.setGeometry(QtCore.QRect(210, 2, 230, 46))
+        self.file_name.setGeometry(QtCore.QRect(210, 7, width - 400, 20))
         font.setPointSize(12)
         self.file_name.setFont(font)
         file_size = size / 1024
@@ -204,56 +213,103 @@ class FileTransferItem(QtGui.QListWidget):
             file_size = '{}KB'.format(file_size)
         file_data = u'{} {}'.format(file_size, file_name)
         self.file_name.setText(file_data)
-        self.file_name.setStyleSheet('QLabel { color: black; }')
         self.saved_name = file_name
+        self.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.paused = False
 
     def cancel_transfer(self, friend_number, file_number):
         pr = profile.Profile.get_instance()
         pr.cancel_transfer(friend_number, file_number)
-        self.setStyleSheet('QListWidget { background-color: #B40404; }')
+        self.setStyleSheet('QListWidget { border: 1px solid #B40404; }')
         self.cancel.setVisible(False)
-        self.accept.setVisible(False)
+        self.accept_or_pause.setVisible(False)
         self.pb.setVisible(False)
 
-    def accept_transfer(self, friend_number, file_number, size):
+    def accept_or_pause_transfer(self, friend_number, file_number, size):
-        directory = QtGui.QFileDialog.getExistingDirectory()
+        if self.state == FILE_TRANSFER_MESSAGE_STATUS['INCOMING_NOT_STARTED']:
-        if directory:
+            directory = QtGui.QFileDialog.getExistingDirectory(self,
-            pr = profile.Profile.get_instance()
+                                                               QtGui.QApplication.translate("MainWindow", 'Choose folder', None, QtGui.QApplication.UnicodeUTF8),
-            pr.accept_transfer(self, directory + '/' + self.saved_name, friend_number, file_number, size)
+                                                               curr_directory(),
-            self.accept.setVisible(False)
+                                                               QtGui.QFileDialog.ShowDirsOnly)
+            if directory:
+                pr = profile.Profile.get_instance()
+                pr.accept_transfer(self, directory + '/' + self.saved_name, friend_number, file_number, size)
+                self.button_update('pause')
+        elif self.state == FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_USER']:  # resume
+            self.paused = False
+            profile.Profile.get_instance().resume_transfer(friend_number, file_number)
+            self.button_update('pause')
+            self.state = FILE_TRANSFER_MESSAGE_STATUS['OUTGOING']
+        else:  # pause
+            self.paused = True
+            self.state = FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_USER']
+            profile.Profile.get_instance().pause_transfer(friend_number, file_number)
+            self.button_update('resume')
+        self.accept_or_pause.clearFocus()
+
+    def button_update(self, path):
+        pixmap = QtGui.QPixmap(curr_directory() + '/images/{}.png'.format(path))
+        icon = QtGui.QIcon(pixmap)
+        self.accept_or_pause.setIcon(icon)
+        self.accept_or_pause.setIconSize(QtCore.QSize(30, 30))
+
+    def convert(self, state):
+        # convert TOX_FILE_TRANSFER_STATE to FILE_TRANSFER_MESSAGE_STATUS
+        d = {0: 2, 1: 6, 2: 1, 3: 0, 4: 5}
+        return d[state]
 
     @QtCore.Slot(int, float)
     def update(self, state, progress):
         self.pb.setValue(int(progress * 100))
-        if state == TOX_FILE_TRANSFER_STATE['CANCELED']:
+        state = self.convert(state)
-            self.setStyleSheet('QListWidget { background-color: #B40404; }')
+        if self.state != state:
-            self.cancel.setVisible(False)
+            if state == FILE_TRANSFER_MESSAGE_STATUS['CANCELLED']:
-            self.accept.setVisible(False)
+                self.setStyleSheet('QListWidget { border: 1px solid #B40404; }')
-            self.pb.setVisible(False)
+                self.cancel.setVisible(False)
-        elif state == TOX_FILE_TRANSFER_STATE['FINISHED']:
+                self.accept_or_pause.setVisible(False)
-            self.pb.setVisible(False)
+                self.pb.setVisible(False)
-            self.cancel.setVisible(False)
+                self.state = state
+            elif state == FILE_TRANSFER_MESSAGE_STATUS['FINISHED']:
+                self.accept_or_pause.setVisible(False)
+                self.pb.setVisible(False)
+                self.cancel.setVisible(False)
+                self.setStyleSheet('QListWidget { border: 1px solid green; }')
+                self.state = state
+            elif state == FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_FRIEND']:
+                self.accept_or_pause.setVisible(False)
+                self.setStyleSheet('QListWidget { border: 1px solid #FF8000; }')
+                self.state = state
+            elif state == FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_USER']:
+                self.button_update('resume')  # setup button continue
+                self.setStyleSheet('QListWidget { border: 1px solid green; }')
+                self.state = state
+            elif not self.paused:  # active
+                self.accept_or_pause.setVisible(True)  # setup to pause
+                self.button_update('pause')
+                self.setStyleSheet('QListWidget { border: 1px solid green; }')
+                self.state = state
 
 
 class InlineImageItem(QtGui.QWidget):
 
-    def __init__(self, data, parent=None):
+    def __init__(self, data, width, parent=None):
 
         QtGui.QWidget.__init__(self, parent)
-        self.resize(QtCore.QSize(620, 500))
+        self.resize(QtCore.QSize(width, 500))
         self._image_label = QtGui.QLabel(self)
         self._image_label.raise_()
         self._image_label.setAutoFillBackground(True)
         self._image_label.setScaledContents(False)
         self.pixmap = QtGui.QPixmap()
         self.pixmap.loadFromData(QtCore.QByteArray(data), "PNG")
-        if self.pixmap.width() <= 600:
+        max_size = width - 40
+        if self.pixmap.width() <= max_size:
             self._image_label.setPixmap(self.pixmap)
-            self.resize(QtCore.QSize(600, self.pixmap.height()))
+            self.resize(QtCore.QSize(max_size, self.pixmap.height()))
         else:
-            pixmap = self.pixmap.scaled(600, 600, QtCore.Qt.KeepAspectRatio)
+            pixmap = self.pixmap.scaled(max_size, max_size, QtCore.Qt.KeepAspectRatio)
             self._image_label.setPixmap(pixmap)
-            self.resize(QtCore.QSize(600, pixmap.height()))
+            self.resize(QtCore.QSize(max_size, pixmap.height()))
 
 
 

src/main.py

@@ -13,9 +13,10 @@ import locale
 
 class Toxygen(object):
 
-    def __init__(self):
+    def __init__(self, path=None):
         super(Toxygen, self).__init__()
         self.tox = self.ms = self.init = self.mainloop = self.avloop = None
+        self.path = path
 
     def main(self):
         """
@@ -28,51 +29,57 @@ class Toxygen(object):
         with open(curr_directory() + '/styles/style.qss') as fl:
             dark_style = fl.read()
         app.setStyleSheet(dark_style)
-
+        if self.path is not None:
-        auto_profile = Settings.get_auto_profile()
+            path = os.path.dirname(self.path.encode(locale.getpreferredencoding())) + '/'
-        if not auto_profile:
+            name = os.path.basename(self.path.encode(locale.getpreferredencoding()))[:-4]
-            # show login screen if default profile not found
-            current_locale = QtCore.QLocale()
-            curr_lang = current_locale.languageToString(current_locale.language())
-            langs = Settings.supported_languages()
-            if curr_lang in map(lambda x: x[0], langs):
-                lang_path = filter(lambda x: x[0] == curr_lang, langs)[0][1]
-                translator = QtCore.QTranslator()
-                translator.load(curr_directory() + '/translations/' + lang_path)
-                app.installTranslator(translator)
-                app.translator = translator
-            ls = LoginScreen()
-            ls.setWindowIconText("Toxygen")
-            profiles = ProfileHelper.find_profiles()
-            ls.update_select(map(lambda x: x[1], profiles))
-            _login = self.Login(profiles)
-            ls.update_on_close(_login.login_screen_close)
-            ls.show()
-            app.connect(app, QtCore.SIGNAL("lastWindowClosed()"), app, QtCore.SLOT("quit()"))
-            app.exec_()
-            if not _login.t:
-                return
-            elif _login.t == 1:  # create new profile
-                name = _login.name if _login.name else 'toxygen_user'
-                self.tox = tox_factory()
-                self.tox.self_set_name(_login.name if _login.name else 'Toxygen User')
-                self.tox.self_set_status_message('Toxing on Toxygen')
-                ProfileHelper.save_profile(self.tox.get_savedata(), name)
-                path = Settings.get_default_path()
-                settings = Settings(name)
-            else:  # load existing profile
-                path, name = _login.get_data()
-                if _login.default:
-                    Settings.set_auto_profile(path, name)
-                data = ProfileHelper.open_profile(path, name)
-                settings = Settings(name)
-                self.tox = tox_factory(data, settings)
-        else:
-            path, name = auto_profile
-            path = path.encode(locale.getpreferredencoding())
             data = ProfileHelper.open_profile(path, name)
             settings = Settings(name)
             self.tox = tox_factory(data, settings)
+        else:
+            auto_profile = Settings.get_auto_profile()
+            if not auto_profile:
+                # show login screen if default profile not found
+                current_locale = QtCore.QLocale()
+                curr_lang = current_locale.languageToString(current_locale.language())
+                langs = Settings.supported_languages()
+                if curr_lang in map(lambda x: x[0], langs):
+                    lang_path = filter(lambda x: x[0] == curr_lang, langs)[0][1]
+                    translator = QtCore.QTranslator()
+                    translator.load(curr_directory() + '/translations/' + lang_path)
+                    app.installTranslator(translator)
+                    app.translator = translator
+                ls = LoginScreen()
+                ls.setWindowIconText("Toxygen")
+                profiles = ProfileHelper.find_profiles()
+                ls.update_select(map(lambda x: x[1], profiles))
+                _login = self.Login(profiles)
+                ls.update_on_close(_login.login_screen_close)
+                ls.show()
+                app.connect(app, QtCore.SIGNAL("lastWindowClosed()"), app, QtCore.SLOT("quit()"))
+                app.exec_()
+                if not _login.t:
+                    return
+                elif _login.t == 1:  # create new profile
+                    name = _login.name if _login.name else 'toxygen_user'
+                    self.tox = tox_factory()
+                    self.tox.self_set_name(_login.name if _login.name else 'Toxygen User')
+                    self.tox.self_set_status_message('Toxing on Toxygen')
+                    ProfileHelper.save_profile(self.tox.get_savedata(), name)
+                    path = Settings.get_default_path()
+                    settings = Settings(name)
+                else:  # load existing profile
+                    path, name = _login.get_data()
+                    if _login.default:
+                        Settings.set_auto_profile(path, name)
+                    data = ProfileHelper.open_profile(path, name)
+                    settings = Settings(name)
+                    self.tox = tox_factory(data, settings)
+            else:
+                path, name = auto_profile
+                path = path.encode(locale.getpreferredencoding())
+                data = ProfileHelper.open_profile(path, name)
+                settings = Settings(name)
+                self.tox = tox_factory(data, settings)
 
         if ProfileHelper.is_active_profile(path, name):  # profile is in use
             reply = QtGui.QMessageBox.question(None,
@@ -110,6 +117,8 @@ class Toxygen(object):
             if not self.ms.isActiveWindow():
                 self.ms.setWindowState(self.ms.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
                 self.ms.activateWindow()
+            if self.ms.isHidden():
+                self.ms.show()
 
         m.connect(show, QtCore.SIGNAL("triggered()"), show_window)
         m.connect(exit, QtCore.SIGNAL("triggered()"), lambda: app.exit())
@@ -252,6 +261,8 @@ class Toxygen(object):
 
 
 if __name__ == '__main__':
-    # TODO: add command line options
+    if len(sys.argv) == 1:
-    toxygen = Toxygen()
+        toxygen = Toxygen()
+    else:  # path to profile
+        toxygen = Toxygen(sys.argv[1])
     toxygen.main()

src/mainscreen.py

@@ -19,10 +19,10 @@ class MessageArea(QtGui.QPlainTextEdit):
             if modifiers & QtCore.Qt.ControlModifier or modifiers & QtCore.Qt.ShiftModifier:
                 self.appendPlainText('')
             else:
-                self.parent.send_message()
                 if self.timer.isActive():
                     self.timer.stop()
                 self.parent.profile.send_typing(False)
+                self.parent.send_message()
         elif event.key() == QtCore.Qt.Key_Up and not self.toPlainText():
             self.appendPlainText(Profile.get_instance().get_last_message())
         else:
@@ -109,50 +109,70 @@ class MainWindow(QtGui.QMainWindow):
         self.actionAbout_program.setText(QtGui.QApplication.translate("MainWindow", "About program", None, QtGui.QApplication.UnicodeUTF8))
         self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
         self.audioSettings.setText(QtGui.QApplication.translate("MainWindow", "Audio", None, QtGui.QApplication.UnicodeUTF8))
+        self.contact_name.setPlaceholderText(QtGui.QApplication.translate("MainWindow", "Find contact", None, QtGui.QApplication.UnicodeUTF8))
+        self.screenshotButton.setToolTip(QtGui.QApplication.translate("MainWindow", "Send screenshot", None, QtGui.QApplication.UnicodeUTF8))
+        self.fileTransferButton.setToolTip(QtGui.QApplication.translate("MainWindow", "Send file", None, QtGui.QApplication.UnicodeUTF8))
+        self.sendMessageButton.setToolTip(QtGui.QApplication.translate("MainWindow", "Send message", None, QtGui.QApplication.UnicodeUTF8))
+        self.callButton.setToolTip(QtGui.QApplication.translate("MainWindow", "Start audio call with friend", None, QtGui.QApplication.UnicodeUTF8))
 
     def setup_right_bottom(self, Form):
         Form.setObjectName("right_bottom")
-        Form.resize(650, 100)
+        Form.resize(650, 75)
         self.messageEdit = MessageArea(Form, self)
-        self.messageEdit.setGeometry(QtCore.QRect(0, 10, 450, 110))
+        self.messageEdit.setGeometry(QtCore.QRect(0, 5, 450, 70))
         self.messageEdit.setObjectName("messageEdit")
-        self.screenshotButton = QtGui.QPushButton(Form)
+
-        self.screenshotButton.setGeometry(QtCore.QRect(460, 10, 90, 55))
+        class QRightClickButton(QtGui.QPushButton):
+            def __init__(self, parent):
+                super(QRightClickButton, self).__init__(parent)
+
+            def mousePressEvent(self, event):
+                if event.button() == QtCore.Qt.RightButton:
+                    self.emit(QtCore.SIGNAL("rightClicked()"))
+                else:
+                    super(QRightClickButton, self).mousePressEvent(event)
+
+        self.screenshotButton = QRightClickButton(Form)
+        self.screenshotButton.setGeometry(QtCore.QRect(455, 5, 55, 70))
         self.screenshotButton.setObjectName("screenshotButton")
+
         self.fileTransferButton = QtGui.QPushButton(Form)
-        self.fileTransferButton.setGeometry(QtCore.QRect(460, 65, 90, 55))
+        self.fileTransferButton.setGeometry(QtCore.QRect(510, 5, 55, 70))
         self.fileTransferButton.setObjectName("fileTransferButton")
+
         self.sendMessageButton = QtGui.QPushButton(Form)
-        self.sendMessageButton.setGeometry(QtCore.QRect(550, 10, 70, 110))
+        self.sendMessageButton.setGeometry(QtCore.QRect(565, 5, 55, 70))
         self.sendMessageButton.setObjectName("sendMessageButton")
-        self.sendMessageButton.clicked.connect(self.send_message)
 
         pixmap = QtGui.QPixmap(curr_directory() + '/images/send.png')
         icon = QtGui.QIcon(pixmap)
         self.sendMessageButton.setIcon(icon)
-        self.sendMessageButton.setIconSize(QtCore.QSize(50, 100))
+        self.sendMessageButton.setIconSize(QtCore.QSize(45, 60))
         pixmap = QtGui.QPixmap(curr_directory() + '/images/file.png')
         icon = QtGui.QIcon(pixmap)
         self.fileTransferButton.setIcon(icon)
-        self.fileTransferButton.setIconSize(QtCore.QSize(90, 40))
+        self.fileTransferButton.setIconSize(QtCore.QSize(30, 45))
         pixmap = QtGui.QPixmap(curr_directory() + '/images/screenshot.png')
         icon = QtGui.QIcon(pixmap)
         self.screenshotButton.setIcon(icon)
-        self.screenshotButton.setIconSize(QtCore.QSize(90, 40))
+        self.screenshotButton.setIconSize(QtCore.QSize(40, 60))
 
         self.fileTransferButton.clicked.connect(self.send_file)
         self.screenshotButton.clicked.connect(self.send_screenshot)
+        self.sendMessageButton.clicked.connect(self.send_message)
+        self.connect(self.screenshotButton, QtCore.SIGNAL("rightClicked()"), lambda: self.send_screenshot(True))
+
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def setup_left_bottom(self, Form):
         Form.setObjectName("left_bottom")
-        Form.resize(500, 60)
+        Form.resize(270, 80)
         self.online_contacts = QtGui.QCheckBox(Form)
         self.online_contacts.setGeometry(QtCore.QRect(0, 0, 250, 20))
         self.online_contacts.setObjectName("online_contacts")
         self.online_contacts.clicked.connect(self.filtering)
         self.contact_name = QtGui.QLineEdit(Form)
-        self.contact_name.setGeometry(QtCore.QRect(0, 27, 270, 30))
+        self.contact_name.setGeometry(QtCore.QRect(0, 23, 270, 26))
         self.contact_name.setObjectName("contact_name")
         self.contact_name.textChanged.connect(self.filtering)
         QtCore.QMetaObject.connectSlotsByName(Form)
@@ -240,10 +260,11 @@ class MainWindow(QtGui.QMainWindow):
 
     def setup_right_center(self, widget):
         self.messages = QtGui.QListWidget(widget)
-        self.messages.setGeometry(0, 0, 620, 250)
+        self.messages.setGeometry(0, 0, 620, 310)
         self.messages.setObjectName("messages")
         self.messages.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
         self.messages.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.messages.setFocusPolicy(QtCore.Qt.NoFocus)
 
         def load(pos):
             if not pos:
@@ -254,9 +275,9 @@ class MainWindow(QtGui.QMainWindow):
 
     def initUI(self, tox):
         self.setMinimumSize(920, 500)
-        self.setMaximumSize(920, 500)
         self.setGeometry(400, 400, 920, 500)
         self.setWindowTitle('Toxygen')
+        os.chdir(curr_directory() + '/images/')
         main = QtGui.QWidget()
         grid = QtGui.QGridLayout()
         search = QtGui.QWidget()
@@ -279,8 +300,11 @@ class MainWindow(QtGui.QMainWindow):
         grid.addWidget(main_list, 1, 0, 2, 1)
         grid.setColumnMinimumWidth(1, 500)
         grid.setColumnMinimumWidth(0, 270)
-        grid.setRowMinimumHeight(1, 250)
+        grid.setRowMinimumHeight(1, 400)
+        grid.setRowMinimumHeight(2, 20)
         grid.setRowMinimumHeight(3, 50)
+        grid.setColumnStretch(1, 1)
+        grid.setRowStretch(1, 1)
         main.setLayout(grid)
         self.setCentralWidget(main)
         self.setup_menu(self)
@@ -294,6 +318,25 @@ class MainWindow(QtGui.QMainWindow):
         self.profile.close()
         QtGui.QApplication.closeAllWindows()
 
+    def resizeEvent(self, *args, **kwargs):
+        self.messages.setGeometry(0, 0, self.width() - 300, self.height() - 205)
+        self.friends_list.setGeometry(0, 0, 270, self.height() - 180)
+        self.callButton.setGeometry(QtCore.QRect(self.width() - 370, 30, 50, 50))
+        self.typing.setGeometry(QtCore.QRect(self.width() - 420, 40, 50, 30))
+        self.messageEdit.setGeometry(QtCore.QRect(0, 5, self.width() - 470, 70))
+        self.screenshotButton.setGeometry(QtCore.QRect(self.width() - 465, 5, 55, 70))
+        self.fileTransferButton.setGeometry(QtCore.QRect(self.width() - 410, 5, 55, 70))
+        self.sendMessageButton.setGeometry(QtCore.QRect(self.width() - 355, 5, 55, 70))
+        self.account_name.setGeometry(QtCore.QRect(100, 30, self.width() - 520, 25))
+        self.account_status.setGeometry(QtCore.QRect(100, 50, self.width() - 520, 25))
+        self.profile.update()
+
+    def keyPressEvent(self, event):
+        if event.key() == QtCore.Qt.Key_Escape:
+            self.hide()
+        else:
+            super(MainWindow, self).keyPressEvent(event)
+
     # -----------------------------------------------------------------------------------------------------------------
     # Functions which called when user click in menu
     # -----------------------------------------------------------------------------------------------------------------
@@ -302,7 +345,8 @@ class MainWindow(QtGui.QMainWindow):
         import util
         msgBox = QtGui.QMessageBox()
         msgBox.setWindowTitle(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
-        msgBox.setText(QtGui.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python 2.7. Version: ', None, QtGui.QApplication.UnicodeUTF8) + util.program_version)
+        text = (QtGui.QApplication.translate("MainWindow", 'Toxygen is Tox client written on Python.\nVersion: ', None, QtGui.QApplication.UnicodeUTF8))
+        msgBox.setText(text + util.program_version + '\nGitHub: github.com/xveduk/toxygen/')
         msgBox.exec_()
 
     def network_settings(self):
@@ -343,15 +387,18 @@ class MainWindow(QtGui.QMainWindow):
 
     def send_file(self):
         if self.profile.is_active_online():  # active friend exists and online
-            choose = QtGui.QApplication.translate("MainWindow", "Choose file", None, QtGui.QApplication.UnicodeUTF8)
+            choose_file = QtGui.QApplication.translate("MainWindow", 'Choose file', None, QtGui.QApplication.UnicodeUTF8)
+            choose = QtGui.QApplication.translate("MainWindow", choose_file, None, QtGui.QApplication.UnicodeUTF8)
             name = QtGui.QFileDialog.getOpenFileName(self, choose)
             if name[0]:
                 self.profile.send_file(name[0])
 
-    def send_screenshot(self):
+    def send_screenshot(self, hide=False):
         if self.profile.is_active_online():  # active friend exists and online
-            self.sw = ScreenShotWindow()
+            self.sw = ScreenShotWindow(self)
             self.sw.show()
+            if hide:
+                self.hide()
 
     def call(self):
         if self.profile.is_active_online():  # active friend exists and online
@@ -419,8 +466,7 @@ class MainWindow(QtGui.QMainWindow):
         if value:
             settings['auto_accept_from_friends'].append(tox_id)
         else:
-            index = settings['auto_accept_from_friends'].index(tox_id)
+            settings['auto_accept_from_friends'].remove(tox_id)
-            del settings['auto_accept_from_friends'][index]
         settings.save()
 
     # -----------------------------------------------------------------------------------------------------------------
@@ -445,14 +491,19 @@ class MainWindow(QtGui.QMainWindow):
 
 class ScreenShotWindow(QtGui.QWidget):
 
-    def __init__(self):
+    def __init__(self, parent):
         super(ScreenShotWindow, self).__init__()
+        self.parent = parent
         self.setMouseTracking(True)
         self.setWindowFlags(self.windowFlags() | QtCore.Qt.FramelessWindowHint | QtCore.Qt.WindowStaysOnTopHint)
         self.showFullScreen()
         self.setWindowOpacity(0.5)
         self.rubberband = QtGui.QRubberBand(QtGui.QRubberBand.Rectangle, None)
 
+    def closeEvent(self, *args):
+        if self.parent.isHidden():
+            self.parent.show()
+
     def mousePressEvent(self, event):
         self.origin = event.pos()
         self.rubberband.setGeometry(QtCore.QRect(self.origin, QtCore.QSize()))
@@ -473,16 +524,17 @@ class ScreenShotWindow(QtGui.QWidget):
             self.rubberband.hide()
             rect = self.rubberband.geometry()
             print rect
-            p = QtGui.QPixmap.grabWindow(QtGui.QApplication.desktop().winId(),
+            if rect.width() and rect.height():
-                                         rect.x() + 4,
+                p = QtGui.QPixmap.grabWindow(QtGui.QApplication.desktop().winId(),
-                                         rect.y() + 4,
+                                             rect.x() + 4,
-                                         rect.width() - 8,
+                                             rect.y() + 4,
-                                         rect.height() - 8)
+                                             rect.width() - 8,
-            byte_array = QtCore.QByteArray()
+                                             rect.height() - 8)
-            buffer = QtCore.QBuffer(byte_array)
+                byte_array = QtCore.QByteArray()
-            buffer.open(QtCore.QIODevice.WriteOnly)
+                buffer = QtCore.QBuffer(byte_array)
-            p.save(buffer, 'PNG')
+                buffer.open(QtCore.QIODevice.WriteOnly)
-            Profile.get_instance().send_screenshot(str(byte_array.data()))
+                p.save(buffer, 'PNG')
+                Profile.get_instance().send_screenshot(str(byte_array.data()))
             self.close()
 
     def keyPressEvent(self, event):

src/menu.py

@@ -2,7 +2,7 @@ from PySide import QtCore, QtGui
 from settings import *
 from profile import Profile
 from util import get_style, curr_directory
-from widgets import CenteredWidget
+from widgets import CenteredWidget, DataLabel
 import pyaudio
 
 
@@ -26,28 +26,29 @@ class AddContact(CenteredWidget):
         self.tox_id.setGeometry(QtCore.QRect(50, 40, 471, 27))
         self.tox_id.setObjectName("lineEdit")
         self.label = QtGui.QLabel(self)
-        self.label.setGeometry(QtCore.QRect(30, 10, 80, 20))
+        self.label.setGeometry(QtCore.QRect(60, 10, 80, 20))
-        self.error_label = QtGui.QLabel(self)
+        self.error_label = DataLabel(self)
-        self.error_label.setGeometry(QtCore.QRect(120, 10, 400, 20))
+        self.error_label.setGeometry(QtCore.QRect(120, 10, 420, 20))
         font = QtGui.QFont()
-        font.setPointSize(16)
+        font.setPointSize(10)
-        font.setWeight(75)
+        font.setWeight(30)
-        font.setBold(True)
-        self.label.setFont(font)
-        font.setPointSize(12)
-        font.setBold(False)
-        font.setWeight(40)
         self.error_label.setFont(font)
         self.error_label.setStyleSheet("QLabel { color: red; }")
         self.label.setObjectName("label")
         self.message_edit = QtGui.QTextEdit(self)
         self.message_edit.setGeometry(QtCore.QRect(50, 110, 471, 151))
         self.message_edit.setObjectName("textEdit")
-        self.label_2 = QtGui.QLabel(self)
+        self.message = QtGui.QLabel(self)
-        self.label_2.setGeometry(QtCore.QRect(60, 70, 101, 31))
+        self.message.setGeometry(QtCore.QRect(60, 70, 101, 31))
-        self.label_2.setFont(font)
+        self.message.setFont(font)
-        self.label_2.setObjectName("label_2")
+        self.message.setObjectName("label_2")
         self.retranslateUi()
+        self.message_edit.setText('Hello! Add me to your contact list please')
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        font.setBold(True)
+        self.label.setFont(font)
+        self.message.setFont(font)
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def add_friend(self):
@@ -57,15 +58,13 @@ class AddContact(CenteredWidget):
             # request was successful
             self.close()
         else:  # print error data
-            if len(send) > 40:
-                send = send[:40] + '...'
             self.error_label.setText(send)
 
     def retranslateUi(self):
         self.setWindowTitle(QtGui.QApplication.translate('AddContact', "Add contact", None, QtGui.QApplication.UnicodeUTF8))
         self.sendRequestButton.setText(QtGui.QApplication.translate("Form", "Send request", None, QtGui.QApplication.UnicodeUTF8))
         self.label.setText(QtGui.QApplication.translate('AddContact', "TOX ID:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate('AddContact', "Message:", None, QtGui.QApplication.UnicodeUTF8))
+        self.message.setText(QtGui.QApplication.translate('AddContact', "Message:", None, QtGui.QApplication.UnicodeUTF8))
 
 
 class ProfileSettings(CenteredWidget):
@@ -76,8 +75,8 @@ class ProfileSettings(CenteredWidget):
 
     def initUI(self):
         self.setObjectName("ProfileSettingsForm")
-        self.setMinimumSize(QtCore.QSize(650, 370))
+        self.setMinimumSize(QtCore.QSize(650, 320))
-        self.setMaximumSize(QtCore.QSize(650, 370))
+        self.setMaximumSize(QtCore.QSize(650, 320))
         self.nick = QtGui.QLineEdit(self)
         self.nick.setGeometry(QtCore.QRect(30, 60, 350, 27))
         self.nick.setObjectName("nick")
@@ -88,7 +87,7 @@ class ProfileSettings(CenteredWidget):
         self.status.setObjectName("status")
         self.status.setText(profile.status_message)
         self.label = QtGui.QLabel(self)
-        self.label.setGeometry(QtCore.QRect(50, 30, 91, 21))
+        self.label.setGeometry(QtCore.QRect(40, 30, 91, 25))
         font = QtGui.QFont()
         font.setPointSize(18)
         font.setWeight(75)
@@ -96,11 +95,11 @@ class ProfileSettings(CenteredWidget):
         self.label.setFont(font)
         self.label.setObjectName("label")
         self.label_2 = QtGui.QLabel(self)
-        self.label_2.setGeometry(QtCore.QRect(40, 100, 100, 21))
+        self.label_2.setGeometry(QtCore.QRect(40, 100, 100, 25))
         self.label_2.setFont(font)
         self.label_2.setObjectName("label_2")
         self.label_3 = QtGui.QLabel(self)
-        self.label_3.setGeometry(QtCore.QRect(40, 170, 100, 21))
+        self.label_3.setGeometry(QtCore.QRect(40, 180, 100, 25))
         self.label_3.setFont(font)
         self.label_3.setObjectName("label_3")
         self.tox_id = QtGui.QLabel(self)
@@ -111,13 +110,16 @@ class ProfileSettings(CenteredWidget):
         s = profile.tox_id
         self.tox_id.setText(s)
         self.copyId = QtGui.QPushButton(self)
-        self.copyId.setGeometry(QtCore.QRect(40, 250, 150, 30))
+        self.copyId.setGeometry(QtCore.QRect(40, 250, 160, 30))
         self.copyId.setObjectName("copyId")
         self.copyId.clicked.connect(self.copy)
         self.export = QtGui.QPushButton(self)
-        self.export.setGeometry(QtCore.QRect(200, 250, 150, 30))
+        self.export.setGeometry(QtCore.QRect(210, 250, 160, 30))
         self.export.setObjectName("export")
         self.export.clicked.connect(self.export_profile)
+        self.new_nospam = QtGui.QPushButton(self)
+        self.new_nospam.setGeometry(QtCore.QRect(380, 250, 160, 30))
+        self.new_nospam.clicked.connect(self.new_no_spam)
         self.new_avatar = QtGui.QPushButton(self)
         self.new_avatar.setGeometry(QtCore.QRect(400, 50, 200, 50))
         self.delete_avatar = QtGui.QPushButton(self)
@@ -136,18 +138,25 @@ class ProfileSettings(CenteredWidget):
         self.copyId.setText(QtGui.QApplication.translate("ProfileSettingsForm", "Copy TOX ID", None, QtGui.QApplication.UnicodeUTF8))
         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))
 
     def copy(self):
         clipboard = QtGui.QApplication.clipboard()
         profile = Profile.get_instance()
         clipboard.setText(profile.tox_id)
+        pixmap = QtGui.QPixmap(curr_directory() + '/images/accept.png')
+        icon = QtGui.QIcon(pixmap)
+        self.copyId.setIcon(icon)
+        self.copyId.setIconSize(QtCore.QSize(10, 10))
+
+    def new_no_spam(self):
+        self.tox_id.setText(Profile.get_instance().new_nospam())
 
     def reset_avatar(self):
         Profile.get_instance().reset_avatar()
 
     def set_avatar(self):
         name = QtGui.QFileDialog.getOpenFileName(self, 'Open file', None, 'Image Files (*.png)')
-        print name
         if name[0]:
             with open(name[0], 'rb') as f:
                 data = f.read()
@@ -173,7 +182,6 @@ class NetworkSettings(CenteredWidget):
     def __init__(self, reset):
         super(NetworkSettings, self).__init__()
         self.reset = reset
-        self.reconn = False
         self.initUI()
 
     def initUI(self):
@@ -204,14 +212,15 @@ class NetworkSettings(CenteredWidget):
         self.label_2 = QtGui.QLabel(self)
         self.label_2.setGeometry(QtCore.QRect(40, 165, 66, 17))
         self.reconnect = QtGui.QPushButton(self)
-        self.reconnect.setGeometry(QtCore.QRect(40, 230, 200, 30))
+        self.reconnect.setGeometry(QtCore.QRect(40, 230, 231, 30))
         self.reconnect.clicked.connect(self.restart_core)
         settings = Settings.get_instance()
         self.ipv.setChecked(settings['ipv6_enabled'])
         self.udp.setChecked(settings['udp_enabled'])
-        self.proxy.setChecked(settings['proxy_type'] != 0)
+        self.proxy.setChecked(settings['proxy_type'])
         self.proxyip.setText(settings['proxy_host'])
         self.proxyport.setText(unicode(settings['proxy_port']))
+        self.http.setChecked(settings['proxy_type'] == 1)
         self.retranslateUi()
         self.proxy.stateChanged.connect(lambda x: self.activate())
         self.activate()
@@ -233,27 +242,20 @@ class NetworkSettings(CenteredWidget):
         self.http.setEnabled(bl)
         self.proxyport.setEnabled(bl)
 
-    def closeEvent(self, *args, **kwargs):
+    def restart_core(self):
-        settings = Settings.get_instance()
+        try:
-        old_data = str(settings['ipv6_enabled']) + str(settings['udp_enabled']) + str(bool(settings['proxy_type']))
+            settings = Settings.get_instance()
-        new_data = str(self.ipv.isChecked()) + str(self.udp.isChecked()) + str(self.proxy.isChecked())
-        changed = old_data != new_data
-        if self.proxy.isChecked() and (self.proxyip.text() != settings['proxy_host'] or self.proxyport.text() != unicode(settings['proxy_port'])):
-            changed = True
-        if changed:
             settings['ipv6_enabled'] = self.ipv.isChecked()
             settings['udp_enabled'] = self.udp.isChecked()
-            settings['proxy_type'] = 2 - int(self.http.isChecked())
+            settings['proxy_type'] = 2 - int(self.http.isChecked()) if self.proxy.isChecked() else 0
-            settings['proxy_host'] = self.proxyip.text()
+            settings['proxy_host'] = str(self.proxyip.text())
             settings['proxy_port'] = int(self.proxyport.text())
             settings.save()
-        if changed or self.reconnect:
             # recreate tox instance
             Profile.get_instance().reset(self.reset)
-
+            self.close()
-    def restart_core(self):
+        except:
-        self.reconn = True
+            pass
-        self.close()
 
 
 class PrivacySettings(CenteredWidget):
@@ -269,21 +271,21 @@ class PrivacySettings(CenteredWidget):
         self.setMinimumSize(QtCore.QSize(350, 550))
         self.setMaximumSize(QtCore.QSize(350, 550))
         self.saveHistory = QtGui.QCheckBox(self)
-        self.saveHistory.setGeometry(QtCore.QRect(40, 20, 291, 22))
+        self.saveHistory.setGeometry(QtCore.QRect(10, 20, 291, 22))
         self.saveHistory.setObjectName("saveHistory")
         self.fileautoaccept = QtGui.QCheckBox(self)
-        self.fileautoaccept.setGeometry(QtCore.QRect(40, 60, 271, 22))
+        self.fileautoaccept.setGeometry(QtCore.QRect(10, 60, 271, 22))
         self.fileautoaccept.setObjectName("fileautoaccept")
         self.typingNotifications = QtGui.QCheckBox(self)
-        self.typingNotifications.setGeometry(QtCore.QRect(40, 100, 350, 30))
+        self.typingNotifications.setGeometry(QtCore.QRect(10, 100, 350, 30))
         self.typingNotifications.setObjectName("typingNotifications")
         self.inlines = QtGui.QCheckBox(self)
-        self.inlines.setGeometry(QtCore.QRect(40, 140, 350, 30))
+        self.inlines.setGeometry(QtCore.QRect(10, 140, 350, 30))
         self.inlines.setObjectName("inlines")
 
 
         self.auto_path = QtGui.QLabel(self)
-        self.auto_path.setGeometry(QtCore.QRect(40, 190, 350, 30))
+        self.auto_path.setGeometry(QtCore.QRect(10, 190, 350, 30))
         self.path = QtGui.QPlainTextEdit(self)
         self.path.setGeometry(QtCore.QRect(10, 225, 330, 45))
         self.change_path = QtGui.QPushButton(self)
@@ -382,6 +384,12 @@ class NotificationsSettings(CenteredWidget):
         self.callsSound.setGeometry(QtCore.QRect(10, 120, 340, 18))
         self.soundNotifications = QtGui.QCheckBox(self)
         self.soundNotifications.setGeometry(QtCore.QRect(10, 70, 340, 18))
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        font.setBold(True)
+        self.callsSound.setFont(font)
+        self.soundNotifications.setFont(font)
+        self.enableNotifications.setFont(font)
         s = Settings.get_instance()
         self.enableNotifications.setChecked(s['notifications'])
         self.soundNotifications.setChecked(s['sound_notifications'])

src/messages.py

@@ -12,7 +12,9 @@ FILE_TRANSFER_MESSAGE_STATUS = {
     'CANCELLED': 1,
     'OUTGOING': 2,
     'INCOMING_NOT_STARTED': 3,
-    'INCOMING_STARTED': 4
+    'INCOMING_STARTED': 4,
+    'PAUSED_BY_FRIEND': 5,
+    'PAUSED_BY_USER': 6
 }
 
 

src/profile.py

@@ -207,7 +207,7 @@ class Friend(Contact):
         """
         if hasattr(self, '_message_getter'):
             del self._message_getter
-        self._corr = filter(lambda x: x.get_type() == 2 and x.get_status() in (2, 4), self._corr)
+        self._corr = filter(lambda x: x.get_type() == 2 and x.get_status() >= 2, self._corr)
         self._unsaved_messages = 0
 
     def update_transfer_data(self, file_number, status, inline=None):
@@ -341,6 +341,12 @@ class Profile(Contact, Singleton):
         super(self.__class__, self).set_status_message(value)
         self._tox.self_set_status_message(self._status_message.encode('utf-8'))
 
+    def new_nospam(self):
+        import random
+        self._tox.self_set_nospam(random.randint(0, 4294967295))  # no spam - uint32
+        self._tox_id = self._tox.self_get_address()
+        return self._tox_id
+
     # -----------------------------------------------------------------------------------------------------------------
     # Filtration
     # -----------------------------------------------------------------------------------------------------------------
@@ -381,6 +387,7 @@ class Profile(Contact, Singleton):
 
     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
@@ -413,9 +420,13 @@ class Profile(Contact, Singleton):
                                                  data[3])
                     elif message.get_type() == 2:
                         item = self.create_file_transfer_item(message)
-                        if message.get_status() in (2, 4):  # active file transfer
+                        if message.get_status() >= 2:  # active file transfer
-                            ft = self._file_transfers[(message.get_friend_number(), message.get_file_number())]
+                            try:
-                            ft.set_state_changed_handler(item.update)
+                                ft = self._file_transfers[(message.get_friend_number(), message.get_file_number())]
+                                ft.set_state_changed_handler(item.update)
+                                ft.signal()
+                            except:
+                                print 'Incoming not started transfer - no info found'
                     else:  # inline
                         self.create_inline_item(message.get_data())
                 self._messages.scrollToBottom()
@@ -433,6 +444,7 @@ class Profile(Contact, Singleton):
             avatar_path = (ProfileHelper.get_path() + 'avatars/{}.png').format(friend.tox_id[:TOX_PUBLIC_KEY_SIZE * 2])
             if not os.path.isfile(avatar_path):  # load default image
                 avatar_path = curr_directory() + '/images/avatar.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)
@@ -456,17 +468,36 @@ class Profile(Contact, Singleton):
     def is_active_online(self):
         return self._active_friend + 1 and self._friends[self._active_friend].status is not None
 
+    def update(self):
+        if self._active_friend + 1:
+            self.set_active(self._active_friend)
+
+    def friend_exit(self, friend_number):
+        self.get_friend_by_number(friend_number).status = None
+        self.friend_typing(friend_number, False)
+        if friend_number in self._call:
+            self._call.finish_call(friend_number, True)
+        for key in filter(lambda x: x[0] == friend_number, self._file_transfers.keys()):
+            self._file_transfers[key].cancelled()
+            del self._file_transfers[key]
+
     # -----------------------------------------------------------------------------------------------------------------
     # Typing notifications
     # -----------------------------------------------------------------------------------------------------------------
 
     def send_typing(self, typing):
+        """
+        Send typing notification to a friend
+        """
         if Settings.get_instance()['typing_notifications']:
             friend = self._friends[self._active_friend]
             if friend.status is not None:
                 self._tox.self_set_typing(friend.number, typing)
 
     def friend_typing(self, friend_number, typing):
+        """
+        Display incoming typing notification
+        """
         if friend_number == self.get_active_number():
             self._screen.typing.setVisible(typing)
 
@@ -491,7 +522,7 @@ class Profile(Contact, Singleton):
             elif '.' in last_part:
                 index = last_part.index('.')
             else:
-                index = TOX_MAX_MESSAGE_LENGTH - size
+                index = TOX_MAX_MESSAGE_LENGTH - size - 1
             index += size + 1
             self._tox.friend_send_message(number, message_type, message[:index])
             message = message[index:]
@@ -586,7 +617,7 @@ class Profile(Contact, Singleton):
                                          False)
             elif message.get_type() == 2:
                 item = self.create_file_transfer_item(message, False)
-                if message.get_status() in (2, 4):
+                if message.get_status() >= 2:
                     ft = self._file_transfers[(message.get_friend_number(), message.get_file_number())]
                     ft.set_state_changed_handler(item.update)
 
@@ -622,9 +653,10 @@ class Profile(Contact, Singleton):
     def create_file_transfer_item(self, tm, append=True):
         data = list(tm.get_data())
         data[3] = self.get_friend_by_number(data[4]).name if data[3] else self._name
+        data.append(self._messages.width())
         item = FileTransferItem(*data)
         elem = QtGui.QListWidgetItem()
-        elem.setSizeHint(QtCore.QSize(600, 50))
+        elem.setSizeHint(QtCore.QSize(self._messages.width() - 30, 34))
         if append:
             self._messages.addItem(elem)
         else:
@@ -633,9 +665,9 @@ class Profile(Contact, Singleton):
         return item
 
     def create_inline_item(self, data, append=True):
-        item = InlineImageItem(data)
+        item = InlineImageItem(data, self._messages.width())
         elem = QtGui.QListWidgetItem()
-        elem.setSizeHint(QtCore.QSize(600, item.height()))
+        elem.setSizeHint(QtCore.QSize(self._messages.width(), item.height()))
         if append:
             self._messages.addItem(elem)
         else:
@@ -691,6 +723,13 @@ class Profile(Contact, Singleton):
         :param num: number of friend in list
         """
         friend = self._friends[num]
+        try:
+            settings = Settings.get_instance()
+            index = map(lambda x: x[0], settings['friends_aliases']).index(friend.tox_id)
+            del settings['friends_aliases'][index]
+            settings.save()
+        except:
+            pass
         self.clear_history(num)
         if self._history.friend_exists_in_db(friend.tox_id):
             self._history.delete_friend_from_db(friend.tox_id)
@@ -702,6 +741,8 @@ class Profile(Contact, Singleton):
                 self.set_active(-1)
             else:
                 self.set_active(0)
+        data = self._tox.get_savedata()
+        ProfileHelper.save_profile(data)
 
     def add_friend(self, tox_id):
         num = self._tox.friend_add_norequest(tox_id)  # num - friend number
@@ -717,6 +758,9 @@ class Profile(Contact, Singleton):
         self._friends.append(friend)
 
     def block_user(self, tox_id):
+        """
+        Block user with specified tox id (or public key) - delete from friends list and ignore friend requests
+        """
         tox_id = tox_id[:TOX_PUBLIC_KEY_SIZE * 2]
         if tox_id == self.tox_id[:TOX_PUBLIC_KEY_SIZE * 2]:
             return
@@ -727,15 +771,24 @@ class Profile(Contact, Singleton):
         try:
             num = self._tox.friend_by_public_key(tox_id)
             self.delete_friend(num)
+            data = self._tox.get_savedata()
+            ProfileHelper.save_profile(data)
         except:  # not in friend list
             pass
 
     def unblock_user(self, tox_id, add_to_friend_list):
+        """
+        Unblock user
+        :param tox_id: tox id of contact
+        :param add_to_friend_list: add this contact to friend list or not
+        """
         s = Settings.get_instance()
         s['blocked'].remove(tox_id)
         s.save()
         if add_to_friend_list:
             self.add_friend(tox_id)
+            data = self._tox.get_savedata()
+            ProfileHelper.save_profile(data)
 
     # -----------------------------------------------------------------------------------------------------------------
     # Friend requests
@@ -749,19 +802,29 @@ class Profile(Contact, Singleton):
         :return: True on success else error string
         """
         try:
-            message = message or 'Add me to your contact list'
+            message = message or 'Hello! Add me to your contact list please'
             if '@' in tox_id:  # value like groupbot@toxme.io
                 tox_id = tox_dns(tox_id)
                 if tox_id is None:
                     raise Exception('TOX DNS lookup failed')
-            result = self._tox.friend_add(tox_id, message.encode('utf-8'))
+            if len(tox_id) == TOX_PUBLIC_KEY_SIZE * 2:  # public key
-            tox_id = tox_id[:TOX_PUBLIC_KEY_SIZE * 2]
+                self.add_friend(tox_id)
-            item = self.create_friend_item()
+                msgBox = QtGui.QMessageBox()
-            if not self._history.friend_exists_in_db(tox_id):
+                msgBox.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Friend added", None, QtGui.QApplication.UnicodeUTF8))
-                self._history.add_friend_to_db(tox_id)
+                text = (QtGui.QApplication.translate("MainWindow", 'Friend added without sending friend request', None, QtGui.QApplication.UnicodeUTF8))
-            message_getter = self._history.messages_getter(tox_id)
+                msgBox.setText(text)
-            friend = Friend(message_getter, result, tox_id, '', item, tox_id)
+                msgBox.exec_()
-            self._friends.append(friend)
+            else:
+                result = self._tox.friend_add(tox_id, message.encode('utf-8'))
+                tox_id = tox_id[:TOX_PUBLIC_KEY_SIZE * 2]
+                item = self.create_friend_item()
+                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, result, tox_id, '', item, tox_id)
+                self._friends.append(friend)
+            data = self._tox.get_savedata()
+            ProfileHelper.save_profile(data)
             return True
         except Exception as ex:  # wrong data
             log('Friend request failed with ' + str(ex))
@@ -780,6 +843,8 @@ class Profile(Contact, Singleton):
             reply = QtGui.QMessageBox.question(None, fr_req, info, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
             if reply == QtGui.QMessageBox.Yes:  # accepted
                 self.add_friend(tox_id)
+                data = self._tox.get_savedata()
+                ProfileHelper.save_profile(data)
         except Exception as ex:  # something is wrong
             log('Accept friend request failed! ' + str(ex))
 
@@ -795,6 +860,7 @@ class Profile(Contact, Singleton):
         for key in self._file_transfers.keys():
             self._file_transfers[key].cancel()
             del self._file_transfers[key]
+        self._call.stop()
         del self._tox
         self._tox = restart()
         self.status = None
@@ -884,10 +950,34 @@ class Profile(Contact, Singleton):
                 tr.cancel()
             else:
                 tr.cancelled()
-            del self._file_transfers[(friend_number, file_number)]
+            if (friend_number, file_number) in self._file_transfers:
+                del tr
+                del self._file_transfers[(friend_number, file_number)]
         else:
             self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL'])
 
+    def pause_transfer(self, friend_number, file_number, by_friend=False):
+        """
+        Pause transfer with specified data
+        """
+        tr = self._file_transfers[(friend_number, file_number)]
+        tr.pause(by_friend)
+        t = FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_FRIEND'] if by_friend else FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_USER']
+        self.get_friend_by_number(friend_number).update_transfer_data(file_number, t)
+
+    def resume_transfer(self, friend_number, file_number, by_friend=False):
+        """
+        Resume transfer with specified data
+        """
+        self.get_friend_by_number(friend_number).update_transfer_data(file_number,
+                                                                      FILE_TRANSFER_MESSAGE_STATUS['OUTGOING'])
+        tr = self._file_transfers[(friend_number, file_number)]
+        if by_friend:
+            tr.state = TOX_FILE_TRANSFER_STATE['RUNNING']
+            tr.signal()
+        else:  # send seek control?
+            tr.send_control(TOX_FILE_CONTROL['RESUME'])
+
     def accept_transfer(self, item, path, friend_number, file_number, size, inline=False):
         """
         :param item: transfer item.
@@ -918,7 +1008,7 @@ class Profile(Contact, Singleton):
         self._file_transfers[(friend.number, st.get_file_number())] = st
         tm = TransferMessage(MESSAGE_OWNER['ME'],
                              time.time(),
-                             FILE_TRANSFER_MESSAGE_STATUS['OUTGOING'],
+                             FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_FRIEND'],  # OUTGOING NOT STARTED
                              len(data),
                              'toxygen_inline.png',
                              friend.number,
@@ -938,7 +1028,7 @@ class Profile(Contact, Singleton):
         self._file_transfers[(friend_number, st.get_file_number())] = st
         tm = TransferMessage(MESSAGE_OWNER['ME'],
                              time.time(),
-                             FILE_TRANSFER_MESSAGE_STATUS['OUTGOING'],
+                             FILE_TRANSFER_MESSAGE_STATUS['PAUSED_BY_FRIEND'],  # OUTGOING NOT STARTED
                              os.path.getsize(path),
                              os.path.basename(path),
                              friend_number,
@@ -952,7 +1042,7 @@ class Profile(Contact, Singleton):
         if (friend_number, file_number) in self._file_transfers:
             transfer = self._file_transfers[(friend_number, file_number)]
             transfer.write_chunk(position, data)
-            if transfer.state:
+            if transfer.state in (2, 3):  # finished or cancelled
                 if type(transfer) is ReceiveAvatar:
                     self.get_friend_by_number(friend_number).load_avatar()
                     self.set_active(None)
@@ -963,7 +1053,7 @@ class Profile(Contact, Singleton):
                                                                                       inline)
                     if friend_number == self.get_active_number():
                         count = self._messages.count()
-                        item = InlineImageItem(transfer.get_data())
+                        item = InlineImageItem(transfer.get_data(), self._messages.width())
                         elem = QtGui.QListWidgetItem()
                         elem.setSizeHint(QtCore.QSize(600, item.height()))
                         self._messages.insertItem(count + i + 1, elem)
@@ -977,7 +1067,7 @@ class Profile(Contact, Singleton):
         if (friend_number, file_number) in self._file_transfers:
             transfer = self._file_transfers[(friend_number, file_number)]
             transfer.send_chunk(position, size)
-            if transfer.state:
+            if transfer.state in (2, 3):  # finished or cancelled
                 del self._file_transfers[(friend_number, file_number)]
                 if type(transfer) is not SendAvatar:
                     if type(transfer) is SendFromBuffer and Settings.get_instance()['allow_inline']:  # inline
@@ -985,7 +1075,7 @@ class Profile(Contact, Singleton):
                         self.get_friend_by_number(friend_number).update_transfer_data(file_number,
                                                                                       FILE_TRANSFER_MESSAGE_STATUS['FINISHED'],
                                                                                       inline)
-                        self.set_active(self._active_friend)
+                        self.update()
                     else:
                         self.get_friend_by_number(friend_number).update_transfer_data(file_number,
                                                                                       FILE_TRANSFER_MESSAGE_STATUS['FINISHED'])

src/settings.py

@@ -2,7 +2,7 @@ from platform import system
 import json
 import os
 import locale
-from util import Singleton, curr_directory
+from util import Singleton, curr_directory, log
 import pyaudio
 
 
@@ -14,7 +14,12 @@ class Settings(Singleton, dict):
         if os.path.isfile(self.path):
             with open(self.path) as fl:
                 data = fl.read()
-            super(self.__class__, self).__init__(json.loads(data))
+            try:
+                info = json.loads(data)
+            except Exception as ex:
+                info = Settings.get_default_settings()
+                log('Parsing settings error: ' + str(ex))
+            super(self.__class__, self).__init__(info)
             self.upgrade()
         else:
             super(self.__class__, self).__init__(Settings.get_default_settings())
@@ -57,7 +62,7 @@ class Settings(Singleton, dict):
             'language': 'English',
             'save_history': False,
             'allow_inline': True,
-            'allow_auto_accept': False,
+            'allow_auto_accept': True,
             'auto_accept_path': None,
             'show_online_friends': False,
             'auto_accept_from_friends': [],

src/styles/style.qss

@@ -668,7 +668,7 @@ QComboBox QAbstractItemView
     background-color: #201F1F;
     border-radius: 2px;
     border: 1px solid #444;
-    selection-background-color: #3d8ec9;
+    selection-background-color: #A9A9A9;
 }
 
 QComboBox::drop-down
@@ -1268,4 +1268,9 @@ QCheckBox
     color: #bbb;
     margin-bottom: 2px;
     text-align: center;
+}
+
+QListWidget > QLabel 
+{
+    color: #A9A9A9;
 }

src/tox.py

@@ -32,6 +32,7 @@ def bin_to_string(raw_id, length):
 
 
 class Tox(object):
+
     libtoxcore = LibToxCore()
     
     def __init__(self, tox_options=None, tox_pointer=None):
@@ -57,9 +58,9 @@ class Tox(object):
                 raise MemoryError('The function was unable to allocate enough '
                                   'memory to store the internal structures for the Tox object.')
             elif tox_err_new == TOX_ERR_NEW['PORT_ALLOC']:
-                raise MemoryError('The function was unable to bind to a port. This may mean that all ports have already'
+                raise RuntimeError('The function was unable to bind to a port. This may mean that all ports have '
-                                  ' been bound, e.g. by other Tox instances, or it may mean a permission error. You may'
+                                   'already been bound, e.g. by other Tox instances, or it may mean a permission error.'
-                                  ' be able to gather more information from errno.')
+                                   ' You may be able to gather more information from errno.')
             elif tox_err_new == TOX_ERR_NEW['PROXY_BAD_TYPE']:
                 raise ArgumentError('proxy_type was invalid.')
             elif tox_err_new == TOX_ERR_NEW['PROXY_BAD_HOST']:
@@ -89,6 +90,8 @@ class Tox(object):
             self.file_chunk_request_cb = None
             self.file_recv_cb = None
             self.file_recv_chunk_cb = None
+            self.friend_lossy_packet_cb = None
+            self.friend_lossless_packet_cb = None
 
             self.AV = ToxAV(self._tox_pointer)
 
@@ -218,7 +221,7 @@ class Tox(object):
         """
         tox_err_bootstrap = c_int()
         result = Tox.libtoxcore.tox_add_tcp_relay(self._tox_pointer, c_char_p(address), c_uint16(port),
-                                                  c_char_p(public_key), byref(tox_err_bootstrap))
+                                                  string_to_bin(public_key), byref(tox_err_bootstrap))
         tox_err_bootstrap = tox_err_bootstrap.value
         if tox_err_bootstrap == TOX_ERR_BOOTSTRAP['OK']:
             return bool(result)
@@ -674,6 +677,7 @@ class Tox(object):
 
         The data written to `name` is equal to the data received by the last `friend_name` callback.
 
+        :param friend_number: number of friend
         :param name: pointer (c_char_p) to a valid memory region large enough to store the friend's name.
         :return: name of the friend
         """
@@ -949,7 +953,7 @@ class Tox(object):
         elif tox_err_friend_send_message == TOX_ERR_FRIEND_SEND_MESSAGE['FRIEND_NOT_CONNECTED']:
             raise ArgumentError('This client is currently not connected to the friend.')
         elif tox_err_friend_send_message == TOX_ERR_FRIEND_SEND_MESSAGE['SENDQ']:
-            raise ArgumentError('An allocation error occurred while increasing the send queue size.')
+            raise MemoryError('An allocation error occurred while increasing the send queue size.')
         elif tox_err_friend_send_message == TOX_ERR_FRIEND_SEND_MESSAGE['TOO_LONG']:
             raise ArgumentError('Message length exceeded TOX_MAX_MESSAGE_LENGTH.')
         elif tox_err_friend_send_message == TOX_ERR_FRIEND_SEND_MESSAGE['EMPTY']:
@@ -1055,16 +1059,16 @@ class Tox(object):
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['FRIEND_NOT_FOUND']:
             raise ArgumentError('The friend_number passed did not designate a valid friend.')
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['FRIEND_NOT_CONNECTED']:
-            raise RuntimeError('This client is currently not connected to the friend.')
+            raise ArgumentError('This client is currently not connected to the friend.')
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['NOT_FOUND']:
             raise ArgumentError('No file transfer with the given file number was found for the given friend.')
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['NOT_PAUSED']:
-            raise ArgumentError('A RESUME control was sent, but the file transfer is running normally.')
+            raise RuntimeError('A RESUME control was sent, but the file transfer is running normally.')
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['DENIED']:
-            raise ArgumentError('A RESUME control was sent, but the file transfer was paused by the other party. Only '
+            raise RuntimeError('A RESUME control was sent, but the file transfer was paused by the other party. Only '
-                                'the party that paused the transfer can resume it.')
+                               'the party that paused the transfer can resume it.')
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['ALREADY_PAUSED']:
-            raise ArgumentError('A PAUSE control was sent, but the file transfer was already paused.')
+            raise RuntimeError('A PAUSE control was sent, but the file transfer was already paused.')
         elif tox_err_file_control == TOX_ERR_FILE_CONTROL['SENDQ']:
             raise RuntimeError('Packet queue is full.')
 
@@ -1110,15 +1114,15 @@ class Tox(object):
         elif tox_err_file_seek == TOX_ERR_FILE_SEEK['FRIEND_NOT_FOUND']:
             raise ArgumentError('The friend_number passed did not designate a valid friend.')
         elif tox_err_file_seek == TOX_ERR_FILE_SEEK['FRIEND_NOT_CONNECTED']:
-            raise RuntimeError('This client is currently not connected to the friend.')
+            raise ArgumentError('This client is currently not connected to the friend.')
         elif tox_err_file_seek == TOX_ERR_FILE_SEEK['NOT_FOUND']:
             raise ArgumentError('No file transfer with the given file number was found for the given friend.')
         elif tox_err_file_seek == TOX_ERR_FILE_SEEK['SEEK_DENIED']:
-            raise ArgumentError('File was not in a state where it could be seeked.')
+            raise IOError('File was not in a state where it could be seeked.')
         elif tox_err_file_seek == TOX_ERR_FILE_SEEK['INVALID_POSITION']:
             raise ArgumentError('Seek position was invalid')
         elif tox_err_file_seek == TOX_ERR_FILE_SEEK['SENDQ']:
-            raise ArgumentError('Packet queue is full.')
+            raise RuntimeError('Packet queue is full.')
 
     def file_get_file_id(self, friend_number, file_number, file_id=None):
         """
@@ -1206,7 +1210,7 @@ class Tox(object):
         elif tox_err_file_send == TOX_ERR_FILE_SEND['FRIEND_NOT_FOUND']:
             raise ArgumentError('The friend_number passed did not designate a valid friend.')
         elif tox_err_file_send == TOX_ERR_FILE_SEND['FRIEND_NOT_CONNECTED']:
-            raise RuntimeError('This client is currently not connected to the friend.')
+            raise ArgumentError('This client is currently not connected to the friend.')
         elif tox_err_file_send == TOX_ERR_FILE_SEND['NAME_TOO_LONG']:
             raise ArgumentError('Filename length exceeded TOX_MAX_FILENAME_LENGTH bytes.')
         elif tox_err_file_send == TOX_ERR_FILE_SEND['TOO_MANY']:
@@ -1252,7 +1256,7 @@ class Tox(object):
                                 'adjusted according to maximum transmission unit and the expected end of the file. '
                                 'Trying to send less or more than requested will return this error.')
         elif tox_err_file_send_chunk == TOX_ERR_FILE_SEND_CHUNK['SENDQ']:
-            raise ArgumentError('Packet queue is full.')
+            raise RuntimeError('Packet queue is full.')
         elif tox_err_file_send_chunk == TOX_ERR_FILE_SEND_CHUNK['WRONG_POSITION']:
             raise ArgumentError('Position parameter was wrong.')
 
@@ -1346,9 +1350,117 @@ class Tox(object):
         self.libtoxcore.tox_callback_file_recv_chunk(self._tox_pointer, self.file_recv_chunk_cb, user_data)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # TODO Low-level custom packet sending and receiving
+    # Low-level custom packet sending and receiving
     # -----------------------------------------------------------------------------------------------------------------
 
+    def friend_send_lossy_packet(self, friend_number, data):
+        """
+        Send a custom lossy packet to a friend.
+        The first byte of data must be in the range 200-254. Maximum length of a
+        custom packet is TOX_MAX_CUSTOM_PACKET_SIZE.
+
+        Lossy packets behave like UDP packets, meaning they might never reach the
+        other side or might arrive more than once (if someone is messing with the
+        connection) or might arrive in the wrong order.
+
+        Unless latency is an issue, it is recommended that you use lossless custom packets instead.
+
+        :param friend_number: The friend number of the friend this lossy packet
+        :param data: python string containing the packet data
+        :return: True on success.
+        """
+        tox_err_friend_custom_packet = c_int()
+        result = self.libtoxcore.tox_friend_send_lossy_packet(self._tox_pointer, c_uint32(friend_number),
+                                                              c_char_p(data), c_size_t(len(data)),
+                                                              byref(tox_err_friend_custom_packet))
+        tox_err_friend_custom_packet = tox_err_friend_custom_packet.value
+        if tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['OK']:
+            return bool(result)
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['NULL']:
+            raise ArgumentError('One of the arguments to the function was NULL when it was not expected.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['FRIEND_NOT_FOUND']:
+            raise ArgumentError('The friend number did not designate a valid friend.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['FRIEND_NOT_CONNECTED']:
+            raise ArgumentError('This client is currently not connected to the friend.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['INVALID']:
+            raise ArgumentError('The first byte of data was not in the specified range for the packet type.'
+                                'This range is 200-254 for lossy, and 160-191 for lossless packets.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['EMPTY']:
+            raise ArgumentError('Attempted to send an empty packet.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['TOO_LONG']:
+            raise ArgumentError('Packet data length exceeded TOX_MAX_CUSTOM_PACKET_SIZE.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['SENDQ']:
+            raise RuntimeError('Packet queue is full.')
+
+    def friend_send_lossless_packet(self, friend_number, data):
+        """
+        Send a custom lossless packet to a friend.
+        The first byte of data must be in the range 160-191. Maximum length of a
+        custom packet is TOX_MAX_CUSTOM_PACKET_SIZE.
+
+        Lossless packet behaviour is comparable to TCP (reliability, arrive in order)
+        but with packets instead of a stream.
+
+        :param friend_number: The friend number of the friend this lossless packet
+        :param data: python string containing the packet data
+        :return: True on success.
+        """
+        tox_err_friend_custom_packet = c_int()
+        result = self.libtoxcore.tox_friend_send_lossless_packet(self._tox_pointer, c_uint32(friend_number),
+                                                                 c_char_p(data), c_size_t(len(data)),
+                                                                 byref(tox_err_friend_custom_packet))
+        tox_err_friend_custom_packet = tox_err_friend_custom_packet.value
+        if tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['OK']:
+            return bool(result)
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['NULL']:
+            raise ArgumentError('One of the arguments to the function was NULL when it was not expected.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['FRIEND_NOT_FOUND']:
+            raise ArgumentError('The friend number did not designate a valid friend.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['FRIEND_NOT_CONNECTED']:
+            raise ArgumentError('This client is currently not connected to the friend.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['INVALID']:
+            raise ArgumentError('The first byte of data was not in the specified range for the packet type.'
+                                'This range is 200-254 for lossy, and 160-191 for lossless packets.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['EMPTY']:
+            raise ArgumentError('Attempted to send an empty packet.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['TOO_LONG']:
+            raise ArgumentError('Packet data length exceeded TOX_MAX_CUSTOM_PACKET_SIZE.')
+        elif tox_err_friend_custom_packet == TOX_ERR_FRIEND_CUSTOM_PACKET['SENDQ']:
+            raise RuntimeError('Packet queue is full.')
+
+    def callback_friend_lossy_packet(self, callback, user_data):
+        """
+        Set the callback for the `friend_lossy_packet` event. Pass NULL to unset.
+
+        :param callback: Python function.
+        Should take pointer (c_void_p) to Tox object,
+        friend_number (c_uint32) - The friend number of the friend who sent a lossy packet,
+        A byte array (c_uint8 array) containing the received packet data,
+        length (c_size_t) - The length of the packet data byte array,
+        pointer (c_void_p) to user_data
+        :param user_data: pointer (c_void_p) to user data
+        """
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, POINTER(c_uint8), c_size_t, c_void_p)
+        self.friend_lossy_packet_cb = c_callback(callback)
+        self.libtoxcore.tox_callback_friend_lossy_packet(self._tox_pointer, self.friend_lossy_packet_cb, user_data)
+
+    def callback_friend_lossless_packet(self, callback, user_data):
+        """
+        Set the callback for the `friend_lossless_packet` event. Pass NULL to unset.
+
+        :param callback: Python function.
+        Should take pointer (c_void_p) to Tox object,
+        friend_number (c_uint32) - The friend number of the friend who sent a lossless packet,
+        A byte array (c_uint8 array) containing the received packet data,
+        length (c_size_t) - The length of the packet data byte array,
+        pointer (c_void_p) to user_data
+        :param user_data: pointer (c_void_p) to user data
+        """
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, POINTER(c_uint8), c_size_t, c_void_p)
+        self.friend_lossless_packet_cb = c_callback(callback)
+        self.libtoxcore.tox_callback_friend_lossless_packet(self._tox_pointer, self.friend_lossless_packet_cb,
+                                                            user_data)
+
     # -----------------------------------------------------------------------------------------------------------------
     # Low-level network information
     # -----------------------------------------------------------------------------------------------------------------

src/toxav.py

@@ -344,7 +344,7 @@ class ToxAV(object):
         height          Height (c_uint16) of the frame in pixels.
         y
         u
-        v               Plane data (c_char_p).
+        v               Plane data (POINTER(c_uint8)).
                             The size of plane data is derived from width and height where
                             Y = MAX(width, abs(ystride)) * height,
                             U = MAX(width/2, abs(ustride)) * (height/2) and
@@ -357,7 +357,7 @@ class ToxAV(object):
         user_data       pointer (c_void_p) to user_data
         :param user_data: pointer (c_void_p) to user data
         """
-        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint16, c_uint16, c_char_p, c_char_p, c_char_p, c_int32,
+        c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint16, c_uint16, POINTER(c_uint8), POINTER(c_uint8),
-                               c_int32, c_int32, c_void_p)
+                               POINTER(c_uint8), c_int32, c_int32, c_int32, c_void_p)
         self.video_receive_frame_cb = c_callback(callback)
         ToxAV.libtoxav.toxav_callback_video_receive_frame(self._toxav_pointer, self.video_receive_frame_cb, user_data)

src/translations/en_GB.ts

@@ -4,17 +4,17 @@
 <context>
     <name>AddContact</name>
     <message>
-        <location filename="menu.py" line="65"/>
+        <location filename="menu.py" line="64"/>
         <source>Add contact</source>
         <translation>Add contact</translation>
     </message>
     <message>
-        <location filename="menu.py" line="67"/>
+        <location filename="menu.py" line="66"/>
         <source>TOX ID:</source>
         <translation>TOX ID:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="68"/>
+        <location filename="menu.py" line="67"/>
         <source>Message:</source>
         <translation>Message:</translation>
     </message>
@@ -22,159 +22,206 @@
 <context>
     <name>Form</name>
     <message>
-        <location filename="menu.py" line="66"/>
+        <location filename="menu.py" line="65"/>
         <source>Send request</source>
         <translation>Send request</translation>
     </message>
     <message>
-        <location filename="menu.py" line="220"/>
+        <location filename="menu.py" line="231"/>
         <source>IPv6</source>
         <translation>IPv6</translation>
     </message>
     <message>
-        <location filename="menu.py" line="221"/>
+        <location filename="menu.py" line="232"/>
         <source>UDP</source>
         <translation>UDP</translation>
     </message>
     <message>
-        <location filename="menu.py" line="222"/>
+        <location filename="menu.py" line="233"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="menu.py" line="223"/>
+        <location filename="menu.py" line="234"/>
         <source>IP:</source>
         <translation>IP:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="224"/>
+        <location filename="menu.py" line="235"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="90"/>
+        <location filename="mainscreen.py" line="99"/>
         <source>Online contacts</source>
         <translation>Online contacts</translation>
     </message>
+    <message>
+        <location filename="menu.py" line="237"/>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainscreen.py" line="95"/>
+        <location filename="mainscreen.py" line="104"/>
         <source>Profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="101"/>
+        <location filename="mainscreen.py" line="110"/>
         <source>Settings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="286"/>
+        <location filename="mainscreen.py" line="346"/>
         <source>About</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="94"/>
+        <location filename="mainscreen.py" line="103"/>
         <source>Add contact</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="96"/>
+        <location filename="mainscreen.py" line="105"/>
         <source>Privacy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="97"/>
+        <location filename="mainscreen.py" line="106"/>
         <source>Interface</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="98"/>
+        <location filename="mainscreen.py" line="107"/>
         <source>Notifications</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="99"/>
+        <location filename="mainscreen.py" line="108"/>
         <source>Network</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="100"/>
+        <location filename="mainscreen.py" line="109"/>
         <source>About program</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="profile.py" line="762"/>
+        <location filename="profile.py" line="840"/>
         <source>User {} wants to add you to contact list. Message:
 {}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="profile.py" line="764"/>
+        <location filename="profile.py" line="842"/>
         <source>Friend request</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="287"/>
+        <location filename="mainscreen.py" line="390"/>
-        <source>Toxygen is Tox client written on Python 2.7. Version: </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="mainscreen.py" line="329"/>
         <source>Choose file</source>
-        <translation></translation>
+        <translation>Choose file</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="367"/>
+        <location filename="mainscreen.py" line="431"/>
         <source>Disallow auto accept</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="368"/>
+        <location filename="mainscreen.py" line="432"/>
         <source>Allow auto accept</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="370"/>
+        <location filename="mainscreen.py" line="434"/>
         <source>Set alias</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="371"/>
+        <location filename="mainscreen.py" line="435"/>
         <source>Clear history</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="372"/>
+        <location filename="mainscreen.py" line="436"/>
         <source>Copy public key</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="374"/>
+        <location filename="mainscreen.py" line="438"/>
         <source>Remove friend</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="profile.py" line="639"/>
+        <location filename="profile.py" line="686"/>
         <source>Enter new alias for friend {} or leave empty to use friend&apos;s name:</source>
         <translation>Enter new alias for friend {} or leave empty to use friend&apos;s name:</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="102"/>
+        <location filename="mainscreen.py" line="111"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
+    <message>
+        <location filename="mainscreen.py" line="112"/>
+        <source>Find contact</source>
+        <translation>Find contact</translation>
+    </message>
+    <message>
+        <location filename="profile.py" line="812"/>
+        <source>Friend added</source>
+        <translation>Friend added</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="347"/>
+        <source>Toxygen is Tox client written on Python.
+Version: </source>
+        <translation>Toxygen is Tox client written on Python.
+Version:</translation>
+    </message>
+    <message>
+        <location filename="profile.py" line="813"/>
+        <source>Friend added without sending friend request</source>
+        <translation>Friend added without sending friend request</translation>
+    </message>
+    <message>
+        <location filename="list_items.py" line="231"/>
+        <source>Choose folder</source>
+        <translation>Choose folder</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="113"/>
+        <source>Send screenshot</source>
+        <translation>Send screenshot</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="114"/>
+        <source>Send file</source>
+        <translation>Send file</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="115"/>
+        <source>Send message</source>
+        <translation>Send message</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="116"/>
+        <source>Start audio call with friend</source>
+        <translation>Start audio call with friend</translation>
+    </message>
 </context>
 <context>
     <name>NetworkSettings</name>
     <message>
-        <location filename="menu.py" line="219"/>
+        <location filename="menu.py" line="230"/>
         <source>Network settings</source>
         <translation>Network settings</translation>
     </message>
     <message>
-        <location filename="menu.py" line="225"/>
+        <location filename="menu.py" line="236"/>
         <source>Restart TOX core</source>
         <translation>Restart Tox core</translation>
     </message>
@@ -182,60 +229,65 @@
 <context>
     <name>ProfileSettingsForm</name>
     <message>
-        <location filename="menu.py" line="131"/>
+        <location filename="menu.py" line="133"/>
         <source>Export profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="132"/>
+        <location filename="menu.py" line="134"/>
         <source>Profile settings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="133"/>
+        <location filename="menu.py" line="135"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="134"/>
+        <location filename="menu.py" line="136"/>
         <source>Status:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="135"/>
+        <location filename="menu.py" line="137"/>
         <source>TOX ID:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="136"/>
+        <location filename="menu.py" line="138"/>
         <source>Copy TOX ID</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="137"/>
+        <location filename="menu.py" line="139"/>
         <source>New avatar</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="138"/>
+        <location filename="menu.py" line="140"/>
         <source>Reset avatar</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="menu.py" line="141"/>
+        <source>New NoSpam</source>
+        <translation>New NoSpam</translation>
+    </message>
 </context>
 <context>
     <name>audioSettingsForm</name>
     <message>
-        <location filename="menu.py" line="504"/>
+        <location filename="menu.py" line="522"/>
         <source>Audio settings</source>
         <translation>Audio settings</translation>
     </message>
     <message>
-        <location filename="menu.py" line="505"/>
+        <location filename="menu.py" line="523"/>
         <source>Input device:</source>
         <translation>Input device:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="506"/>
+        <location filename="menu.py" line="524"/>
         <source>Output device:</source>
         <translation>Output device:</translation>
     </message>
@@ -243,12 +295,12 @@
 <context>
     <name>incoming_call</name>
     <message>
-        <location filename="profile.py" line="1041"/>
+        <location filename="profile.py" line="1151"/>
         <source>Incoming video call</source>
         <translation>Incoming video call</translation>
     </message>
     <message>
-        <location filename="profile.py" line="1043"/>
+        <location filename="profile.py" line="1153"/>
         <source>Incoming audio call</source>
         <translation>Incoming audio call</translation>
     </message>
@@ -256,17 +308,17 @@
 <context>
     <name>interfaceForm</name>
     <message>
-        <location filename="menu.py" line="442"/>
+        <location filename="menu.py" line="460"/>
         <source>Interface settings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="443"/>
+        <location filename="menu.py" line="461"/>
         <source>Theme:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="444"/>
+        <location filename="menu.py" line="462"/>
         <source>Language:</source>
         <translation></translation>
     </message>
@@ -274,47 +326,47 @@
 <context>
     <name>login</name>
     <message>
-        <location filename="loginscreen.py" line="57"/>
+        <location filename="loginscreen.py" line="70"/>
         <source>Log in</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="58"/>
+        <location filename="loginscreen.py" line="71"/>
         <source>Create</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="59"/>
+        <location filename="loginscreen.py" line="72"/>
         <source>Profile name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="60"/>
+        <location filename="loginscreen.py" line="73"/>
         <source>Load profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="61"/>
+        <location filename="loginscreen.py" line="74"/>
         <source>Use as default</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="62"/>
+        <location filename="loginscreen.py" line="75"/>
         <source>Load existing profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="63"/>
+        <location filename="loginscreen.py" line="76"/>
         <source>Create new profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="64"/>
+        <location filename="loginscreen.py" line="77"/>
         <source>toxygen</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main.py" line="80"/>
+        <location filename="main.py" line="87"/>
         <source>Looks like other instance of Toxygen uses this profile! Continue?</source>
         <translation></translation>
     </message>
@@ -322,22 +374,22 @@
 <context>
     <name>notificationsForm</name>
     <message>
-        <location filename="menu.py" line="383"/>
+        <location filename="menu.py" line="401"/>
         <source>Notification settings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="384"/>
+        <location filename="menu.py" line="402"/>
         <source>Enable notifications</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="385"/>
+        <location filename="menu.py" line="403"/>
         <source>Enable call&apos;s sound</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="386"/>
+        <location filename="menu.py" line="404"/>
         <source>Enable sound notifications</source>
         <translation></translation>
     </message>
@@ -345,77 +397,77 @@
 <context>
     <name>privacySettings</name>
     <message>
-        <location filename="menu.py" line="307"/>
+        <location filename="menu.py" line="319"/>
         <source>Privacy settings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="308"/>
+        <location filename="menu.py" line="320"/>
         <source>Save chat history</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="309"/>
+        <location filename="menu.py" line="321"/>
         <source>Allow file auto accept</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="310"/>
+        <location filename="menu.py" line="322"/>
         <source>Send typing notifications</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="311"/>
+        <location filename="menu.py" line="323"/>
         <source>Auto accept default path:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="312"/>
+        <location filename="menu.py" line="324"/>
         <source>Change</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="313"/>
+        <location filename="menu.py" line="325"/>
         <source>Allow inlines</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="336"/>
+        <location filename="menu.py" line="348"/>
         <source>Chat history</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="339"/>
+        <location filename="menu.py" line="351"/>
         <source>History will be cleaned! Continue?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="menu.py" line="315"/>
+        <location filename="menu.py" line="327"/>
         <source>Blocked users:</source>
         <translation>Blocked users:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="316"/>
+        <location filename="menu.py" line="328"/>
         <source>Unblock</source>
         <translation>Unblock</translation>
     </message>
     <message>
-        <location filename="menu.py" line="317"/>
+        <location filename="menu.py" line="329"/>
         <source>Block user</source>
         <translation>Block user</translation>
     </message>
     <message>
-        <location filename="menu.py" line="323"/>
+        <location filename="menu.py" line="335"/>
         <source>Add to friend list</source>
         <translation>Add to friend list</translation>
     </message>
     <message>
-        <location filename="menu.py" line="324"/>
+        <location filename="menu.py" line="336"/>
         <source>Do you want to add this user to friend list?</source>
         <translation>Do you want to add this user to friend list?</translation>
     </message>
     <message>
-        <location filename="menu.py" line="314"/>
+        <location filename="menu.py" line="326"/>
         <source>Block by TOX ID:</source>
         <translation>Block by TOX ID:</translation>
     </message>
@@ -423,12 +475,12 @@
 <context>
     <name>tray</name>
     <message>
-        <location filename="main.py" line="106"/>
+        <location filename="main.py" line="113"/>
         <source>Open Toxygen</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main.py" line="107"/>
+        <location filename="main.py" line="114"/>
         <source>Exit</source>
         <translation></translation>
     </message>

src/translations/fr_FR.ts

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="fr">
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
 <context>
     <name>AddContact</name>
     <message>
-        <location filename="menu.py" line="65"/>
+        <location filename="menu.py" line="64"/>
         <source>Add contact</source>
         <translation>Rajouter un contact</translation>
     </message>
     <message>
-        <location filename="menu.py" line="67"/>
+        <location filename="menu.py" line="66"/>
         <source>TOX ID:</source>
         <translation>ID TOX :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="68"/>
+        <location filename="menu.py" line="67"/>
         <source>Message:</source>
         <translation>Message :</translation>
     </message>
@@ -21,251 +22,308 @@
 <context>
     <name>Form</name>
     <message>
-        <location filename="menu.py" line="66"/>
+        <location filename="menu.py" line="65"/>
         <source>Send request</source>
         <translation>Envoyer une demande</translation>
     </message>
     <message>
-        <location filename="menu.py" line="220"/>
+        <location filename="menu.py" line="231"/>
         <source>IPv6</source>
         <translation>IPv6</translation>
     </message>
     <message>
-        <location filename="menu.py" line="221"/>
+        <location filename="menu.py" line="232"/>
         <source>UDP</source>
         <translation>UDP</translation>
     </message>
     <message>
-        <location filename="menu.py" line="222"/>
+        <location filename="menu.py" line="233"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="menu.py" line="223"/>
+        <location filename="menu.py" line="234"/>
         <source>IP:</source>
         <translation>IP :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="224"/>
+        <location filename="menu.py" line="235"/>
         <source>Port:</source>
         <translation>Port :</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="90"/>
+        <location filename="mainscreen.py" line="99"/>
         <source>Online contacts</source>
         <translation>Contacts connectés</translation>
     </message>
+    <message>
+        <location filename="menu.py" line="237"/>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainscreen.py" line="95"/>
+        <location filename="mainscreen.py" line="104"/>
         <source>Profile</source>
         <translation>Profile</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="101"/>
+        <location filename="mainscreen.py" line="110"/>
         <source>Settings</source>
         <translation>Paramêtres</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="286"/>
+        <location filename="mainscreen.py" line="346"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="94"/>
+        <location filename="mainscreen.py" line="103"/>
         <source>Add contact</source>
         <translation>Rajouter un contact</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="96"/>
+        <location filename="mainscreen.py" line="105"/>
         <source>Privacy</source>
         <translation>Confidentialité</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="97"/>
+        <location filename="mainscreen.py" line="106"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="98"/>
+        <location filename="mainscreen.py" line="107"/>
         <source>Notifications</source>
         <translation>Notifications</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="99"/>
+        <location filename="mainscreen.py" line="108"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="100"/>
+        <location filename="mainscreen.py" line="109"/>
         <source>About program</source>
         <translation>À propos du programme</translation>
     </message>
     <message>
-        <location filename="profile.py" line="762"/>
+        <location filename="profile.py" line="840"/>
         <source>User {} wants to add you to contact list. Message:
 {}</source>
         <translation>L&apos;Utilisateur {} veut vout rajouter à sa liste de contacts. Message : {}</translation>
     </message>
     <message>
-        <location filename="profile.py" line="764"/>
+        <location filename="profile.py" line="842"/>
         <source>Friend request</source>
         <translation>Demande d&apos;amis</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="287"/>
+        <location filename="mainscreen.py" line="319"/>
         <source>Toxygen is Tox client written on Python 2.7. Version: </source>
-        <translation>Toxygen est un client Tox écris en Python 2.7. Version : </translation>
+        <translation type="obsolete">Toxygen est un client Tox écris en Python 2.7. Version : </translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="329"/>
+        <location filename="mainscreen.py" line="390"/>
         <source>Choose file</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="367"/>
+        <location filename="mainscreen.py" line="431"/>
         <source>Disallow auto accept</source>
         <translation>Désactiver l&apos;auto-réception</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="368"/>
+        <location filename="mainscreen.py" line="432"/>
         <source>Allow auto accept</source>
         <translation>Activer l&apos;auto-réception</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="370"/>
+        <location filename="mainscreen.py" line="434"/>
         <source>Set alias</source>
         <translation>Définir un alias</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="371"/>
+        <location filename="mainscreen.py" line="435"/>
         <source>Clear history</source>
         <translation>Vider l&apos;historique</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="372"/>
+        <location filename="mainscreen.py" line="436"/>
         <source>Copy public key</source>
         <translation>Copier la clé publique</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="374"/>
+        <location filename="mainscreen.py" line="438"/>
         <source>Remove friend</source>
         <translation>Retirer un ami</translation>
     </message>
     <message>
-        <location filename="profile.py" line="639"/>
+        <location filename="profile.py" line="686"/>
         <source>Enter new alias for friend {} or leave empty to use friend&apos;s name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez un nouvel alias pour l&apos;ami {} ou laissez vide pour garder son nom de base :</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="102"/>
+        <location filename="mainscreen.py" line="111"/>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="112"/>
+        <source>Find contact</source>
+        <translation>Trouver le contact</translation>
+    </message>
+    <message>
+        <location filename="profile.py" line="812"/>
+        <source>Friend added</source>
+        <translation>Ami rajouté</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="347"/>
+        <source>Toxygen is Tox client written on Python.
+Version: </source>
+        <translation>Toxygen est un client Tox écrit en Python.
+Version :</translation>
+    </message>
+    <message>
+        <location filename="profile.py" line="813"/>
+        <source>Friend added without sending friend request</source>
+        <translation>Ami rajouté sans avoir envoyé de demande</translation>
+    </message>
+    <message>
+        <location filename="list_items.py" line="231"/>
+        <source>Choose folder</source>
+        <translation>Choisir le dossier</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="113"/>
+        <source>Send screenshot</source>
+        <translation>Envoyer une capture d&apos;écran</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="114"/>
+        <source>Send file</source>
+        <translation>Envoyer le fichier</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="115"/>
+        <source>Send message</source>
+        <translation>Envoyer le message</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="116"/>
+        <source>Start audio call with friend</source>
+        <translation>Lancer un appel audio avec un ami</translation>
     </message>
 </context>
 <context>
     <name>NetworkSettings</name>
     <message>
-        <location filename="menu.py" line="219"/>
+        <location filename="menu.py" line="230"/>
         <source>Network settings</source>
-        <translation>Paramêtres réseaux</translation>
+        <translation>Paramètres réseaux</translation>
     </message>
     <message>
-        <location filename="menu.py" line="225"/>
+        <location filename="menu.py" line="236"/>
         <source>Restart TOX core</source>
-        <translation type="unfinished"></translation>
+        <translation>Relancer le noyau TOX</translation>
     </message>
 </context>
 <context>
     <name>ProfileSettingsForm</name>
     <message>
-        <location filename="menu.py" line="131"/>
+        <location filename="menu.py" line="133"/>
         <source>Export profile</source>
         <translation>Exporter le profile</translation>
     </message>
     <message>
-        <location filename="menu.py" line="132"/>
+        <location filename="menu.py" line="134"/>
         <source>Profile settings</source>
         <translation>Paramêtres du profil</translation>
     </message>
     <message>
-        <location filename="menu.py" line="133"/>
+        <location filename="menu.py" line="135"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="134"/>
+        <location filename="menu.py" line="136"/>
         <source>Status:</source>
         <translation>Status :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="135"/>
+        <location filename="menu.py" line="137"/>
         <source>TOX ID:</source>
         <translation>ID TOX :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="136"/>
+        <location filename="menu.py" line="138"/>
         <source>Copy TOX ID</source>
         <translation>Copier l&apos;ID TOX</translation>
     </message>
     <message>
-        <location filename="menu.py" line="137"/>
+        <location filename="menu.py" line="139"/>
         <source>New avatar</source>
         <translation>Nouvel avatar</translation>
     </message>
     <message>
-        <location filename="menu.py" line="138"/>
+        <location filename="menu.py" line="140"/>
         <source>Reset avatar</source>
         <translation>Réinitialiser l&apos;avatar</translation>
     </message>
+    <message>
+        <location filename="menu.py" line="141"/>
+        <source>New NoSpam</source>
+        <translation>Nouveau NoSpam</translation>
+    </message>
 </context>
 <context>
     <name>audioSettingsForm</name>
     <message>
-        <location filename="menu.py" line="504"/>
+        <location filename="menu.py" line="522"/>
         <source>Audio settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paramètres audio</translation>
     </message>
     <message>
-        <location filename="menu.py" line="505"/>
+        <location filename="menu.py" line="523"/>
         <source>Input device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Péripherique d&apos;entrée :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="506"/>
+        <location filename="menu.py" line="524"/>
         <source>Output device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Péripherique de sortie :</translation>
     </message>
 </context>
 <context>
     <name>incoming_call</name>
     <message>
-        <location filename="profile.py" line="1041"/>
+        <location filename="profile.py" line="1151"/>
         <source>Incoming video call</source>
-        <translation type="unfinished"></translation>
+        <translation>Appel vidéo entrant</translation>
     </message>
     <message>
-        <location filename="profile.py" line="1043"/>
+        <location filename="profile.py" line="1153"/>
         <source>Incoming audio call</source>
-        <translation type="unfinished"></translation>
+        <translation>Appel audio entrant</translation>
     </message>
 </context>
 <context>
     <name>interfaceForm</name>
     <message>
-        <location filename="menu.py" line="442"/>
+        <location filename="menu.py" line="460"/>
         <source>Interface settings</source>
         <translation>Paramêtres de l&apos;interface</translation>
     </message>
     <message>
-        <location filename="menu.py" line="443"/>
+        <location filename="menu.py" line="461"/>
         <source>Theme:</source>
         <translation>Thème :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="444"/>
+        <location filename="menu.py" line="462"/>
         <source>Language:</source>
         <translation>Langue :</translation>
     </message>
@@ -273,47 +331,47 @@
 <context>
     <name>login</name>
     <message>
-        <location filename="loginscreen.py" line="57"/>
+        <location filename="loginscreen.py" line="70"/>
         <source>Log in</source>
         <translation>Se connecter</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="58"/>
+        <location filename="loginscreen.py" line="71"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="59"/>
+        <location filename="loginscreen.py" line="72"/>
         <source>Profile name:</source>
         <translation>Nom du profil :</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="60"/>
+        <location filename="loginscreen.py" line="73"/>
         <source>Load profile</source>
         <translation>Charger le profil</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="61"/>
+        <location filename="loginscreen.py" line="74"/>
         <source>Use as default</source>
         <translation>Utiliser par défaut</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="62"/>
+        <location filename="loginscreen.py" line="75"/>
         <source>Load existing profile</source>
         <translation>Charger un profil existant</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="63"/>
+        <location filename="loginscreen.py" line="76"/>
         <source>Create new profile</source>
         <translation>Créer un nouveau profil</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="64"/>
+        <location filename="loginscreen.py" line="77"/>
         <source>toxygen</source>
         <translation>toxygen</translation>
     </message>
     <message>
-        <location filename="main.py" line="80"/>
+        <location filename="main.py" line="87"/>
         <source>Looks like other instance of Toxygen uses this profile! Continue?</source>
         <translation>Il semble qu&apos;une autre instance de Toxygen utilise ce profil ! Continuer ?</translation>
     </message>
@@ -321,22 +379,22 @@
 <context>
     <name>notificationsForm</name>
     <message>
-        <location filename="menu.py" line="383"/>
+        <location filename="menu.py" line="401"/>
         <source>Notification settings</source>
         <translation>Paramêtres de notification</translation>
     </message>
     <message>
-        <location filename="menu.py" line="384"/>
+        <location filename="menu.py" line="402"/>
         <source>Enable notifications</source>
         <translation>Activer les notifications</translation>
     </message>
     <message>
-        <location filename="menu.py" line="385"/>
+        <location filename="menu.py" line="403"/>
         <source>Enable call&apos;s sound</source>
         <translation>Activer les sons d&apos;appel</translation>
     </message>
     <message>
-        <location filename="menu.py" line="386"/>
+        <location filename="menu.py" line="404"/>
         <source>Enable sound notifications</source>
         <translation>Activer les sons de notifications</translation>
     </message>
@@ -344,90 +402,90 @@
 <context>
     <name>privacySettings</name>
     <message>
-        <location filename="menu.py" line="307"/>
+        <location filename="menu.py" line="319"/>
         <source>Privacy settings</source>
         <translation>Paramêtres de confidentialité</translation>
     </message>
     <message>
-        <location filename="menu.py" line="308"/>
+        <location filename="menu.py" line="320"/>
         <source>Save chat history</source>
-        <translation>Sauvegarder l&apos;historique du chat</translation>
+        <translation>Sauvegarder l&apos;historique de chat</translation>
     </message>
     <message>
-        <location filename="menu.py" line="309"/>
+        <location filename="menu.py" line="321"/>
         <source>Allow file auto accept</source>
         <translation>Autoriser les fichier automatiquement</translation>
     </message>
     <message>
-        <location filename="menu.py" line="310"/>
+        <location filename="menu.py" line="322"/>
         <source>Send typing notifications</source>
         <translation>Notifier la frappe</translation>
     </message>
     <message>
-        <location filename="menu.py" line="311"/>
+        <location filename="menu.py" line="323"/>
         <source>Auto accept default path:</source>
         <translation>Chemin d&apos;accès des fichiers acceptés automatiquement :</translation>
     </message>
     <message>
-        <location filename="menu.py" line="312"/>
+        <location filename="menu.py" line="324"/>
         <source>Change</source>
         <translation>Modifier</translation>
     </message>
     <message>
-        <location filename="menu.py" line="313"/>
+        <location filename="menu.py" line="325"/>
         <source>Allow inlines</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer l&apos;auto-réception</translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="348"/>
+        <source>Chat history</source>
+        <translation>Historique de chat</translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="351"/>
+        <source>History will be cleaned! Continue?</source>
+        <translation>L&apos;Historique va être nettoyé ! Confirmer ?</translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="327"/>
+        <source>Blocked users:</source>
+        <translation>Utilisateurs bloqués :</translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="328"/>
+        <source>Unblock</source>
+        <translation>Débloquer</translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="329"/>
+        <source>Block user</source>
+        <translation>Bloquer l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="menu.py" line="335"/>
+        <source>Add to friend list</source>
+        <translation>Ajouter à la liste des amis</translation>
     </message>
     <message>
         <location filename="menu.py" line="336"/>
-        <source>Chat history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="menu.py" line="339"/>
-        <source>History will be cleaned! Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="menu.py" line="315"/>
-        <source>Blocked users:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="menu.py" line="316"/>
-        <source>Unblock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="menu.py" line="317"/>
-        <source>Block user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="menu.py" line="323"/>
-        <source>Add to friend list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="menu.py" line="324"/>
         <source>Do you want to add this user to friend list?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez vous rajouter cet utilisateur à votre liste d&apos;amis ?</translation>
     </message>
     <message>
-        <location filename="menu.py" line="314"/>
+        <location filename="menu.py" line="326"/>
         <source>Block by TOX ID:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bloquer l&apos;ID TOX :</translation>
     </message>
 </context>
 <context>
     <name>tray</name>
     <message>
-        <location filename="main.py" line="106"/>
+        <location filename="main.py" line="113"/>
         <source>Open Toxygen</source>
         <translation>Ouvrir Toxygen</translation>
     </message>
     <message>
-        <location filename="main.py" line="107"/>
+        <location filename="main.py" line="114"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>

src/translations/ru_RU.ts

@@ -4,17 +4,17 @@
 <context>
     <name>AddContact</name>
     <message>
-        <location filename="menu.py" line="65"/>
+        <location filename="menu.py" line="64"/>
         <source>Add contact</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="menu.py" line="67"/>
+        <location filename="menu.py" line="66"/>
         <source>TOX ID:</source>
         <translation>TOX ID:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="68"/>
+        <location filename="menu.py" line="67"/>
         <source>Message:</source>
         <translation>Сообщение:</translation>
     </message>
@@ -22,160 +22,206 @@
 <context>
     <name>Form</name>
     <message>
-        <location filename="menu.py" line="66"/>
+        <location filename="menu.py" line="65"/>
         <source>Send request</source>
         <translation>Отправить запрос</translation>
     </message>
     <message>
-        <location filename="menu.py" line="220"/>
+        <location filename="menu.py" line="231"/>
         <source>IPv6</source>
         <translation>IPv6</translation>
     </message>
     <message>
-        <location filename="menu.py" line="221"/>
+        <location filename="menu.py" line="232"/>
         <source>UDP</source>
         <translation>UDP</translation>
     </message>
     <message>
-        <location filename="menu.py" line="222"/>
+        <location filename="menu.py" line="233"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="menu.py" line="223"/>
+        <location filename="menu.py" line="234"/>
         <source>IP:</source>
         <translation>IP:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="224"/>
+        <location filename="menu.py" line="235"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="90"/>
+        <location filename="mainscreen.py" line="99"/>
         <source>Online contacts</source>
         <translation>Контакты в сети</translation>
     </message>
+    <message>
+        <location filename="menu.py" line="237"/>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainscreen.py" line="95"/>
+        <location filename="mainscreen.py" line="104"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="101"/>
+        <location filename="mainscreen.py" line="110"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="286"/>
+        <location filename="mainscreen.py" line="346"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="94"/>
+        <location filename="mainscreen.py" line="103"/>
         <source>Add contact</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="96"/>
+        <location filename="mainscreen.py" line="105"/>
         <source>Privacy</source>
         <translation>Приватность</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="97"/>
+        <location filename="mainscreen.py" line="106"/>
         <source>Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="98"/>
+        <location filename="mainscreen.py" line="107"/>
         <source>Notifications</source>
         <translation>Уведомления</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="99"/>
+        <location filename="mainscreen.py" line="108"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="100"/>
+        <location filename="mainscreen.py" line="109"/>
         <source>About program</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="profile.py" line="762"/>
+        <location filename="profile.py" line="840"/>
         <source>User {} wants to add you to contact list. Message:
 {}</source>
         <translation>Пользователь {} хочет добавить Вас в список контактов. Сообщение:
 {}</translation>
     </message>
     <message>
-        <location filename="profile.py" line="764"/>
+        <location filename="profile.py" line="842"/>
         <source>Friend request</source>
         <translation>Запрос на добавление в друзья</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="287"/>
+        <location filename="mainscreen.py" line="390"/>
-        <source>Toxygen is Tox client written on Python 2.7. Version: </source>
-        <translation>Toxygen - клиент для мессенджера Tox, написанный на Python 2.7. Версия: </translation>
-    </message>
-    <message>
-        <location filename="mainscreen.py" line="329"/>
         <source>Choose file</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="367"/>
+        <location filename="mainscreen.py" line="431"/>
         <source>Disallow auto accept</source>
         <translation>Запретить автоматическое получение файлов</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="368"/>
+        <location filename="mainscreen.py" line="432"/>
         <source>Allow auto accept</source>
         <translation>Разрешить автоматическое получение файлов</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="370"/>
+        <location filename="mainscreen.py" line="434"/>
         <source>Set alias</source>
         <translation>Изменить псевдоним</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="371"/>
+        <location filename="mainscreen.py" line="435"/>
         <source>Clear history</source>
         <translation>Очистить историю</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="372"/>
+        <location filename="mainscreen.py" line="436"/>
         <source>Copy public key</source>
         <translation>Копировать публичный ключ</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="374"/>
+        <location filename="mainscreen.py" line="438"/>
         <source>Remove friend</source>
         <translation>Удалить друга</translation>
     </message>
     <message>
-        <location filename="profile.py" line="639"/>
+        <location filename="profile.py" line="686"/>
         <source>Enter new alias for friend {} or leave empty to use friend&apos;s name:</source>
         <translation>Введите новый псевдоним для друга {} или оставьте пустым для использования его имени:</translation>
     </message>
     <message>
-        <location filename="mainscreen.py" line="102"/>
+        <location filename="mainscreen.py" line="111"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
+    <message>
+        <location filename="mainscreen.py" line="112"/>
+        <source>Find contact</source>
+        <translation>Найти контакт</translation>
+    </message>
+    <message>
+        <location filename="profile.py" line="812"/>
+        <source>Friend added</source>
+        <translation>Друг добавлен</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="347"/>
+        <source>Toxygen is Tox client written on Python.
+Version: </source>
+        <translation>Toxygen - клиент для мессенджера Tox, написанный на Python. Версия: </translation>
+    </message>
+    <message>
+        <location filename="profile.py" line="813"/>
+        <source>Friend added without sending friend request</source>
+        <translation>Друг добавлен без отправки запроса на добавление в друзья</translation>
+    </message>
+    <message>
+        <location filename="list_items.py" line="231"/>
+        <source>Choose folder</source>
+        <translation>Выбрать папку</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="113"/>
+        <source>Send screenshot</source>
+        <translation>Отправить снимок экрана</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="114"/>
+        <source>Send file</source>
+        <translation>Отправить файл</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="115"/>
+        <source>Send message</source>
+        <translation>Отправить сообщение</translation>
+    </message>
+    <message>
+        <location filename="mainscreen.py" line="116"/>
+        <source>Start audio call with friend</source>
+        <translation>Начать аудиозвонок с другом</translation>
+    </message>
 </context>
 <context>
     <name>NetworkSettings</name>
     <message>
-        <location filename="menu.py" line="219"/>
+        <location filename="menu.py" line="230"/>
         <source>Network settings</source>
         <translation>Настройки сети</translation>
     </message>
     <message>
-        <location filename="menu.py" line="225"/>
+        <location filename="menu.py" line="236"/>
         <source>Restart TOX core</source>
         <translation>Перезапустить ядро TOX</translation>
     </message>
@@ -183,32 +229,32 @@
 <context>
     <name>ProfileSettingsForm</name>
     <message>
-        <location filename="menu.py" line="131"/>
+        <location filename="menu.py" line="133"/>
         <source>Export profile</source>
         <translation>Экспорт профиля</translation>
     </message>
     <message>
-        <location filename="menu.py" line="132"/>
+        <location filename="menu.py" line="134"/>
         <source>Profile settings</source>
         <translation>Настройки профиля</translation>
     </message>
     <message>
-        <location filename="menu.py" line="133"/>
+        <location filename="menu.py" line="135"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="134"/>
+        <location filename="menu.py" line="136"/>
         <source>Status:</source>
         <translation>Статус:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="135"/>
+        <location filename="menu.py" line="137"/>
         <source>TOX ID:</source>
         <translation>TOX ID:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="136"/>
+        <location filename="menu.py" line="138"/>
         <source>Copy TOX ID</source>
         <translation>Копировать TOX ID</translation>
     </message>
@@ -218,30 +264,35 @@
         <translation type="obsolete">Язык:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="137"/>
+        <location filename="menu.py" line="139"/>
         <source>New avatar</source>
         <translation>Новый аватар</translation>
     </message>
     <message>
-        <location filename="menu.py" line="138"/>
+        <location filename="menu.py" line="140"/>
         <source>Reset avatar</source>
         <translation>Сбросить аватар</translation>
     </message>
+    <message>
+        <location filename="menu.py" line="141"/>
+        <source>New NoSpam</source>
+        <translation>Новый NoSpam</translation>
+    </message>
 </context>
 <context>
     <name>audioSettingsForm</name>
     <message>
-        <location filename="menu.py" line="504"/>
+        <location filename="menu.py" line="522"/>
         <source>Audio settings</source>
         <translation>Настройки аудио</translation>
     </message>
     <message>
-        <location filename="menu.py" line="505"/>
+        <location filename="menu.py" line="523"/>
         <source>Input device:</source>
         <translation>Устройство ввода:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="506"/>
+        <location filename="menu.py" line="524"/>
         <source>Output device:</source>
         <translation>Устройство вывода:</translation>
     </message>
@@ -249,12 +300,12 @@
 <context>
     <name>incoming_call</name>
     <message>
-        <location filename="profile.py" line="1041"/>
+        <location filename="profile.py" line="1151"/>
         <source>Incoming video call</source>
         <translation>Входящий видеозвонок</translation>
     </message>
     <message>
-        <location filename="profile.py" line="1043"/>
+        <location filename="profile.py" line="1153"/>
         <source>Incoming audio call</source>
         <translation>Входящий аудиозвонок</translation>
     </message>
@@ -262,17 +313,17 @@
 <context>
     <name>interfaceForm</name>
     <message>
-        <location filename="menu.py" line="442"/>
+        <location filename="menu.py" line="460"/>
         <source>Interface settings</source>
         <translation>Настройки интерфейса</translation>
     </message>
     <message>
-        <location filename="menu.py" line="443"/>
+        <location filename="menu.py" line="461"/>
         <source>Theme:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="444"/>
+        <location filename="menu.py" line="462"/>
         <source>Language:</source>
         <translation>Язык:</translation>
     </message>
@@ -280,47 +331,47 @@
 <context>
     <name>login</name>
     <message>
-        <location filename="loginscreen.py" line="57"/>
+        <location filename="loginscreen.py" line="70"/>
         <source>Log in</source>
         <translation>Вход</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="58"/>
+        <location filename="loginscreen.py" line="71"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="59"/>
+        <location filename="loginscreen.py" line="72"/>
         <source>Profile name:</source>
         <translation>Имя профиля:</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="60"/>
+        <location filename="loginscreen.py" line="73"/>
         <source>Load profile</source>
         <translation>Загрузить профиль</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="61"/>
+        <location filename="loginscreen.py" line="74"/>
         <source>Use as default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="62"/>
+        <location filename="loginscreen.py" line="75"/>
         <source>Load existing profile</source>
         <translation>Загрузить профиль</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="63"/>
+        <location filename="loginscreen.py" line="76"/>
         <source>Create new profile</source>
         <translation>Создать новый профиль</translation>
     </message>
     <message>
-        <location filename="loginscreen.py" line="64"/>
+        <location filename="loginscreen.py" line="77"/>
         <source>toxygen</source>
         <translation>toxygen</translation>
     </message>
     <message>
-        <location filename="main.py" line="80"/>
+        <location filename="main.py" line="87"/>
         <source>Looks like other instance of Toxygen uses this profile! Continue?</source>
         <translation>Похоже, что этот профиль используется другим экземпляром Toxygen! Продолжить?</translation>
     </message>
@@ -328,22 +379,22 @@
 <context>
     <name>notificationsForm</name>
     <message>
-        <location filename="menu.py" line="383"/>
+        <location filename="menu.py" line="401"/>
         <source>Notification settings</source>
         <translation>Настройки уведомлений</translation>
     </message>
     <message>
-        <location filename="menu.py" line="384"/>
+        <location filename="menu.py" line="402"/>
         <source>Enable notifications</source>
         <translation>Включить уведомления</translation>
     </message>
     <message>
-        <location filename="menu.py" line="385"/>
+        <location filename="menu.py" line="403"/>
         <source>Enable call&apos;s sound</source>
         <translation>Включить звук звонка</translation>
     </message>
     <message>
-        <location filename="menu.py" line="386"/>
+        <location filename="menu.py" line="404"/>
         <source>Enable sound notifications</source>
         <translation>Включить звуковые уведомления
 </translation>
@@ -352,77 +403,77 @@
 <context>
     <name>privacySettings</name>
     <message>
-        <location filename="menu.py" line="307"/>
+        <location filename="menu.py" line="319"/>
         <source>Privacy settings</source>
         <translation>Настройки приватности</translation>
     </message>
     <message>
-        <location filename="menu.py" line="308"/>
+        <location filename="menu.py" line="320"/>
         <source>Save chat history</source>
         <translation>Сохранять историю переписки</translation>
     </message>
     <message>
-        <location filename="menu.py" line="309"/>
+        <location filename="menu.py" line="321"/>
         <source>Allow file auto accept</source>
         <translation>Разрешить автополучение файлов</translation>
     </message>
     <message>
-        <location filename="menu.py" line="310"/>
+        <location filename="menu.py" line="322"/>
         <source>Send typing notifications</source>
         <translation>Посылать уведомления о наборе текста</translation>
     </message>
     <message>
-        <location filename="menu.py" line="311"/>
+        <location filename="menu.py" line="323"/>
         <source>Auto accept default path:</source>
         <translation>Путь автоприема файлов:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="312"/>
+        <location filename="menu.py" line="324"/>
         <source>Change</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="menu.py" line="313"/>
+        <location filename="menu.py" line="325"/>
         <source>Allow inlines</source>
         <translation>Разрешать инлайны</translation>
     </message>
     <message>
-        <location filename="menu.py" line="336"/>
+        <location filename="menu.py" line="348"/>
         <source>Chat history</source>
         <translation>История чата</translation>
     </message>
     <message>
-        <location filename="menu.py" line="339"/>
+        <location filename="menu.py" line="351"/>
         <source>History will be cleaned! Continue?</source>
         <translation>История переписки будет очищена! Продолжить?</translation>
     </message>
     <message>
-        <location filename="menu.py" line="315"/>
+        <location filename="menu.py" line="327"/>
         <source>Blocked users:</source>
         <translation>Заблокированные пользователи:</translation>
     </message>
     <message>
-        <location filename="menu.py" line="316"/>
+        <location filename="menu.py" line="328"/>
         <source>Unblock</source>
         <translation>Разблокировать</translation>
     </message>
     <message>
-        <location filename="menu.py" line="317"/>
+        <location filename="menu.py" line="329"/>
         <source>Block user</source>
         <translation>Заблокировать пользователя</translation>
     </message>
     <message>
-        <location filename="menu.py" line="323"/>
+        <location filename="menu.py" line="335"/>
         <source>Add to friend list</source>
         <translation>Добавить в список друзей</translation>
     </message>
     <message>
-        <location filename="menu.py" line="324"/>
+        <location filename="menu.py" line="336"/>
         <source>Do you want to add this user to friend list?</source>
         <translation>Добавить этого пользователя в список друзей?</translation>
     </message>
     <message>
-        <location filename="menu.py" line="314"/>
+        <location filename="menu.py" line="326"/>
         <source>Block by TOX ID:</source>
         <translation>Блокировать по TOX ID:</translation>
     </message>
@@ -430,12 +481,12 @@
 <context>
     <name>tray</name>
     <message>
-        <location filename="main.py" line="106"/>
+        <location filename="main.py" line="113"/>
         <source>Open Toxygen</source>
         <translation>Открыть Toxygen</translation>
     </message>
     <message>
-        <location filename="main.py" line="107"/>
+        <location filename="main.py" line="114"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>

src/util.py

@@ -3,7 +3,7 @@ import time
 from platform import system
 
 
-program_version = '0.1.1'
+program_version = '0.1.2'
 
 
 def log(data):
@@ -27,14 +27,15 @@ def convert_time(t):
     return '%02d:%02d' % (h, m)
 
 
+# obsolete
 def get_style(style):
     if style != 'default':
         return style
     else:
-        if system() == 'Linux':
+        if system() == 'Windows':
-            return 'gtk'
-        elif system() == 'Windows':
             return 'windows'
+        else:
+            return 'gtk'
 
 
 class Singleton(object):