fix: resolve Pyright type errors
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
This commit is contained in:
@ -29,12 +29,10 @@ def main():
|
|||||||
else:
|
else:
|
||||||
logger.error(f"Qt translations for {system_locale.name()} not found in {translations_path}")
|
logger.error(f"Qt translations for {system_locale.name()} not found in {translations_path}")
|
||||||
|
|
||||||
# Парсинг аргументов командной строки
|
|
||||||
args = parse_args()
|
args = parse_args()
|
||||||
|
|
||||||
window = MainWindow()
|
window = MainWindow()
|
||||||
|
|
||||||
# Обработка флага --fullscreen
|
|
||||||
if args.fullscreen:
|
if args.fullscreen:
|
||||||
logger.info("Launching in fullscreen mode due to --fullscreen flag")
|
logger.info("Launching in fullscreen mode due to --fullscreen flag")
|
||||||
save_fullscreen_config(True)
|
save_fullscreen_config(True)
|
||||||
@ -53,18 +51,19 @@ def main():
|
|||||||
tray = None
|
tray = None
|
||||||
current_theme = read_theme_from_config()
|
current_theme = read_theme_from_config()
|
||||||
tray = SystemTray(app, current_theme)
|
tray = SystemTray(app, current_theme)
|
||||||
tray.show_action.triggered.connect(window.show)
|
# Ensure window is not None before connecting signals
|
||||||
tray.hide_action.triggered.connect(window.hide)
|
if window:
|
||||||
|
tray.show_action.triggered.connect(window.show)
|
||||||
|
tray.hide_action.triggered.connect(window.hide)
|
||||||
|
|
||||||
def cleanup_on_exit():
|
def cleanup_on_exit():
|
||||||
nonlocal tray, window
|
nonlocal tray, window
|
||||||
app.aboutToQuit.disconnect() # Disconnect to prevent further calls
|
app.aboutToQuit.disconnect()
|
||||||
if tray:
|
if tray:
|
||||||
tray.cleanup()
|
tray.cleanup()
|
||||||
tray = None
|
tray = None
|
||||||
if window:
|
if window:
|
||||||
window.close()
|
window.close()
|
||||||
window = None
|
|
||||||
app.quit()
|
app.quit()
|
||||||
|
|
||||||
window.settings_saved.connect(recreate_tray)
|
window.settings_saved.connect(recreate_tray)
|
||||||
|
@ -35,14 +35,15 @@ class SystemTray:
|
|||||||
"""Скрыть иконку трея"""
|
"""Скрыть иконку трея"""
|
||||||
if self.tray:
|
if self.tray:
|
||||||
self.tray.setVisible(False)
|
self.tray.setVisible(False)
|
||||||
self.tray.setContextMenu(None)
|
if self.menu:
|
||||||
|
self.menu.deleteLater()
|
||||||
|
self.menu = None
|
||||||
|
|
||||||
def cleanup(self):
|
def cleanup(self):
|
||||||
"""Очистка ресурсов трея"""
|
"""Очистка ресурсов трея"""
|
||||||
self.hide_tray()
|
if self.tray:
|
||||||
|
self.tray.setVisible(False)
|
||||||
|
self.tray = None
|
||||||
if self.menu:
|
if self.menu:
|
||||||
self.menu.deleteLater()
|
self.menu.deleteLater()
|
||||||
self.menu = None
|
self.menu = None
|
||||||
if self.tray:
|
|
||||||
self.tray.deleteLater()
|
|
||||||
self.tray = None
|
|
||||||
|
Reference in New Issue
Block a user