From 79d3062f8166f17a0b8566184c4c3a8b0c9073c6 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Wed, 2 Feb 2022 16:01:05 +0100 Subject: Revert "#1065 linux: add systray icon" This reverts commit 69d214f63b2aa8ef60489d56468393b70795124a. --- src/linux/ogOperations.py | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/src/linux/ogOperations.py b/src/linux/ogOperations.py index f47b7a8..b71c4f4 100644 --- a/src/linux/ogOperations.py +++ b/src/linux/ogOperations.py @@ -9,71 +9,18 @@ import os import subprocess from subprocess import CalledProcessError -import multiprocessing as mp -from multiprocessing import Process - -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. - """ - width = height = 250 - color1 = (255, 255, 255) - color2 = (255, 0, 255) - - image = Image.new('RGB', (width, height), color1) - dc = ImageDraw.Draw(image) - dc.rectangle( - (width // 2, 0, width, height // 2), - fill=color2) - dc.rectangle( - (0, height // 2, width // 2, height), - fill=color2) - - 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() - - -systray_p = Process(target=create_systray) - - class OgLinuxOperations: - def __init__(self): - mp.set_start_method('spawn') - systray_p.start() - def _restartBrowser(self, url): raise NotImplementedError def poweroff(self): - systray_p.terminate() os.system('systemctl poweroff') def reboot(self): - systray_p.terminate() os.system('systemctl reboot') def shellrun(self, request, ogRest): -- cgit v1.2.3-18-g5258