diff --git a/gui/__main__.py b/gui/__main__.py index bf1c6b0..f5afd8e 100755 --- a/gui/__main__.py +++ b/gui/__main__.py @@ -1,5 +1,5 @@ -from PyQt6.QtWidgets import QComboBox, QButtonGroup, QLineEdit, QMainWindow, QLabel, QWidget, QVBoxLayout, QStackedWidget, QApplication, QPushButton, QTextEdit, QFrame, QHBoxLayout, QVBoxLayout, QScrollArea, QSystemTrayIcon, QMessageBox, QGridLayout, QCheckBox, QStackedLayout, QGroupBox, QDialog -from PyQt6.QtGui import QIcon, QPixmap, QIcon, QPixmap, QTransform, QPainter, QColor, QFont, QFontDatabase, QTextOption +from PyQt6.QtWidgets import QComboBox, QButtonGroup, QLineEdit, QMainWindow, QLabel, QWidget, QStackedWidget, QApplication, QPushButton, QTextEdit, QFrame, QHBoxLayout, QVBoxLayout, QScrollArea, QSystemTrayIcon, QMessageBox, QGridLayout, QCheckBox, QStackedLayout, QGroupBox, QDialog +from PyQt6.QtGui import QIcon, QPixmap, QTransform, QPainter, QColor, QFont, QFontDatabase from PyQt6 import QtGui from PyQt6 import QtCore from PyQt6.QtCore import Qt, QSize, QThread, pyqtSignal, QTimer, QPointF, QRect, QMutex, QMutexLocker, QObject @@ -36,7 +36,6 @@ from core.observers.InvoiceObserver import InvoiceObserver from core.observers.ProfileObserver import ProfileObserver from datetime import datetime, timezone, timedelta from core.Constants import Constants -import atexit import json import shlex @@ -244,6 +243,7 @@ class WorkerThread(QThread): ConfigurationController.set_connection('system') self.check_for_update() locations = LocationController.get_all() + print(locations) browser = ApplicationVersionController.get_all() all_browser_versions = [ f"{browser.application_code}:{browser.version_number}" for browser in browser if browser.supported] @@ -345,7 +345,6 @@ class CustomWindow(QMainWindow): self.open_sans_family = QFontDatabase.applicationFontFamilies(open_sans_id)[ 0] - self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) self.setAttribute(Qt.WidgetAttribute.WA_NoSystemBackground) self.setWindowTitle('HydraVeil') self._data = {"Profile_1": {}} @@ -366,9 +365,6 @@ class CustomWindow(QMainWindow): self.css_path = os.getenv('CSS_PATH', os.path.join( current_dir, 'resources', 'styles')) - self.tray = None - self.init_system_tray(self.btn_path) - self.is_downloading = False self.current_profile_id = None self.connection_manager = ConnectionManager() @@ -485,8 +481,12 @@ class CustomWindow(QMainWindow): self.sync_button.setIconSize(self.sync_button.size()) self.sync_button.clicked.connect(self.sync) + self.show() self.init_ui() + self.tray = None + self.init_system_tray(self.btn_path) + current_connection = self.get_current_connection() self.is_tor_mode = current_connection == 'tor' self.set_toggle_state(self.is_tor_mode) @@ -10286,6 +10286,5 @@ class QRCodeDialog(QDialog): if __name__ == "__main__": app = QApplication(sys.argv) - window = CustomWindow() - window.show() + CustomWindow() sys.exit(app.exec()) diff --git a/gui/resources/images/button_se_ab.png b/gui/resources/images/button_se_ab.png new file mode 100755 index 0000000..62791d0 Binary files /dev/null and b/gui/resources/images/button_se_ab.png differ