fix: apply all requested changes from PR review
This commit is contained in:
parent
e148679d71
commit
da22beca69
32
windows.py
32
windows.py
|
|
@ -14,22 +14,9 @@ import asyncio as _asyncio
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict, Optional
|
from typing import Dict, Optional
|
||||||
|
|
||||||
try:
|
|
||||||
import pystray
|
import pystray
|
||||||
except Exception:
|
|
||||||
pystray = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
import customtkinter as ctk
|
import customtkinter as ctk
|
||||||
except Exception:
|
|
||||||
ctk = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
from PIL import Image, ImageDraw, ImageFont
|
from PIL import Image, ImageDraw, ImageFont
|
||||||
except Exception:
|
|
||||||
Image = None
|
|
||||||
ImageDraw = None
|
|
||||||
ImageFont = None
|
|
||||||
|
|
||||||
import proxy.tg_ws_proxy as tg_ws_proxy
|
import proxy.tg_ws_proxy as tg_ws_proxy
|
||||||
|
|
||||||
|
|
@ -278,23 +265,11 @@ def restart_proxy():
|
||||||
|
|
||||||
|
|
||||||
def _show_error(text: str, title: str = "TG WS Proxy — Ошибка"):
|
def _show_error(text: str, title: str = "TG WS Proxy — Ошибка"):
|
||||||
if sys.platform == "win32":
|
|
||||||
try:
|
|
||||||
ctypes.windll.user32.MessageBoxW(0, text, title, 0x10)
|
ctypes.windll.user32.MessageBoxW(0, text, title, 0x10)
|
||||||
return
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
print(f"{title}: {text}", file=sys.stderr)
|
|
||||||
|
|
||||||
|
|
||||||
def _show_info(text: str, title: str = "TG WS Proxy"):
|
def _show_info(text: str, title: str = "TG WS Proxy"):
|
||||||
if sys.platform == "win32":
|
|
||||||
try:
|
|
||||||
ctypes.windll.user32.MessageBoxW(0, text, title, 0x40)
|
ctypes.windll.user32.MessageBoxW(0, text, title, 0x40)
|
||||||
return
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
print(f"{title}: {text}", file=sys.stdout)
|
|
||||||
|
|
||||||
|
|
||||||
def _on_open_in_telegram(icon=None, item=None):
|
def _on_open_in_telegram(icon=None, item=None):
|
||||||
|
|
@ -682,13 +657,6 @@ def run_tray():
|
||||||
log.info("Config: %s", _config)
|
log.info("Config: %s", _config)
|
||||||
log.info("Log file: %s", LOG_FILE)
|
log.info("Log file: %s", LOG_FILE)
|
||||||
|
|
||||||
if ctk is None:
|
|
||||||
_show_error(
|
|
||||||
"Для tray-режима требуется tkinter (Tcl/Tk).\n\n"
|
|
||||||
"Windows: переустановите Python с включённым Tcl/Tk.\n"
|
|
||||||
"Linux: установите пакет python3-tk / tk.")
|
|
||||||
return
|
|
||||||
|
|
||||||
if pystray is None or Image is None:
|
if pystray is None or Image is None:
|
||||||
log.error("pystray or Pillow not installed; "
|
log.error("pystray or Pillow not installed; "
|
||||||
"running in console mode")
|
"running in console mode")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue