[Mod] support use PySide2 as UI backend

forwardxxx · Feb 6, 2022 · 74a62a4 · 74a62a4
1 parent 94d5440
commit 74a62a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/examples/vn_trader/run.py b/examples/vn_trader/run.py
@@ -4,7 +4,7 @@
 from vnpy.trader.engine import MainEngine
 from vnpy.trader.ui import MainWindow, create_qapp
 
-from vnpy_ctp import CtpGateway
+# from vnpy_ctp import CtpGateway
 # from vnpy_ctptest import CtptestGateway
 # from vnpy_mini import MiniGateway
 # from vnpy_femas import FemasGateway
@@ -50,7 +50,7 @@ def main():
 
     main_engine = MainEngine(event_engine)
 
-    main_engine.add_gateway(CtpGateway)
+    # main_engine.add_gateway(CtpGateway)
     # main_engine.add_gateway(CtptestGateway)
     # main_engine.add_gateway(MiniGateway)
     # main_engine.add_gateway(FemasGateway)
@@ -92,7 +92,7 @@ def main():
     main_window = MainWindow(main_engine, event_engine)
     main_window.showMaximized()
 
-    qapp.exec()
+    qapp.exec_()
 
 
 if __name__ == "__main__":

diff --git a/vnpy/__init__.py b/vnpy/__init__.py
@@ -1 +1 @@
-__version__ = "2.9.0"
+__version__ = "3.0.0"
diff --git a/vnpy/trader/ui/__init__.py b/vnpy/trader/ui/__init__.py
@@ -6,7 +6,11 @@
 import types
 
 import qdarkstyle
-from PyQt5 import QtGui, QtWidgets, QtCore
+try:
+    from PyQt5 import QtGui, QtWidgets, QtCore
+except ImportError:
+    from PySide2 import QtGui, QtWidgets, QtCore
+    QtCore.pyqtSignal = QtCore.Signal
 
 from .mainwindow import MainWindow
 from ..setting import SETTINGS