Merge remote-tracking branch 'origin/master'

gui/__main__.py

@@ -12,7 +12,7 @@ import sys
 def recovery_dialog(custom_error, db_version_you_have):
     """This ends the app by forcing them to delete the database, move it, or just quit."""
 
-    from v2.ui.popups.Database_version import show_recovery_dialog
+    from gui.v2.ui.popups.Database_version import show_recovery_dialog
     choice = show_recovery_dialog({"message": custom_error, "db_version": db_version_you_have, "status": "version_mismatch"})
     logger.info(f"[DB MANAGEMENT] From the database error options, the user picked {choice}")
 
@@ -101,7 +101,7 @@ if is_compatable:
         logger.error(f"[DB MANAGEMENT] Critical Failure with updating/inserting the new DB version into the database.")
 
     # Load GUI either way:
-    from main_ui import start_ui
+    from gui.main_ui import start_ui
 
     # If the user lacks a database, we want to force them to sync the new data, to avoid NoneType errors when enabling existing profiles,
     if reason == "no_database":

gui/main_ui.py

@@ -73,8 +73,8 @@ class CustomWindow(QMainWindow):
         gui_dir = os.path.dirname(os.path.abspath(__file__))
         font_path = os.path.join(gui_dir, 'resources', 'fonts')
 
-        # Get's SQLAlchemy going,
-        orm.start()
+        # # Get's SQLAlchemy going,
+        # orm.start()
 
         retro_gaming_path = os.path.join(font_path, 'retro-gaming.ttf')
         font_id = QFontDatabase.addApplicationFont(retro_gaming_path)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sp-hydra-veil-gui"
-version = "2.4.5"
+version = "2.4.6"
 authors = [
   { name = "Simplified Privacy" },
 ]