readme update

French translation up to v0.3.0

.gitignore

@@ -6,6 +6,7 @@ tests/tests
 tests/libs
 tests/.cache
 tests/__pycache__
+tests/avatars
 toxygen/libs
 .idea
 *~
@@ -23,4 +24,4 @@ toxygen/__pycache__
 html
 Toxygen.egg-info
 *.tox
-
+.cache

.travis.yml

@@ -2,10 +2,16 @@ language: python
 python:
   - "3.5"
   - "3.6"
+os:
+  - linux
+dist: trusty
+notifications:
+  email: false
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y checkinstall build-essential
   - sudo apt-get install portaudio19-dev
+  - sudo apt-get install libsecret-1-dev
   - sudo apt-get install libconfig-dev libvpx-dev check -qq
 install:
   - pip install sip
@@ -13,7 +19,7 @@ install:
   - pip install pyaudio
   - pip install opencv-python
 before_script:
-# OPUS
+# Opus
   - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
   - tar xzf opus-1.0.3.tar.gz
   - cd opus-1.0.3

MANIFEST.in

@@ -12,9 +12,7 @@ include toxygen/smileys/starwars/*.png
 include toxygen/smileys/starwars/config.json
 include toxygen/smileys/ksk/*.png
 include toxygen/smileys/ksk/config.json
-include toxygen/styles/style.qss
+include toxygen/styles/*.qss
 include toxygen/translations/*.qm
 include toxygen/libs/libtox.dll
 include toxygen/libs/libsodium.a
-include toxygen/libs/libtox64.dll
-include toxygen/libs/libsodium64.a

README.md

@@ -10,41 +10,38 @@ Toxygen is powerful cross-platform [Tox](https://tox.chat/) client written in pu
 
 ### [Install](/docs/install.md) - [Contribute](/docs/contributing.md) - [Plugins](/docs/plugins.md) - [Compile](/docs/compile.md) - [Contact](/docs/contact.md) - [Updater](https://github.com/toxygen-project/toxygen_updater)
 
-### Supported OS:
-
-![Linux, Windows and OS X](/docs/os.png)
+### Supported OS: Linux and Windows
 
 ### Features:
 
-- [x] 1v1 messages
-- [x] File transfers
-- [x] Audio calls
-- [x] Plugins support
-- [x] Chat history
-- [x] Emoticons
-- [x] Stickers
-- [x] Screenshots
-- [x] Name lookups (toxme.io support)
-- [x] Save file encryption
-- [x] Profile import and export
-- [x] Faux offline messaging
-- [x] Faux offline file transfers
-- [x] Inline images
-- [x] Message splitting
-- [x] Proxy support
-- [x] Avatars
-- [x] Multiprofile
-- [x] Multilingual
-- [x] Sound notifications
-- [x] Contact aliases
-- [x] Contact blocking
-- [x] Typing notifications
-- [x] Changing nospam
-- [x] File resuming
-- [x] Read receipts
-- [ ] Video calls
-- [ ] Desktop sharing
-- [ ] Group chats
+- 1v1 messages
+- File transfers
+- Audio calls
+- Video calls
+- Plugins support
+- Desktop sharing
+- Chat history
+- Emoticons
+- Stickers
+- Screenshots
+- Name lookups (toxme.io support)
+- Save file encryption
+- Profile import and export
+- Faux offline messaging
+- Faux offline file transfers
+- Inline images
+- Message splitting
+- Proxy support
+- Avatars
+- Multiprofile
+- Multilingual
+- Sound notifications
+- Contact aliases
+- Contact blocking
+- Typing notifications
+- Changing nospam
+- File resuming
+- Read receipts
 
 ### Downloads
 [Releases](https://github.com/toxygen-project/toxygen/releases)

docs/contributing.md

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

docs/install.md

@@ -1,13 +1,13 @@
 # How to install Toxygen
 
-## Use precompiled binary:
+## Use precompiled binary (recommended for users):
 [Check our releases page](https://github.com/toxygen-project/toxygen/releases)
 
 ## Using pip3
 
 ### Windows
 
-``pip3.4 install toxygen``
+``pip install toxygen``
 
 Run app using ``toxygen`` command.
 
@@ -16,19 +16,11 @@ Run app using ``toxygen`` command.
 1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
 2. Install PortAudio: 
 ``sudo apt-get install portaudio19-dev``
-3. Install PySide: ``sudo apt-get install python3-pyside``
-4. Install toxygen: 
-``sudo pip3.4 install toxygen``
-5. Run toxygen using ``toxygen`` command.
-
-### OS X
-
-1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system
-2. Install PortAudio:
-``brew install portaudio``
-3. Install toxygen: 
-``pip3.4 install toxygen``
-4. Run toxygen using ``toxygen`` command.
+3. For 32-bit Linux install PyQt5: ``sudo apt-get install python3-pyqt5``
+4. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo apt-get install python3-opencv``
+5. Install toxygen: 
+``sudo pip3 install toxygen``
+6. Run toxygen using ``toxygen`` command.
 
 ## Packages
 
@@ -40,15 +32,19 @@ Debian/Ubuntu: [tox.chat](https://tox.chat/download.html#gnulinux)
 
 ### Windows
 
-1. [Download and install latest Python 3.4](https://www.python.org/downloads/windows/)
-2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4#installing-pyside-on-a-windows-system) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
-3. Install PyAudio: ``pip3.4 install pyaudio``
-4. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
-5. Unpack archive  
-6. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\
-7. Run \toxygen\main.py.
+Note: 32-bit Python isn't supported due to bug with videocalls. It is strictly recommended to use 64-bit Python.
 
-Optional: install toxygen using setup.py: ``python3.4 setup.py install``
+1. [Download and install latest Python 3 64-bit](https://www.python.org/downloads/windows/)
+2. Install PyQt5: ``pip install pyqt5``
+3. Install PyAudio: ``pip install pyaudio``
+4. Install numpy: ``pip install numpy``
+5. Install OpenCV: ``pip install opencv-python``
+6. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip)
+7. Unpack archive
+8. Download latest libtox.dll build, download latest libsodium.a build, put it into \toxygen\libs\
+9. Run \toxygen\main.py.
+
+Optional: install toxygen using setup.py: ``python setup.py install``
 
 [libtox.dll for 32-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86_shared_release.zip)
 
@@ -62,27 +58,15 @@ Optional: install toxygen using setup.py: ``python3.4 setup.py install``
 
 1. Install latest Python3: 
 ``sudo apt-get install python3``
-2. Install PySide: ``sudo apt-get install python3-pyside`` or install [PyQt4](https://riverbankcomputing.com/software/pyqt/download) (``sudo apt-get install python3-pyqt4``).
+2. Install PyQt5: ``sudo apt-get install python3-pyqt5`` or ``sudo pip3 install pyqt5``
 3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
 4. Install PyAudio: 
-``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``pip3 install pyaudio``)
-5. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
-6. Unpack archive 
-7. Run app:
-``python3.4 main.py``
-
-Optional: install toxygen using setup.py: ``python3.4 setup.py install``
-
-### OS X
-
-1. [Download and install latest Python 3.4](https://www.python.org/downloads/mac-osx/)
-2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4#installing-pyside-on-a-mac-os-x-system) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
-3. Install PortAudio:
-``brew install portaudio``
-4. Install PyAudio: ``pip3 install pyaudio``
-5. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system
-6. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
-7. Unpack archive  
-8. Run \toxygen\main.py.
+``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``sudo pip3 install pyaudio``)
+5. Install NumPy: ``sudo pip3 install numpy``
+6. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo apt-get install python3-opencv``
+7. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip)
+8. Unpack archive
+9. Run app:
+``python3 main.py``
 
 Optional: install toxygen using setup.py: ``python3 setup.py install``

docs/plugin_api.md

@@ -1,6 +1,6 @@
 # Plugins API
 
-In Toxygen plugin is single python (supported Python 3.0 - 3.4) module (.py file) and directory with data associated with it. 
+In Toxygen plugin is single python (supported Python 3.4 - 3.6) module (.py file) and directory with data associated with it. 
 Every module must contain one class derived from PluginSuperClass defined in [plugin_super_class.py](/src/plugins/plugin_super_class.py). Instance of this class will be created by PluginLoader class (defined in [plugin_support.py](/src/plugin_support.py) ). This class can enable/disable plugins and send data to it. 
 
 Every plugin has its own full name and unique short name (1-5 symbols). Main app can get it using special methods. 
@@ -45,7 +45,7 @@ Import statement will not work in case you import module that wasn't previously
 
 About GUI:
 
-It's strictly recommended to support both PySide and PyQt4 in GUI. Plugin can have no GUI at all.
+GUI is available via PyQt5. Plugin can have no GUI at all.
 
 Exceptions:
 

docs/plugins.md

@@ -1,6 +1,6 @@
 # Plugins
 
-Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python 3.4 module (.py file) and directory with plugin's data which provide some additional functionality. 
+Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python 3.4 - 3.6 module (.py file) and directory with plugin's data which provide some additional functionality. 
 
 # How to write plugin
 

setup.py

@@ -8,20 +8,23 @@ import sys
 
 version = program_version + '.0'
 
-MODULES = ['numpy', 'PyQt5']
 
-if system() in ('Windows', 'Darwin'):
-    MODULES.append('PyAudio')
+if system() == 'Windows':
+    MODULES = ['PyQt5', 'PyAudio', 'numpy', 'opencv-python']
 else:
+    MODULES = []
     try:
         import pyaudio
     except ImportError:
         MODULES.append('PyAudio')
-
-DEP_LINKS = []
-
-if system() == 'Windows':
-    DEP_LINKS = []  # TODO: add opencv.whl
+    try:
+        import PyQt5
+    except ImportError:
+        MODULES.append('PyQt5')
+    try:
+        import numpy
+    except ImportError:
+        MODULES.append('numpy')
 
 
 class InstallScript(install):
@@ -30,9 +33,7 @@ class InstallScript(install):
     def run(self):
         install.run(self)
         try:
-            if system() == 'Windows':
-                call(["toxygen", "--configure"])
-            else:
+            if system() != 'Windows':
                 call(["toxygen", "--clean"])
         except:
             try:
@@ -42,9 +43,7 @@ class InstallScript(install):
                     if path[-1] not in ('/', '\\'):
                         path += '/'
                     path += 'bin/toxygen'
-                    if system() == 'Windows':
-                        call([path, "--configure"])
-                    else:
+                    if system() != 'Windows':
                         call([path, "--clean"])
             except:
                 pass
@@ -60,7 +59,6 @@ setup(name='Toxygen',
       license='GPL3',
       packages=['toxygen', 'toxygen.plugins', 'toxygen.styles'],
       install_requires=MODULES,
-      dependency_links=DEP_LINKS,
       include_package_data=True,
       classifiers=[
           'Programming Language :: Python :: 3 :: Only',
@@ -72,5 +70,4 @@ setup(name='Toxygen',
       },
       cmdclass={
           'install': InstallScript,
-      },
-      )
+      })

toxygen/calls.py

@@ -6,6 +6,7 @@ from toxav_enums import *
 import cv2
 import itertools
 import numpy as np
+import screen_sharing
 # TODO: play sound until outgoing call will be started or cancelled
 
 
@@ -203,6 +204,10 @@ class AV:
         self._video_width = s.video['width']
         self._video_height = s.video['height']
 
+        if s.video['device'] == -1:
+            self._video = screen_sharing.DesktopGrabber(s.video['x'], s.video['y'],
+                                                        s.video['width'], s.video['height'])
+        else:
             self._video = cv2.VideoCapture(s.video['device'])
             self._video.set(cv2.CAP_PROP_FPS, 25)
             self._video.set(cv2.CAP_PROP_FRAME_WIDTH, self._video_width)
@@ -323,7 +328,6 @@ class AV:
         u[::2, :] = frame[self._video_height:self._video_height * 5 // 4, :self._video_width // 2]
         u[1::2, :] = frame[self._video_height:self._video_height * 5 // 4, self._video_width // 2:]
         u = list(itertools.chain.from_iterable(u))
-
         v = np.zeros((self._video_height // 2, self._video_width // 2), dtype=np.int)
         v[::2, :] = frame[self._video_height * 5 // 4:, :self._video_width // 2]
         v[1::2, :] = frame[self._video_height * 5 // 4:, self._video_width // 2:]

toxygen/main.py

@@ -54,10 +54,9 @@ class Toxygen:
         if platform.system() == 'Linux':
             QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads)
 
-        # application color scheme
-        with open(curr_directory() + '/styles/style.qss') as fl:
-            dark_style = fl.read()
-        app.setStyleSheet(dark_style)
+        with open(curr_directory() + '/styles/dark_style.qss') as fl:
+            style = fl.read()
+        app.setStyleSheet(style)
 
         encrypt_save = toxes.ToxES()
 
@@ -107,7 +106,7 @@ class Toxygen:
                         return
                     self.tox = profile.tox_factory()
                     self.tox.self_set_name(bytes(_login.name, 'utf-8') if _login.name else b'Toxygen User')
-                    self.tox.self_set_status_message(b'Toxing on Toxygen')
+                    self.tox.self_set_status_message(b'Toxing on T03')
                     reply = QtWidgets.QMessageBox.question(None,
                                                            'Profile {}'.format(name),
                                                            QtWidgets.QApplication.translate("login",
@@ -172,6 +171,13 @@ class Toxygen:
         else:
             settings.set_active_profile()
 
+        # application color scheme
+        for theme in settings.built_in_themes().keys():
+            if settings['theme'] == theme:
+                with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
+                    style = fl.read()
+                app.setStyleSheet(style)
+
         lang = Settings.supported_languages()[settings['language']]
         translator = QtCore.QTranslator()
         translator.load(curr_directory() + '/translations/' + lang)
@@ -448,27 +454,6 @@ def clean():
     remove(d)
 
 
-def configure():
-    """Removes unused libs"""
-    d = curr_directory() + '/libs/'
-    is_64bits = is_64_bit()
-    if not is_64bits:
-        if os.path.exists(d + 'libtox64.dll'):
-            os.remove(d + 'libtox64.dll')
-        if os.path.exists(d + 'libsodium64.a'):
-            os.remove(d + 'libsodium64.a')
-    else:
-        if os.path.exists(d + 'libtox.dll'):
-            os.remove(d + 'libtox.dll')
-        if os.path.exists(d + 'libsodium.a'):
-            os.remove(d + 'libsodium.a')
-        try:
-            os.rename(d + 'libtox64.dll', d + 'libtox.dll')
-            os.rename(d + 'libsodium64.a', d + 'libsodium.a')
-        except:
-            pass
-
-
 def reset():
     Settings.reset_auto_profile()
 
@@ -484,9 +469,6 @@ def main():
         elif arg == '--help':
             print('Usage:\ntoxygen path_to_profile\ntoxygen tox_id\ntoxygen --version\ntoxygen --reset')
             return
-        elif arg == '--configure':
-            configure()
-            return
         elif arg == '--clean':
             clean()
             return

toxygen/mainscreen.py

@@ -22,52 +22,47 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         if settings.Settings.get_instance()['show_welcome_screen']:
             self.ws = WelcomeScreen()
 
-    def setup_menu(self, Form):
-        box = QtWidgets.QHBoxLayout()
-        box.setContentsMargins(0, 0, 0, 0)
-        box.setAlignment(QtCore.Qt.AlignLeft)
-        self.profile_button = MainMenuButton(Form)
-        box.addWidget(self.profile_button)
-        self.settings_button = MainMenuButton(Form)
-        box.addWidget(self.settings_button)
-        self.plugins_button = MainMenuButton(Form)
-        box.addWidget(self.plugins_button)
-        self.about_button = MainMenuButton(Form)
-        box.addWidget(self.about_button)
-        box.setSpacing(0)
+    def setup_menu(self, window):
+        self.menubar = QtWidgets.QMenuBar(window)
+        self.menubar.setObjectName("menubar")
+        self.menubar.setNativeMenuBar(False)
+        self.menubar.setMinimumSize(self.width(), 25)
+        self.menubar.setMaximumSize(self.width(), 25)
+        self.menubar.setBaseSize(self.width(), 25)
+        self.menuProfile = QtWidgets.QMenu(self.menubar)
 
-        self.menuProfile = QtWidgets.QMenu()
+        self.menuProfile = QtWidgets.QMenu(self.menubar)
         self.menuProfile.setObjectName("menuProfile")
-        self.menuSettings = QtWidgets.QMenu()
+        self.menuSettings = QtWidgets.QMenu(self.menubar)
         self.menuSettings.setObjectName("menuSettings")
-        self.menuPlugins = QtWidgets.QMenu()
+        self.menuPlugins = QtWidgets.QMenu(self.menubar)
         self.menuPlugins.setObjectName("menuPlugins")
-        self.menuAbout = QtWidgets.QMenu()
+        self.menuAbout = QtWidgets.QMenu(self.menubar)
         self.menuAbout.setObjectName("menuAbout")
 
-        self.actionAdd_friend = QtWidgets.QAction(Form)
+        self.actionAdd_friend = QtWidgets.QAction(window)
         self.actionAdd_friend.setObjectName("actionAdd_friend")
-        self.actionprofilesettings = QtWidgets.QAction(Form)
+        self.actionprofilesettings = QtWidgets.QAction(window)
         self.actionprofilesettings.setObjectName("actionprofilesettings")
-        self.actionPrivacy_settings = QtWidgets.QAction(Form)
+        self.actionPrivacy_settings = QtWidgets.QAction(window)
         self.actionPrivacy_settings.setObjectName("actionPrivacy_settings")
-        self.actionInterface_settings = QtWidgets.QAction(Form)
+        self.actionInterface_settings = QtWidgets.QAction(window)
         self.actionInterface_settings.setObjectName("actionInterface_settings")
-        self.actionNotifications = QtWidgets.QAction(Form)
+        self.actionNotifications = QtWidgets.QAction(window)
         self.actionNotifications.setObjectName("actionNotifications")
-        self.actionNetwork = QtWidgets.QAction(Form)
+        self.actionNetwork = QtWidgets.QAction(window)
         self.actionNetwork.setObjectName("actionNetwork")
-        self.actionAbout_program = QtWidgets.QAction(Form)
+        self.actionAbout_program = QtWidgets.QAction(window)
         self.actionAbout_program.setObjectName("actionAbout_program")
-        self.updateSettings = QtWidgets.QAction(Form)
-        self.actionSettings = QtWidgets.QAction(Form)
+        self.updateSettings = QtWidgets.QAction(window)
+        self.actionSettings = QtWidgets.QAction(window)
         self.actionSettings.setObjectName("actionSettings")
-        self.audioSettings = QtWidgets.QAction(Form)
-        self.videoSettings = QtWidgets.QAction(Form)
-        self.pluginData = QtWidgets.QAction(Form)
-        self.importPlugin = QtWidgets.QAction(Form)
-        self.reloadPlugins = QtWidgets.QAction(Form)
-        self.lockApp = QtWidgets.QAction(Form)
+        self.audioSettings = QtWidgets.QAction(window)
+        self.videoSettings = QtWidgets.QAction(window)
+        self.pluginData = QtWidgets.QAction(window)
+        self.importPlugin = QtWidgets.QAction(window)
+        self.reloadPlugins = QtWidgets.QAction(window)
+        self.lockApp = QtWidgets.QAction(window)
         self.menuProfile.addAction(self.actionAdd_friend)
         self.menuProfile.addAction(self.actionSettings)
         self.menuProfile.addAction(self.lockApp)
@@ -83,10 +78,10 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.menuPlugins.addAction(self.reloadPlugins)
         self.menuAbout.addAction(self.actionAbout_program)
 
-        self.profile_button.setMenu(self.menuProfile)
-        self.settings_button.setMenu(self.menuSettings)
-        self.plugins_button.setMenu(self.menuPlugins)
-        self.about_button.setMenu(self.menuAbout)
+        self.menubar.addAction(self.menuProfile.menuAction())
+        self.menubar.addAction(self.menuSettings.menuAction())
+        self.menubar.addAction(self.menuPlugins.menuAction())
+        self.menubar.addAction(self.menuAbout.menuAction())
 
         self.actionAbout_program.triggered.connect(self.about_program)
         self.actionNetwork.triggered.connect(self.network_settings)
@@ -103,9 +98,6 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.importPlugin.triggered.connect(self.import_plugin)
         self.reloadPlugins.triggered.connect(self.reload_plugins)
 
-        Form.setLayout(box)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
     def languageChange(self, *args, **kwargs):
         self.retranslateUi()
 
@@ -117,11 +109,11 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
 
     def retranslateUi(self):
         self.lockApp.setText(QtWidgets.QApplication.translate("MainWindow", "Lock"))
-        self.plugins_button.setText(QtWidgets.QApplication.translate("MainWindow", "Plugins"))
+        self.menuPlugins.setTitle(QtWidgets.QApplication.translate("MainWindow", "Plugins"))
         self.pluginData.setText(QtWidgets.QApplication.translate("MainWindow", "List of plugins"))
-        self.profile_button.setText(QtWidgets.QApplication.translate("MainWindow", "Profile"))
-        self.settings_button.setText(QtWidgets.QApplication.translate("MainWindow", "Settings"))
-        self.about_button.setText(QtWidgets.QApplication.translate("MainWindow", "About"))
+        self.menuProfile.setTitle(QtWidgets.QApplication.translate("MainWindow", "Profile"))
+        self.menuSettings.setTitle(QtWidgets.QApplication.translate("MainWindow", "Settings"))
+        self.menuAbout.setTitle(QtWidgets.QApplication.translate("MainWindow", "About"))
         self.actionAdd_friend.setText(QtWidgets.QApplication.translate("MainWindow", "Add contact"))
         self.actionprofilesettings.setText(QtWidgets.QApplication.translate("MainWindow", "Profile"))
         self.actionPrivacy_settings.setText(QtWidgets.QApplication.translate("MainWindow", "Privacy"))
@@ -383,12 +375,8 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
         self.close()
 
     def resizeEvent(self, *args, **kwargs):
-        if platform.system() == 'Windows':
         self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
         self.friends_list.setGeometry(0, 0, 270, self.height() - 125)
-        else:
-            self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 159)
-            self.friends_list.setGeometry(0, 0, 270, self.height() - 129)
 
         self.videocallButton.setGeometry(QtCore.QRect(self.width() - 330, 10, 50, 50))
         self.callButton.setGeometry(QtCore.QRect(self.width() - 390, 10, 50, 50))

toxygen/mainscreen_widgets.py

@@ -1,5 +1,5 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
-from widgets import RubberBand, create_menu, QRightClickButton, CenteredWidget, LineEdit
+from widgets import RubberBandWindow, create_menu, QRightClickButton, CenteredWidget, LineEdit
 from profile import Profile
 import smileys
 import util
@@ -71,38 +71,12 @@ class MessageArea(QtWidgets.QPlainTextEdit):
             self.insertPlainText(text)
 
 
-class ScreenShotWindow(QtWidgets.QWidget):
-
-    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 = RubberBand()
-        self.rubberband.setWindowFlags(self.rubberband.windowFlags() | QtCore.Qt.FramelessWindowHint)
-        self.rubberband.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+class ScreenShotWindow(RubberBandWindow):
 
     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()))
-        self.rubberband.show()
-        QtWidgets.QWidget.mousePressEvent(self, event)
-
-    def mouseMoveEvent(self, event):
-        if self.rubberband.isVisible():
-            self.rubberband.setGeometry(QtCore.QRect(self.origin, event.pos()).normalized())
-            left = QtGui.QRegion(QtCore.QRect(0, 0, self.rubberband.x(), self.height()))
-            right = QtGui.QRegion(QtCore.QRect(self.rubberband.x() + self.rubberband.width(), 0, self.width(), self.height()))
-            top = QtGui.QRegion(0, 0, self.width(), self.rubberband.y())
-            bottom = QtGui.QRegion(0, self.rubberband.y() + self.rubberband.height(), self.width(), self.height())
-            self.setMask(left + right + top + bottom)
-
     def mouseReleaseEvent(self, event):
         if self.rubberband.isVisible():
             self.rubberband.hide()
@@ -121,13 +95,6 @@ class ScreenShotWindow(QtWidgets.QWidget):
                 Profile.get_instance().send_screenshot(bytes(byte_array.data()))
             self.close()
 
-    def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_Escape:
-            self.rubberband.setHidden(True)
-            self.close()
-        else:
-            super(ScreenShotWindow, self).keyPressEvent(event)
-
 
 class SmileyWindow(QtWidgets.QWidget):
     """
@@ -153,7 +120,7 @@ class SmileyWindow(QtWidgets.QWidget):
         for i in range(self.page_count):  # buttons with smileys
             elem = QtWidgets.QRadioButton(self)
             elem.setGeometry(QtCore.QRect(i * 20 + 5, 180, 20, 20))
-            elem.clicked.connect(lambda i=i: self.checked(i))
+            elem.clicked.connect(lambda c, t=i: self.checked(t))
             self.radio.append(elem)
         width = max(self.page_count * 20 + 30, (self.page_size + 5) * 8 // 10)
         self.setMaximumSize(width, 200)
@@ -162,7 +129,7 @@ class SmileyWindow(QtWidgets.QWidget):
         for i in range(self.page_size):  # pages - radio buttons
             b = QtWidgets.QPushButton(self)
             b.setGeometry(QtCore.QRect((i // 8) * 20 + 5, (i % 8) * 20, 20, 20))
-            b.clicked.connect(lambda i=i: self.clicked(i))
+            b.clicked.connect(lambda c, t=i: self.clicked(t))
             self.buttons.append(b)
         self.checked(0)
 
@@ -341,10 +308,13 @@ class WelcomeScreen(CenteredWidget):
                                                     'Set profile password via Profile -> Settings. Password allows Toxygen encrypt your history and settings.')
         elif num == 5:
             text = QtWidgets.QApplication.translate('WelcomeScreen',
-                                                'Since v0.1.3 Toxygen supports plugins. <a href="https://github.com/xveduk/toxygen/blob/master/docs/plugins.md">Read more</a>')
-        elif num in (6, 7):
+                                                    'Since v0.1.3 Toxygen supports plugins. <a href="https://github.com/toxygen-project/toxygen/blob/master/docs/plugins.md">Read more</a>')
+        elif num == 6:
             text = QtWidgets.QApplication.translate('WelcomeScreen',
                                                     'Toxygen supports faux offline messages and file transfers. Send message or file to offline friend and he will get it later.')
+        elif num == 7:
+            text = QtWidgets.QApplication.translate('WelcomeScreen',
+                                                    'New in Toxygen 0.3.0:<br>Video calls<br>Python3.6 support<br>Migration to PyQt5')
         elif num == 8:
             text = QtWidgets.QApplication.translate('WelcomeScreen',
                                                     'Delete single message in chat: make right click on spinner or message time and choose "Delete" in menu')

toxygen/menu.py

@@ -2,7 +2,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 from settings import *
 from profile import Profile
 from util import curr_directory, copy
-from widgets import CenteredWidget, DataLabel, LineEdit
+from widgets import CenteredWidget, DataLabel, LineEdit, RubberBandWindow
 import pyaudio
 import toxes
 import plugin_support
@@ -248,11 +248,11 @@ class ProfileSettings(CenteredWidget):
     def set_avatar(self):
         choose = QtWidgets.QApplication.translate("ProfileSettingsForm", "Choose avatar")
         name = QtWidgets.QFileDialog.getOpenFileName(self, choose, None, 'Images (*.png)',
-                                                     QtGui.QComboBoxQtWidgets.QFileDialog.DontUseNativeDialog)
+                                                     options=QtWidgets.QFileDialog.DontUseNativeDialog)
         if name[0]:
             bitmap = QtGui.QPixmap(name[0])
-            bitmap.scaled(QtCore.QSize(128, 128), aspectMode=QtCore.Qt.KeepAspectRatio,
-                          mode=QtCore.Qt.SmoothTransformation)
+            bitmap.scaled(QtCore.QSize(128, 128), aspectRatioMode=QtCore.Qt.KeepAspectRatio,
+                          transformMode=QtCore.Qt.SmoothTransformation)
 
             byte_array = QtCore.QByteArray()
             buffer = QtCore.QBuffer(byte_array)
@@ -261,8 +261,8 @@ class ProfileSettings(CenteredWidget):
             Profile.get_instance().set_avatar(bytes(byte_array.data()))
 
     def export_profile(self):
-        directory = QtWidgets.QFileDialog.getExistingDirectory(options=QtWidgets.QFileDialog.DontUseNativeDialog,
-                                                           dir=curr_directory()) + '/'
+        directory = QtWidgets.QFileDialog.getExistingDirectory(self, '', curr_directory(),
+                                                               QtWidgets.QFileDialog.DontUseNativeDialog) + '/'
         if directory != '/':
             reply = QtWidgets.QMessageBox.question(None,
                                                QtWidgets.QApplication.translate("ProfileSettingsForm",
@@ -565,11 +565,10 @@ class InterfaceSettings(CenteredWidget):
         self.label.setFont(font)
         self.themeSelect = QtWidgets.QComboBox(self)
         self.themeSelect.setGeometry(QtCore.QRect(30, 40, 120, 30))
-        list_of_themes = ['dark']
-        self.themeSelect.addItems(list_of_themes)
+        self.themeSelect.addItems(list(settings.built_in_themes().keys()))
         theme = settings['theme']
-        if theme in list_of_themes:
-            index = list_of_themes.index(theme)
+        if theme in settings.built_in_themes().keys():
+            index = list(settings.built_in_themes().keys()).index(theme)
         else:
             index = 0
         self.themeSelect.setCurrentIndex(index)
@@ -704,6 +703,14 @@ class InterfaceSettings(CenteredWidget):
     def closeEvent(self, event):
         settings = Settings.get_instance()
         settings['theme'] = str(self.themeSelect.currentText())
+        try:
+            theme = settings['theme']
+            app = QtWidgets.QApplication.instance()
+            with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
+                style = fl.read()
+            app.setStyleSheet(style)
+        except IsADirectoryError:
+            app.setStyleSheet('') # for default style
         settings['smileys'] = self.smileys.isChecked()
         restart = False
         if settings['mirror_mode'] != self.mirror_mode.isChecked():
@@ -795,6 +802,18 @@ class AudioSettings(CenteredWidget):
         settings.save()
 
 
+class DesktopAreaSelectionWindow(RubberBandWindow):
+
+    def mouseReleaseEvent(self, event):
+        if self.rubberband.isVisible():
+            self.rubberband.hide()
+            rect = self.rubberband.geometry()
+            width, height = rect.width(), rect.height()
+            if width >= 8 and height >= 8:
+                self.parent.save(rect.x(), rect.y(), width, height)
+            self.close()
+
+
 class VideoSettings(CenteredWidget):
     """
     Audio calls settings form
@@ -805,6 +824,7 @@ class VideoSettings(CenteredWidget):
         self.initUI()
         self.retranslateUi()
         self.center()
+        self.desktopAreaSelection = None
 
     def initUI(self):
         self.setObjectName("videoSettingsForm")
@@ -824,9 +844,16 @@ class VideoSettings(CenteredWidget):
         self.input = QtWidgets.QComboBox(self)
         self.input.setGeometry(QtCore.QRect(25, 30, 350, 30))
         self.input.currentIndexChanged.connect(self.selectionChanged)
+        self.button = QtWidgets.QPushButton(self)
+        self.button.clicked.connect(self.button_clicked)
+        self.button.setGeometry(QtCore.QRect(25, 70, 350, 30))
         import cv2
-        self.devices = []
-        self.frame_max_sizes = []
+        self.devices = [-1]
+        screen = QtWidgets.QApplication.primaryScreen()
+        size = screen.size()
+        self.frame_max_sizes = [(size.width(), size.height())]
+        desktop = QtWidgets.QApplication.translate("videoSettingsForm", "Desktop")
+        self.input.addItem(desktop)
         for i in range(10):
             v = cv2.VideoCapture(i)
             if v.isOpened():
@@ -839,23 +866,48 @@ class VideoSettings(CenteredWidget):
                 self.devices.append(i)
                 self.frame_max_sizes.append((width, height))
                 self.input.addItem('Device #' + str(i))
+        try:
             index = self.devices.index(settings.video['device'])
-        if index + 1:
             self.input.setCurrentIndex(index)
+        except:
+            print('Video devices error!')
 
     def retranslateUi(self):
         self.setWindowTitle(QtWidgets.QApplication.translate("videoSettingsForm", "Video settings"))
         self.in_label.setText(QtWidgets.QApplication.translate("videoSettingsForm", "Device:"))
+        self.button.setText(QtWidgets.QApplication.translate("videoSettingsForm", "Select region"))
+
+    def button_clicked(self):
+        self.desktopAreaSelection = DesktopAreaSelectionWindow(self)
 
     def closeEvent(self, event):
+        try:
             settings = Settings.get_instance()
             settings.video['device'] = self.devices[self.input.currentIndex()]
             text = self.video_size.currentText()
             settings.video['width'] = int(text.split(' ')[0])
             settings.video['height'] = int(text.split(' ')[-1])
             settings.save()
+        except Exception as ex:
+            print('Saving video  settings error: ' + str(ex))
+
+    def save(self, x, y, width, height):
+        self.desktopAreaSelection = None
+        settings = Settings.get_instance()
+        settings.video['device'] = -1
+        settings.video['width'] = width
+        settings.video['height'] = height
+        settings.video['x'] = x
+        settings.video['y'] = y
+        settings.save()
 
     def selectionChanged(self):
+        if self.input.currentIndex() == 0:
+            self.button.setVisible(True)
+            self.video_size.setVisible(False)
+        else:
+            self.button.setVisible(False)
+            self.video_size.setVisible(True)
         width, height = self.frame_max_sizes[self.input.currentIndex()]
         self.video_size.clear()
         dims = [

toxygen/profile.py

@@ -88,6 +88,7 @@ class Profile(basecontact.BaseContact, Singleton):
         if status is not None:
             self._tox.self_set_status(status)
         elif not self._waiting_for_reconnection:
+            self._waiting_for_reconnection = True
             QtCore.QTimer.singleShot(50000, self.reconnect)
 
     def set_name(self, value):
@@ -666,7 +667,7 @@ class Profile(basecontact.BaseContact, Singleton):
         dialog = dialog.format(name)
         title = QtWidgets.QApplication.translate('MainWindow',
                                                  'Set alias')
-        text, ok = QtGui.QInputDialog.getText(None,
+        text, ok = QtWidgets.QInputDialog.getText(None,
                                                   title,
                                                   dialog,
                                                   QtWidgets.QLineEdit.Normal,

toxygen/screen_sharing.py

@@ -0,0 +1,22 @@
+import numpy as np
+from PyQt5 import QtWidgets
+
+
+class DesktopGrabber:
+
+    def __init__(self, x, y, width, height):
+        self._x = x
+        self._y = y
+        self._width = width
+        self._height = height
+        self._width -= width % 4
+        self._height -= height % 4
+        self._screen = QtWidgets.QApplication.primaryScreen()
+
+    def read(self):
+        pixmap = self._screen.grabWindow(0, self._x, self._y, self._width, self._height)
+        image = pixmap.toImage()
+        s = image.bits().asstring(self._width * self._height * 4)
+        arr = np.fromstring(s, dtype=np.uint8).reshape((self._height, self._width, 4))
+
+        return True, arr

toxygen/settings.py

@@ -47,7 +47,7 @@ class Settings(dict, Singleton):
         self.audio = {'input': p.get_default_input_device_info()['index'] if input_devices else -1,
                       'output': p.get_default_output_device_info()['index'] if output_devices else -1,
                       'enabled': input_devices and output_devices}
-        self.video = {'device': 0, 'width': 640, 'height': 480}
+        self.video = {'device': -1, 'width': 640, 'height': 480, 'x': 0, 'y': 0}
 
     @staticmethod
     def get_auto_profile():
@@ -57,7 +57,10 @@ class Settings(dict, Singleton):
                 data = fl.read()
             auto = json.loads(data)
             if 'path' in auto and 'name' in auto:
-                return str(auto['path']), str(auto['name'])
+                path = str(auto['path'])
+                name = str(auto['name'])
+                if os.path.isfile(append_slash(path) + name + '.tox'):
+                    return path, name
         return '', ''
 
     @staticmethod
@@ -100,7 +103,7 @@ class Settings(dict, Singleton):
         Default profile settings
         """
         return {
-            'theme': 'default',
+            'theme': 'dark',
             'ipv6_enabled': True,
             'udp_enabled': True,
             'proxy_type': 0,
@@ -148,8 +151,16 @@ class Settings(dict, Singleton):
     def supported_languages():
         return {
             'English': 'en_EN',
+            'French': 'fr_FR',
             'Russian': 'ru_RU',
-            'French': 'fr_FR'
+            'Ukrainian': 'uk_UA'
+        }
+
+    @staticmethod
+    def built_in_themes():
+        return {
+            'dark': '/styles/dark_style.qss',
+            'default': '/styles/style.qss'
         }
 
     def upgrade(self):

toxygen/styles/style.qrc

@@ -41,6 +41,9 @@
     <file>rc/radio_unchecked.png</file>
   </qresource>
   <qresource prefix="qdarkstyle">
+      <file>dark_style.qss</file>
+  </qresource>
+  <qresource prefix="defaultstyle">
       <file>style.qss</file>
   </qresource>
 </RCC>

toxygen/tox.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from ctypes import c_char_p, Structure, c_bool, byref, c_int, c_size_t, POINTER, c_uint16, c_void_p, c_uint64
 from ctypes import create_string_buffer, ArgumentError, CFUNCTYPE, c_uint32, sizeof, c_uint8
 from toxcore_enums_and_consts import *

toxygen/toxygen.pro

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

toxygen/updater.py

@@ -57,6 +57,9 @@ def get_url(version):
 
 def get_params(url, version):
     if is_from_sources():
+        if platform.system() == 'Windows':
+            return ['python', 'toxygen_updater.py', url, version]
+        else:
             return ['python3', 'toxygen_updater.py', url, version]
     elif platform.system() == 'Windows':
         return [util.curr_directory() + '/toxygen_updater.exe', url, version]
@@ -87,7 +90,8 @@ def send_request(version):
         netman.setProxy(proxy)
     url = test_url(version)
     try:
-        request = QtNetwork.QNetworkRequest(url)
+        request = QtNetwork.QNetworkRequest()
+        request.setUrl(QtCore.QUrl(url))
         reply = netman.get(request)
         while not reply.isFinished():
             QtCore.QThread.msleep(1)

toxygen/util.py

@@ -4,14 +4,32 @@ import shutil
 import sys
 import re
 
-program_version = '0.3.0'
+
+program_version = '0.3.1'
+
+
+def cached(func):
+    saved_result = None
+
+    def wrapped_func():
+        nonlocal saved_result
+        if saved_result is None:
+            saved_result = func()
+
+        return saved_result
+
+    return wrapped_func
 
 
 def log(data):
+    try:
         with open(curr_directory() + '/logs.log', 'a') as fl:
             fl.write(str(data) + '\n')
+    except:
+        pass
 
 
+@cached
 def curr_directory():
     return os.path.dirname(os.path.realpath(__file__))
 
@@ -46,9 +64,8 @@ def convert_time(t):
     return '%02d:%02d' % (h, m)
 
 
+@cached
 def time_offset():
-    if hasattr(time_offset, 'offset'):
-        return time_offset.offset
     hours = int(time.strftime('%H'))
     minutes = int(time.strftime('%M'))
     sec = int(time.time()) - time.timezone
@@ -56,7 +73,6 @@ def time_offset():
     h, m = divmod(m, 60)
     d, h = divmod(h, 24)
     result = hours * 60 + minutes - h * 60 - m
-    time_offset.offset = result
     return result
 
 
@@ -66,6 +82,7 @@ def append_slash(s):
     return s
 
 
+@cached
 def is_64_bit():
     return sys.maxsize > 2 ** 32
 

toxygen/widgets.py

@@ -77,6 +77,42 @@ class RubberBand(QtWidgets.QRubberBand):
         self.painter.end()
 
 
+class RubberBandWindow(QtWidgets.QWidget):
+
+    def __init__(self, parent):
+        super().__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 = RubberBand()
+        self.rubberband.setWindowFlags(self.rubberband.windowFlags() | QtCore.Qt.FramelessWindowHint)
+        self.rubberband.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+    def mousePressEvent(self, event):
+        self.origin = event.pos()
+        self.rubberband.setGeometry(QtCore.QRect(self.origin, QtCore.QSize()))
+        self.rubberband.show()
+        QtWidgets.QWidget.mousePressEvent(self, event)
+
+    def mouseMoveEvent(self, event):
+        if self.rubberband.isVisible():
+            self.rubberband.setGeometry(QtCore.QRect(self.origin, event.pos()).normalized())
+            left = QtGui.QRegion(QtCore.QRect(0, 0, self.rubberband.x(), self.height()))
+            right = QtGui.QRegion(QtCore.QRect(self.rubberband.x() + self.rubberband.width(), 0, self.width(), self.height()))
+            top = QtGui.QRegion(0, 0, self.width(), self.rubberband.y())
+            bottom = QtGui.QRegion(0, self.rubberband.y() + self.rubberband.height(), self.width(), self.height())
+            self.setMask(left + right + top + bottom)
+
+    def keyPressEvent(self, event):
+        if event.key() == QtCore.Qt.Key_Escape:
+            self.rubberband.setHidden(True)
+            self.close()
+        else:
+            super().keyPressEvent(event)
+
+
 def create_menu(menu):
     """
     :return translated menu
@@ -128,4 +164,3 @@ class MultilineEdit(CenteredWidget):
     def button_click(self):
         self.save(self.edit.toPlainText())
         self.close()
-