Start with splashscreen method updated

jczic · Apr 4, 2023 · d5a07ed · d5a07ed
1 parent 9c081d6
commit d5a07ed
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/app.py b/src/app.py
@@ -59,14 +59,15 @@ def __init__(self) :
                                                  resizable  = False,
                                                  frameless  = True,
                                                  on_top     = True )
+        self._splashScr.events.closed += self._onSplashScrClosed
 
         self._mainWin = webview.create_window( '%s   v%s' % (conf.APPLICATION_TITLE, conf.APPLICATION_STR_VERSION),
                                                url        = self._localURL(conf.HTML_APP_MAIN_FILENAME),
                                                width      = 1030,
                                                height     = 710,
                                                resizable  = True,
                                                min_size   = (700, 550),
-                                               hidden     = True )
+                                               hidden     = not conf.IS_LINUX )
         self._mainWin.events.closing += self._onMainWinClosing
         self._mainWin.events.closed  += self._onMainWinClosed
 
@@ -100,6 +101,12 @@ def _fahrenheit2Celsius(f) :
 
     # ------------------------------------------------------------------------
 
+    def _onSplashScrClosed(self) :
+        self._splashScr = None
+        self._mainWin.show()
+
+    # ------------------------------------------------------------------------
+
     def _onMainWinClosing(self) :
         if self._canCloseSoftware :
             return True
@@ -282,17 +289,14 @@ def _wsProcessMessage(self, o) :
     # ------------------------------------------------------------------------
 
     def _wsAcceptCallback(self, webSocket, httpClient) :
-        if self._ws :
-            webSocket.Close()
-            return
-        self._ws                   = webSocket
-        webSocket.RecvTextCallback = self._wsRecvTextCallback
-        webSocket.ClosedCallback   = self._wsClosedCallback
-        self._sendAppInfo()
-        if self._splashScr :
+        if not self._ws and self._splashScr :
+            self._ws                   = webSocket
+            webSocket.RecvTextCallback = self._wsRecvTextCallback
+            webSocket.ClosedCallback   = self._wsClosedCallback
+            self._sendAppInfo()
             self._splashScr.destroy()
-            self._splashScr = None
-            self._mainWin.show()
+        else :
+            webSocket.Close()
 
     # ------------------------------------------------------------------------