forked from Support/sp-hydra-veil-gui
Compare commits
No commits in common. "8d08d71a48807f2b97e89269f57c25dfe8d784c0" and "95f753f1fb17dc1df053a8bfa6f580509e2437ef" have entirely different histories.
8d08d71a48
...
95f753f1fb
4 changed files with 5 additions and 5 deletions
|
|
@ -12,7 +12,7 @@ import sys
|
||||||
def recovery_dialog(custom_error, db_version_you_have):
|
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."""
|
"""This ends the app by forcing them to delete the database, move it, or just quit."""
|
||||||
|
|
||||||
from gui.v2.ui.popups.Database_version import show_recovery_dialog
|
from 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"})
|
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}")
|
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.")
|
logger.error(f"[DB MANAGEMENT] Critical Failure with updating/inserting the new DB version into the database.")
|
||||||
|
|
||||||
# Load GUI either way:
|
# Load GUI either way:
|
||||||
from gui.main_ui import start_ui
|
from 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 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":
|
if reason == "no_database":
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -73,8 +73,8 @@ class CustomWindow(QMainWindow):
|
||||||
gui_dir = os.path.dirname(os.path.abspath(__file__))
|
gui_dir = os.path.dirname(os.path.abspath(__file__))
|
||||||
font_path = os.path.join(gui_dir, 'resources', 'fonts')
|
font_path = os.path.join(gui_dir, 'resources', 'fonts')
|
||||||
|
|
||||||
# # Get's SQLAlchemy going,
|
# Get's SQLAlchemy going,
|
||||||
# orm.start()
|
orm.start()
|
||||||
|
|
||||||
retro_gaming_path = os.path.join(font_path, 'retro-gaming.ttf')
|
retro_gaming_path = os.path.join(font_path, 'retro-gaming.ttf')
|
||||||
font_id = QFontDatabase.addApplicationFont(retro_gaming_path)
|
font_id = QFontDatabase.addApplicationFont(retro_gaming_path)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[project]
|
[project]
|
||||||
name = "sp-hydra-veil-gui"
|
name = "sp-hydra-veil-gui"
|
||||||
version = "2.4.6"
|
version = "2.4.5"
|
||||||
authors = [
|
authors = [
|
||||||
{ name = "Simplified Privacy" },
|
{ name = "Simplified Privacy" },
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue