diff --git a/src/onedrive_gui/OneDriveGUI.py b/src/onedrive_gui/OneDriveGUI.py index 64a6303..6a05a59 100644 --- a/src/onedrive_gui/OneDriveGUI.py +++ b/src/onedrive_gui/OneDriveGUI.py @@ -10,10 +10,10 @@ from PySide6.QtGui import QIcon from PySide6.QtWidgets import QApplication -from logger import logger +from .logger import logger -from global_config import DIR_PATH +from .global_config import DIR_PATH app = QApplication(sys.argv) @@ -22,9 +22,9 @@ app.setDesktopFileName("OneDriveGUI") app.setWindowIcon(QIcon(DIR_PATH + "/resources/images/icons8-cloud-80.png")) -from options import gui_settings, global_config, version -from global_config import save_global_config -from main_window import MainWindow +from .options import gui_settings, global_config, version +from .global_config import save_global_config +from .main_window import MainWindow def main_window_start_state(): diff --git a/src/onedrive_gui/gui_settings_window.py b/src/onedrive_gui/gui_settings_window.py index 01ae3c8..8a6e52a 100644 --- a/src/onedrive_gui/gui_settings_window.py +++ b/src/onedrive_gui/gui_settings_window.py @@ -3,19 +3,19 @@ from PySide6.QtWidgets import QWidget, QFileDialog # Imports for GUI settings window -from ui.ui_gui_settings_window import Ui_gui_settings_window +from .ui.ui_gui_settings_window import Ui_gui_settings_window import re import os -from settings.gui_settings import gui_settings +from .settings.gui_settings import gui_settings import logging # from logger import logger -from global_config import DIR_PATH, PROFILES_FILE +from .global_config import DIR_PATH, PROFILES_FILE class GuiSettingsWindow(QWidget, Ui_gui_settings_window): @@ -119,7 +119,7 @@ class GuiSettingsWindow(QWidget, Ui_gui_settings_window): def sync_autostart_on_startup(self): """Sync autostart file with saved setting on app startup.""" - from utils.autostart import enable_autostart, disable_autostart, is_autostart_enabled + from .utils.autostart import enable_autostart, disable_autostart, is_autostart_enabled # Get the saved setting autostart_should_be_enabled = self.get_check_box_state("autostart_enabled") @@ -150,7 +150,7 @@ class GuiSettingsWindow(QWidget, Ui_gui_settings_window): def save_settings(self): """Save all settings and sync autostart file with checkbox state.""" - from utils.autostart import enable_autostart, disable_autostart + from .utils.autostart import enable_autostart, disable_autostart from PySide6.QtWidgets import QMessageBox # Save all settings first diff --git a/src/onedrive_gui/logger.py b/src/onedrive_gui/logger.py index 0165f70..214a294 100644 --- a/src/onedrive_gui/logger.py +++ b/src/onedrive_gui/logger.py @@ -3,7 +3,7 @@ import sys import re import logging import logging.handlers as handlers -from settings.gui_settings import gui_settings +from .settings.gui_settings import gui_settings def config_debug_level(): diff --git a/src/onedrive_gui/main_window.py b/src/onedrive_gui/main_window.py index c0a3161..988e80c 100644 --- a/src/onedrive_gui/main_window.py +++ b/src/onedrive_gui/main_window.py @@ -15,12 +15,12 @@ from PySide6.QtWidgets import ( # Imports for main window. -from ui.ui_mainwindow import Ui_MainWindow -from ui.ui_process_status_page import Ui_status_page +from .ui.ui_mainwindow import Ui_MainWindow +from .ui.ui_process_status_page import Ui_status_page # Import for login windows. -from ui.ui_external_login import Ui_ExternalLoginWindow +from .ui.ui_external_login import Ui_ExternalLoginWindow import re @@ -31,27 +31,27 @@ import requests import subprocess -from wizard import setup_wizard -from profile_settings_window import profile_settings_window +from .wizard import setup_wizard +from .profile_settings_window import profile_settings_window -from options import ( +from .options import ( global_config, client_bin_path, gui_settings, version, ) -from utils.utils import humanize_file_size, shorten_path, format_relative_time -from workers import WorkerThread, MaintenanceWorker, TaskList, workers -from gui_settings_window import gui_settings_window +from .utils.utils import humanize_file_size, shorten_path, format_relative_time +from .workers import WorkerThread, MaintenanceWorker, TaskList, workers +from .gui_settings_window import gui_settings_window import logging # from logger import logger -from global_config import DIR_PATH, PROFILES_FILE +from .global_config import DIR_PATH, PROFILES_FILE try: - from ui.ui_login import Ui_LoginWindow + from .ui.ui_login import Ui_LoginWindow except ImportError: logging.warning("Failed to import ui_login. This is expected if you are running AppImage version.") @@ -66,12 +66,12 @@ class MainWindow(QMainWindow, Ui_MainWindow): def __init__(self): # Expose this instance as main_window.main_window_instance so other modules # (e.g. profile_settings_window) can reach it without a circular import. - import main_window + from . import main_window main_window.main_window_instance = self # Access setup_wizard from wizard module to avoid circular imports - import wizard + from . import wizard wizard.setup_wizard.show_main_window_signal.connect(self.show) wizard.setup_wizard.add_profile_signal.connect(self.add_profile) diff --git a/src/onedrive_gui/options.py b/src/onedrive_gui/options.py index c53ad39..d00b7f8 100644 --- a/src/onedrive_gui/options.py +++ b/src/onedrive_gui/options.py @@ -1,8 +1,8 @@ import copy -from utils.utils import get_installed_client_version, config_client_bin_path -from global_config import create_global_config +from .utils.utils import get_installed_client_version, config_client_bin_path +from .global_config import create_global_config -from settings.gui_settings import gui_settings +from .settings.gui_settings import gui_settings client_bin_path = gui_settings.get("frameless_window") diff --git a/src/onedrive_gui/profile_settings_window.py b/src/onedrive_gui/profile_settings_window.py index 5a0594a..cecfa72 100644 --- a/src/onedrive_gui/profile_settings_window.py +++ b/src/onedrive_gui/profile_settings_window.py @@ -12,8 +12,8 @@ from PySide6.QtWidgets import ( ) # Imports for Profiles windows. -from ui.ui_profile_settings_window import Ui_profile_settings_window -from ui.ui_profile_settings_page import Ui_profile_settings +from .ui.ui_profile_settings_window import Ui_profile_settings_window +from .ui.ui_profile_settings_page import Ui_profile_settings import re import os @@ -22,20 +22,20 @@ import subprocess from configparser import ConfigParser # Import setup_wizard after importing wizard, keeping it at the bottom to avoid circular imports -import wizard -from global_config import save_global_config +from . import wizard +from .global_config import save_global_config # Import main_window (lazy import to avoid circular references) -import main_window -from options import client_bin_path, global_config -from options import temp_global_config +from . import main_window +from .options import client_bin_path, global_config +from .options import temp_global_config -from workers import workers +from .workers import workers import logging # from logger import logger -from global_config import DIR_PATH, PROFILES_FILE +from .global_config import DIR_PATH, PROFILES_FILE class ProfileSettingsWindow(QWidget, Ui_profile_settings_window): diff --git a/src/onedrive_gui/utils/utils.py b/src/onedrive_gui/utils/utils.py index 1c0d091..a27e4ba 100644 --- a/src/onedrive_gui/utils/utils.py +++ b/src/onedrive_gui/utils/utils.py @@ -6,7 +6,7 @@ from datetime import datetime import logging # from logger import logger -from settings.gui_settings import gui_settings +from ..settings.gui_settings import gui_settings def humanize_file_size(num, suffix="B"): diff --git a/src/onedrive_gui/wizard.py b/src/onedrive_gui/wizard.py index 745a7f3..f0d985c 100644 --- a/src/onedrive_gui/wizard.py +++ b/src/onedrive_gui/wizard.py @@ -22,8 +22,8 @@ import requests import subprocess from configparser import ConfigParser -from global_config import save_global_config, read_config -from options import ( +from .global_config import save_global_config, read_config +from .options import ( global_config, temp_global_config, client_bin_path, @@ -31,9 +31,9 @@ from options import ( version, ) -from workers import MaintenanceWorker +from .workers import MaintenanceWorker import logging -from global_config import DIR_PATH, PROFILES_FILE +from .global_config import DIR_PATH, PROFILES_FILE class SetupWizard(QWizard): diff --git a/src/onedrive_gui/workers.py b/src/onedrive_gui/workers.py index 88b7ddf..d8675c8 100644 --- a/src/onedrive_gui/workers.py +++ b/src/onedrive_gui/workers.py @@ -5,7 +5,7 @@ from PySide6.QtGui import QFontMetrics, QIcon # Imports for main window. -from ui.ui_list_item_widget import Ui_list_item_widget +from .ui.ui_list_item_widget import Ui_list_item_widget import re @@ -13,8 +13,8 @@ import time import subprocess from datetime import datetime -from global_config import save_global_config -from options import ( +from .global_config import save_global_config +from .options import ( # main_window, global_config, temp_global_config, @@ -24,13 +24,13 @@ from options import ( version, ) -from utils.utils import humanize_file_size, shorten_path +from .utils.utils import humanize_file_size, shorten_path import logging # from logger import logger -from global_config import DIR_PATH, PROFILES_FILE +from .global_config import DIR_PATH, PROFILES_FILE class WorkerThread(QThread):