diff --git a/gui/v2/__main__.py b/gui/__main__.py similarity index 98% rename from gui/v2/__main__.py rename to gui/__main__.py index e7aaff3..9f58b5e 100755 --- a/gui/v2/__main__.py +++ b/gui/__main__.py @@ -1,6 +1,11 @@ -import logging import os import sys + +_WORKSPACE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +if _WORKSPACE_ROOT not in sys.path: + sys.path.insert(0, _WORKSPACE_ROOT) + +import logging import traceback from PyQt6.QtWidgets import ( @@ -63,9 +68,8 @@ class CustomWindow(QMainWindow): sys.excepthook = self._handle_exception self.setWindowFlags(Qt.WindowType.Window) - current_dir = os.path.dirname(os.path.abspath(__file__)) - parent_dir = os.path.dirname(current_dir) - font_path = os.path.join(parent_dir, 'resources', 'fonts') + gui_dir = os.path.dirname(os.path.abspath(__file__)) + font_path = os.path.join(gui_dir, 'resources', 'fonts') retro_gaming_path = os.path.join(font_path, 'retro-gaming.ttf') font_id = QFontDatabase.addApplicationFont(retro_gaming_path) @@ -101,9 +105,9 @@ class CustomWindow(QMainWindow): self.gui_cache_home, self.gui_config_home, self.gui_config_file) self.btn_path = os.getenv('BTN_PATH', os.path.join( - parent_dir, 'resources', 'images')) + gui_dir, 'resources', 'images')) self.css_path = os.getenv('CSS_PATH', os.path.join( - parent_dir, 'resources', 'styles')) + gui_dir, 'resources', 'styles')) self.is_downloading = False self.current_profile_id = None diff --git a/gui/___main__.py b/gui/main_v1.py old mode 100755 new mode 100644 similarity index 100% rename from gui/___main__.py rename to gui/main_v1.py diff --git a/gui/v2/ui/pages/payment_details_page.py b/gui/v2/ui/pages/payment_details_page.py index 18cdf24..7ace9a3 100755 --- a/gui/v2/ui/pages/payment_details_page.py +++ b/gui/v2/ui/pages/payment_details_page.py @@ -405,7 +405,7 @@ class PaymentDetailsPage(Page): self.update_status.update_status('Awaiting ticket payment...') def _on_ticket_check_failed(self, msg): - self.update_status.update_status(f'Payment check failed: {msg}') + self.update_status.update_status('Not Paid') def show_qr_code(self): full_amount = self.text_fields[2].text()