Merge pull request #39 from digitalf0x/ft-0.8.0-stable

[Feat] Prepare v0.8.0 stable release

Author: digitalf0x

BridgeApp/app_gui.py

@@ -4,7 +4,10 @@
 from app_config import AppConfig, PatternConfig
 from app_pattern import VibrationPattern
 
-WINDOW_NAME = "Haptic Pancake Bridge v0.8.0-beta.4"
+import platform_conf
+
+WINDOW_NAME = "Haptic Pancake Bridge v0.8.0"
+WINDOW_NAME_UNBUNDLED = WINDOW_NAME + " (unbundled)"
 WINDOW_ICON = b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9TpVIrDhYVcchQnezgB+JYqlgEC6Wt0KqDyaVf0KQhSXFxFFwLDn4sVh1cnHV1cBUEwQ8QZwcnRRcp8X9NoUWMB8f9eHfvcfcOEOplpppdEUDVLCMZi4qZ7Kroe0UvBjEEPyYlZurx1GIaruPrHh6+3oV5lvu5P0efkjMZ4BGJI0w3LOIN4tlNS+e8TxxkRUkhPieeMOiCxI9clx1+41xossAzg0Y6OU8cJBYLHSx3MCsaKvEMcUhRNcoXMg4rnLc4q+Uqa92TvzCQ01ZSXKc5ihiWEEcCImRUUUIZFsK0aqSYSNJ+1MU/0vQnyCWTqwRGjgVUoEJq+sH/4He3Zn56ykkKRIHuF9v+GAN8u0CjZtvfx7bdOAG8z8CV1vZX6sDcJ+m1thY6Avq3gYvrtibvAZc7wPCTLhlSU/LSFPJ54P2MvikLDNwC/jWnt9Y+Th+ANHW1fAMcHALjBcped3l3T2dv/55p9fcD3S9y0apk9h0AAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfoCxYXCzDoJVaPAAACuElEQVQ4y2WTTW8bdRDGfzO767f1xnGcJiSNVNoKqMoJgRBCwifuIHFFuSDRTwDi2CNfgC/gGxfElV6ockEISAJBiAJ5KVnqxk7idbx+ie39DwcngaqH0Wj0HJ756ZmRjz7940Ym0nCe1DMVnArZRbn/d+85bcMJ6744GqrUzYFimIAamMF5P8GCAC1GqAMDlFk3qItKQ9WsrmaoGd32LjYeMeg0edj4mOP9Hzj4/ku2v77PJO3MtPZj1GYmYlb31c1ch2ct5uZW6XZikpN9Rr02v377BenRNsuvvkfa2sUP5wlKFbJhDy1FmAm+GpiD6XkfRFGDfD7infc/p9XcobTwGbmoRpq2sKBI8VqNXjemUCijAr6YXa2kCL74RHOrEORYufkW5vk4haJlOAQFyDLUAAeqzhBn5IOQwMsxGfUo5MqMBwm++IjLmPQTovk1PFFGyVPCygpqhphdIBiUS4t0zg5ZWrqL84RcWL2KraTgVPEWb5KmLQIvT+bsWYThIKF1+BO9XpPDg+9YufU2raPfqCy/zOnJHvlyFcmVyMhYq65h/yGAOGA64cmjBxzHW/Tbf5Ec/c5Z6xFh+RphtESvfUAn3mFh+Q5yEbuYoZc3oAbVxZc4T2KiuRcYnP7N3dc/JCzVZjpGLiiyv/kVl6bqDPnk3o51ksc0n25SrFwn85TxdIRXiBi7Mc5Tpm5CYX6F5uGP5Mo1BoMON974AK8YzRCycUpn9yHd5i9M0xO6/2xzGm9ynsSEpRrZ8Ixee4+9b+5TrqzSP96buV8ieA5eefMeMh7Re/IzleqLyGSEOkcn3iKJt+i3/qR2612GpzGlcBFPfdSBL8bG/MLtulMhfO06mQoWBLMIRXCesnZn+sxnLtkUTzww2/AxWw+8fMOJ1NUv4Lzn39lXIVOu5kAFJ7rhnK3/C07bcJ2GHOyzAAAAAElFTkSuQmCC'
 
 # If changing order, also change update_oscquery_state()
@@ -410,13 +413,10 @@ def update_autostart_active(self, autolaunch_enabled):
             except Exception as e:
                 print("[GUI] Failed to update autostart checkbox.")
 
-    def update_autostart_status(self, vr_ready, is_bundled):
+    def update_autostart_status(self, vr_ready):
         if not vr_ready:
             unavailable = True
             message = "SteamVR closed (open to apply changes)"
-        elif not is_bundled:
-            unavailable = False
-            message = "SteamVR running (app unbundled)"
         else:
             unavailable = False
             message = "SteamVR running"
@@ -477,7 +477,11 @@ def refresh(self):
 
 
     def create_window(self):
-        self.window = sg.Window(WINDOW_NAME, self.layout, keep_on_top=False, finalize=True, alpha_channel=1, icon=WINDOW_ICON)
+        final_window_title = WINDOW_NAME
+        if not platform_conf.GET_IS_APP_BUNDLED():
+            final_window_title = WINDOW_NAME_UNBUNDLED
+
+        self.window = sg.Window(final_window_title, self.layout, keep_on_top=False, finalize=True, alpha_channel=1, icon=WINDOW_ICON)
 
         self.window.set_resizable(False, True)
 

BridgeApp/main.py

@@ -110,7 +110,7 @@ def refresh_autostart_status(quiet_refresh=False):
             gui.update_autostart_active(config.start_with_steamvr)
 
     # Always update VR runtime status
-    gui.update_autostart_status(vr.is_alive, vr.is_app_bundled)
+    gui.update_autostart_status(vr.is_alive)
 
 
 def add_external_target(external_type):

BridgeApp/platform_conf.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from platformdirs import PlatformDirs
 
+import sys
+
 # Load platform-specific directories
 
 # --- User data ----
@@ -10,3 +12,7 @@
 # Ensure all paths exist
 # See https://stackoverflow.com/questions/273192/how-do-i-create-a-directory-and-any-missing-parent-directories
 Path(PATH_USER_DATA).mkdir(parents=True, exist_ok=True)
+
+def GET_IS_APP_BUNDLED():
+	"""Gets if the app can be easily launched, e.g. as a PyInstaller bundle"""
+	return getattr(sys, 'frozen', False)

BridgeApp/vr_manifest.py

@@ -34,11 +34,6 @@ def app_key(self):
         """Gets unique app ID for VR manifest"""
         return self.vrmanifest_app_key
 
-    @property
-    def is_app_bundled(self):
-        """Gets if the app can be easily launched, e.g. as a PyInstaller bundle"""
-        return getattr(sys, 'frozen', False)
-
     @property
     def is_recent(self):
         """Gets if VR manifest file has been saved this launch"""
@@ -67,7 +62,7 @@ def prepare(self):
             binary_path_type = "binary_path_windows"
 
         launch_path = self.app_path
-        if not self.is_app_bundled:
+        if not platform_conf.GET_IS_APP_BUNDLED():
             launch_path = self.devlauncher_path
 
         self.vrmanifest_data = {
@@ -92,7 +87,7 @@ def print_json(self):
 
     def save_devlauncher(self):
         """Saves a dev-mode/unbundled launch script based on path"""
-        if self.is_app_bundled:
+        if platform_conf.GET_IS_APP_BUNDLED():
             print(f"[VRManifest] Not saving dev-mode launch script, app is bundled")
             return
 
@@ -149,7 +144,7 @@ def save(self):
             json.dump(self.vrmanifest_data, mvr_file, ensure_ascii=False, sort_keys=True, indent=4)
 
         # Save dev launcher if needed
-        if not self.is_app_bundled:
+        if not platform_conf.GET_IS_APP_BUNDLED():
             self.save_devlauncher()
 
         self.vrmanifest_recent = True