QT5 support

bin/rdpy-rdpclient.py

@@ -23,8 +23,8 @@
 
 import sys, os, getopt, socket
 
-from PyQt4 import QtGui, QtCore
-from rdpy.ui.qt4 import RDPClientQt
+from PyQt5 import QtGui, QtCore, QtWidgets
+from rdpy.ui.qt5 import RDPClientQt
 from rdpy.protocol.rdp import rdp
 from rdpy.core.error import RDPSecurityNegoFail
 from rdpy.core import rss
@@ -270,11 +270,11 @@ def help():
         ip, port = args[0], "3389"
 
     #create application
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
-    #add qt4 reactor
-    import qt4reactor
-    qt4reactor.install()
+    #add qt5 reactor
+    import qt5reactor
+    qt5reactor.install()
 
     if fullscreen:
         width = QtGui.QDesktopWidget().screenGeometry().width()
@@ -285,4 +285,4 @@ def help():
     from twisted.internet import reactor
     reactor.connectTCP(ip, int(port), RDPClientQtFactory(width, height, username, password, domain, fullscreen, keyboardLayout, optimized, "nego", recodedPath))
     reactor.runReturn()
-    app.exec_()
+    app.exec_()

bin/rdpy-rdpscreenshot.py

@@ -27,9 +27,9 @@
 import os
 import sys
 
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui, QtWidgets
 from rdpy.protocol.rdp import rdp
-from rdpy.ui.qt4 import RDPBitmapToQtImage
+from rdpy.ui.qt5 import RDPBitmapToQtImage
 import rdpy.core.log as log
 from rdpy.core.error import RDPSecurityNegoFail
 from twisted.internet import task
@@ -170,11 +170,11 @@ def main(width, height, path, timeout, hosts):
     @return: {list(tuple(ip, port, Failure instance)} list of connection state
     """
     #create application
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
-    #add qt4 reactor
-    import qt4reactor
-    qt4reactor.install()
+    #add qt5 reactor
+    import qt5reactor
+    qt5reactor.install()
 
     from twisted.internet import reactor
 

bin/rdpy-rssplayer.py

@@ -23,10 +23,10 @@
 
 import sys, os, getopt, socket
 
-from PyQt4 import QtGui, QtCore
+from PyQt5 import QtGui, QtCore, QtWidgets
 
 from rdpy.core import log, rss
-from rdpy.ui.qt4 import QRemoteDesktop, RDPBitmapToQtImage
+from rdpy.ui.qt5 import QRemoteDesktop, RDPBitmapToQtImage
 from rdpy.core.scancode import scancodeToChar
 log._LOG_LEVEL = log.Level.INFO
 
@@ -46,7 +46,7 @@ def closeEvent(self, e):
                 """ Not Handle """
         QRemoteDesktop.__init__(self, width, height, RssAdaptor())
 
-class RssPlayerWindow(QtGui.QWidget):
+class RssPlayerWindow(QtWidgets.QWidget):
     """
     @summary: main window of rss player
     """
@@ -115,11 +115,11 @@ def loop(widget, rssFile, nextEvent):
 
     filepath = args[0]
     #create application
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
     mainWindow = RssPlayerWindow()
     mainWindow.show()
 
     rssFile = rss.createReader(filepath)
     start(mainWindow, rssFile)
-    sys.exit(app.exec_())
+    sys.exit(app.exec_())

bin/rdpy-vncclient.py

@@ -23,8 +23,8 @@
 """
 
 import sys, os, getopt
-from PyQt4 import QtGui
-from rdpy.ui.qt4 import RFBClientQt
+from PyQt5 import QtGui, QtWidgets
+from rdpy.ui.qt5 import RFBClientQt
 from rdpy.protocol.rfb import rfb
 
 import rdpy.core.log as log
@@ -98,13 +98,13 @@ def clientConnectionFailed(self, connector, reason):
         ip, port = args[0], "5900"
 
     #create application
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
-    #add qt4 reactor
-    import qt4reactor
-    qt4reactor.install()
+    #add qt5 reactor
+    import qt5reactor
+    qt5reactor.install()
 
     from twisted.internet import reactor
     reactor.connectTCP(ip, int(port), RFBClientQtFactory(password))
     reactor.runReturn()
-    app.exec_()
+    app.exec_()

bin/rdpy-vncscreenshot.py

@@ -24,10 +24,10 @@
 """
 
 import sys, os, getopt
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui, QtWidgets
 from rdpy.protocol.rfb import rfb
 import rdpy.core.log as log
-from rdpy.ui.qt4 import qtImageFormatFromRFBPixelFormat
+from rdpy.ui.qt5 import qtImageFormatFromRFBPixelFormat
 from twisted.internet import task
 
 #set log level
@@ -155,11 +155,11 @@ def help():
             password = arg
 
     #create application
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
-    #add qt4 reactor
-    import qt4reactor
-    qt4reactor.install()
+    #add qt5 reactor
+    import qt5reactor
+    qt5reactor.install()
     from twisted.internet import reactor
 
 
@@ -173,4 +173,4 @@ def help():
 
 
     reactor.runReturn()
-    app.exec_()
+    app.exec_()

rdpy/ui/qt4.py → rdpy/ui/qt5.py

@@ -23,7 +23,7 @@
 QRemoteDesktop is a widget use for render in rdpy
 """
 
-from PyQt4 import QtGui, QtCore
+from PyQt5 import QtGui, QtCore, QtWidgets
 from rdpy.protocol.rfb.rfb import RFBClientObserver
 from rdpy.protocol.rdp.rdp import RDPClientObserver
 from rdpy.core.error import CallPureVirtualFuntion
@@ -330,7 +330,7 @@ def onClose(self):
         #do something maybe a message
 
 
-class QRemoteDesktop(QtGui.QWidget):
+class QRemoteDesktop(QtWidgets.QWidget):
     """
     @summary: Qt display widget
     """

rdpy/ui/view.py

@@ -21,7 +21,7 @@
 Fake widget
 """
 from rdpy.core.error import CallPureVirtualFuntion
-from PyQt4 import QtGui, QtCore
+from PyQt5 import QtGui, QtCore
 
 
 class KeyCode(object):

setup.py

@@ -40,7 +40,7 @@
 			'twisted',
           	'pyopenssl',
           	'service_identity',
-          	'qt4reactor',
+          	'qt5reactor',
           	'rsa',
           	'pyasn1',
 	  	],