From e91f6c5e2cee39bb49d3a3ddeddc66fc0268b51e Mon Sep 17 00:00:00 2001 From: Alejandro Sirgo Rica Date: Wed, 11 Dec 2024 16:52:11 +0100 Subject: windows: remove dead systray code Remove dead systray code and unused imports in ogclient for Windows. --- src/windows/ogOperations.py | 56 --------------------------------------------- 1 file changed, 56 deletions(-) (limited to 'src') diff --git a/src/windows/ogOperations.py b/src/windows/ogOperations.py index 9dac096..a6f31d8 100644 --- a/src/windows/ogOperations.py +++ b/src/windows/ogOperations.py @@ -7,79 +7,23 @@ # (at your option) any later version. import os -import locale -import ctypes import psutil import subprocess -import multiprocessing as mp -from multiprocessing import Process, freeze_support from src.log import OgError -from PIL import Image, ImageDraw -from pystray import Icon, Menu, MenuItem - -from src.ogRest import ThreadState - - -def _create_default_image(): - """ - Creates a default image for the tray icon. Use in case - no favicon.ico is found. The image will be a blue circle. - """ - width = height = 250 - circle_color = (45, 158, 251) - - # Create a new image with a transparent background - image = Image.new('RGBA', (width, height), (0, 0, 0, 0)) - dc = ImageDraw.Draw(image) - - # Draw circle - circle_radius = min(width, height) // 2 - 10 - circle_center = (width // 2, height // 2) - dc.ellipse( - (circle_center[0] - circle_radius, circle_center[1] - circle_radius, - circle_center[0] + circle_radius, circle_center[1] + circle_radius), - fill=circle_color - ) - - return image - - -def create_image(): - try: - image = Image.open(r'./favicon.ico') - image = Image.composite(image, Image.new('RGB', image.size, 'white'), image) - except: - image = _create_default_image() - return image - - -def create_systray(): - menu = Menu(MenuItem('Powered by Soleta Networks!', - lambda icon, item: 1)) - icon = Icon('ogClient', create_image(), menu=menu) - assert icon.icon - icon.run() - class OgWindowsOperations: def __init__(self): self.session = False - freeze_support() - mp.set_start_method('spawn') - self.systray_p = Process(target=create_systray, daemon=True) - self.systray_p.start() def _restartBrowser(self, url): raise OgError('Function not implemented') def poweroff(self): - self.systray_p.terminate() os.system('shutdown -s -t 0') def reboot(self): - self.systray_p.terminate() os.system('shutdown -r -t 0') def shellrun(self, request, ogRest): -- cgit v1.2.3-18-g5258