fix:choose gui

Author: qy-liuhuo

deviceShare.py

@@ -46,13 +46,11 @@ def main():
     role_dialog = RoleSelectionDialog()
     if role_dialog.exec_() == QDialog.Accepted:
         selected_role = role_dialog.selected_role
-    # 销毁 GUI
-    app.exit()
     if selected_role == 'server':
-        Server()
+        Server(app)
     elif selected_role == 'client':
-        Client()
-
+        Client(app)
+    app.exec_()
 
 if __name__ == "__main__":
     main()

src/screen_manager/client_gui.py

@@ -7,8 +7,8 @@
 
 class ClientGUI:
 
-    def __init__(self):
-        self.app = QApplication(sys.argv)
+    def __init__(self,app):
+        self.app = app
         self.window = QMainWindow()
         self.trayIcon = QSystemTrayIcon(self.window)
         self.trayIcon.setIcon(QIcon("./resources/devicelink_client.png"))

src/screen_manager/gui.py

@@ -392,8 +392,8 @@ def set_configure_interface(self, configure_interface):
 
 
 class Gui:
-    def __init__(self, update_flag, request_queue=None, response_queue=None):
-        self.app = QApplication(sys.argv)
+    def __init__(self,app, update_flag, request_queue=None, response_queue=None):
+        self.app = app
         self.mainWin = MainWindow()
         qt_material.apply_stylesheet(self.app, theme='light_blue.xml')
         self.trayIcon = QSystemTrayIcon(self.mainWin)

src/sharer/client.py

@@ -19,7 +19,7 @@
 
 class Client:
 
-    def __init__(self):
+    def __init__(self,app):
         self.init_screen_info()
         self.clipboard_controller = get_clipboard_controller()
         self.device_id = get_device_name()
@@ -37,7 +37,7 @@ def __init__(self):
         self.server_ip = None
         self.zeroconf = Zeroconf()
         threading.Thread(target=self.wait_for_connect, daemon=True).start()
-        self.gui = ClientGUI()
+        self.gui = ClientGUI(app)
         self.gui.run()
         self.send_offline_msg()
 

src/sharer/server.py

@@ -29,7 +29,7 @@
 
 
 class Server:
-    def __init__(self):
+    def __init__(self,app):
         create_table()
         self.init_screen_info()
         self.clipboard_controller = get_clipboard_controller()
@@ -38,7 +38,7 @@ def __init__(self):
         self.response_queue = Queue()
         self.thread_list = []
         self.update_flag = threading.Event()
-        self.manager_gui = Gui(update_flag=self.update_flag, request_queue=self.request_queue,
+        self.manager_gui = Gui(app,update_flag=self.update_flag, request_queue=self.request_queue,
                                response_queue=self.response_queue)
         self.cur_device = None
         self._mouse = MouseController()