Ported GUI code to Qt.py

.travis.yml

@@ -3,7 +3,7 @@ osx_image: xcode7.3
 
 branches:
   only:
-  - pyside2
+  - qtpy-pyside2
 
 script:
 - python buildPy2app.py py2app
@@ -29,8 +29,8 @@ before_install:
 install:
 
 - pip install twisted appnope pyobjc
-- git clone -b pyside2 https://github.com/alby128/syncplay.git syncplay_PySide2
+- git clone -b qtpy-pyside2 https://github.com/alby128/syncplay.git syncplay-qtpy-PySide2
-- cd syncplay_PySide2
+- cd syncplay-qtpy-PySide2
 - git checkout pyside2
 
 before_deploy:
@@ -49,4 +49,4 @@ deploy:
   region: eu-central-1
   local_dir: dist_dmg
   on:
-    branch: pyside2
+    branch: qtpy-pyside2

buildPy2app.py

@@ -15,7 +15,9 @@ DATA_FILES = [
 ]
 OPTIONS = {
 	'iconfile':'resources/icon.icns',
-	'qt_plugins': ['platforms/libqcocoa.dylib', 'platforms/libqminimal.dylib','platforms/libqoffscreen.dylib'],	
+	'includes': {'PySide2.QtCore', 'PySide2.QtUiTools', 'PySide2.QtGui','PySide2.QtWidgets'},
+    'excludes': {'PySide', 'PySide.QtCore', 'PySide.QtUiTools', 'PySide.QtGui'},
+    'qt_plugins': ['platforms/libqcocoa.dylib', 'platforms/libqminimal.dylib','platforms/libqoffscreen.dylib'],
 	'plist': {
 		'CFBundleName':'Syncplay',
 		'CFBundleShortVersionString':syncplay.version,

buildPy2exe.py

@@ -698,5 +698,5 @@ info = dict(
     cmdclass = {"py2exe": build_installer},               
 )
 
-sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource'])
+sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource', '-p PySide2.QtGui', '-i PySide2.QtWidgets'])
 setup(**info)

syncplay/ui/ConfigurationGetter.py

@@ -401,15 +401,15 @@ class ConfigurationGetter(object):
         self._overrideConfigWithArgs(args)
         if not self._config['noGui']:
             try:
-                from PySide2 import QtWidgets
+	            from syncplay.vendor.Qt import QtWidgets
-                from PySide2.QtCore import QCoreApplication
+	            from syncplay.vendor.Qt.QtCore import QCoreApplication
-                from syncplay.vendor import qt5reactor
+	            from syncplay.vendor import qt5reactor
-                if QCoreApplication.instance() is None:
+	            if QCoreApplication.instance() is None:
-                    self.app = QtWidgets.QApplication(sys.argv)
+	              self.app = QtWidgets.QApplication(sys.argv)
-                qt5reactor.install()
+	            qt5reactor.install()
-                if sys.platform.startswith('darwin'):
+	            if sys.platform.startswith('darwin'):
-                    import appnope
+	                import appnope
-                    appnope.nope()
+	                appnope.nope()
             except ImportError:
                 print getMessage("unable-import-gui-error")
                 self._config['noGui'] = True

syncplay/ui/GuiConfiguration.py

@@ -1,7 +1,8 @@
-from PySide2 import QtCore, QtWidgets, QtGui
+from syncplay.vendor.Qt import QtCore, QtWidgets, QtGui, __binding__
-from PySide2.QtCore import Qt, QSettings, QCoreApplication, QSize, QPoint, QUrl, QLine, QStandardPaths
+from syncplay.vendor.Qt.QtCore import Qt, QSettings, QCoreApplication, QSize, QPoint, QUrl, QLine
-from PySide2.QtWidgets import QApplication, QLineEdit, QLabel, QCheckBox, QButtonGroup, QRadioButton, QDoubleSpinBox, QPlainTextEdit
+from syncplay.vendor.Qt.QtWidgets import QApplication, QLineEdit, QLabel, QCheckBox, QButtonGroup, QRadioButton, QDoubleSpinBox, QPlainTextEdit
-from PySide2.QtGui import QCursor, QIcon, QImage
+from syncplay.vendor.Qt.QtGui import QCursor, QIcon, QImage
+from PySide2.QtCore import QStandardPaths
 from syncplay.players.playerFactory import PlayerFactory
 from datetime import datetime
 from syncplay import utils

syncplay/ui/gui.py

@@ -1,5 +1,7 @@
-from PySide2 import QtWidgets, QtGui
+from syncplay.vendor import Qt
-from PySide2.QtCore import Qt, QSettings, QSize, QPoint, QUrl, QLine, QStandardPaths, QDateTime
+from syncplay.vendor.Qt import QtWidgets, QtGui, __binding__
+from syncplay.vendor.Qt.QtCore import Qt, QSettings, QSize, QPoint, QUrl, QLine, QDateTime
+from PySide2.QtCore import QStandardPaths
 from syncplay import utils, constants, version, release_number
 from syncplay.messages import getMessage
 import sys

syncplay/vendor/qt5reactor.py

@@ -106,7 +106,7 @@ Subsequent port by therve
 
 import sys
 
-from PySide2.QtCore import (
+from syncplay.vendor.Qt.QtCore import (
      QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer, Signal)
 from twisted.internet import posixbase
 from twisted.internet.interfaces import IReactorFDSet