From 47303cdec8d5b8b8a35f375692d62078294eb650 Mon Sep 17 00:00:00 2001 From: Rudis Muiznieks Date: Sat, 23 Apr 2022 15:44:15 -0500 Subject: [PATCH] changed exec cmd to exit cmd --- main.py | 14 +++++++------- menu.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main.py b/main.py index 5cac2bc..4ba8be8 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,6 @@ import os import signal +from icecream import ic from time import sleep from menu import Menu, MenuItem, MenuType from cinput import ControlInput @@ -7,20 +8,20 @@ from graphics import Graphics menu_config = [ MenuItem("Information", - MenuType.EXEC_PLUGIN, + MenuType.PLUGIN, {"plugin": "info"}), MenuItem("Apps", MenuType.SUB_MENU, {"sub_menu": [ MenuItem("Chess", - MenuType.EXEC_PLUGIN, + MenuType.PLUGIN, {"plugin": "chess"}), ]}), MenuItem("Reboot", - MenuType.EXEC_CMD, + MenuType.EXIT_CMD, {"command": "sudo reboot"}), MenuItem("Shutdown", - MenuType.EXEC_CMD, + MenuType.EXIT_CMD, {"command": "sudo shutdown now"})] cinput = ControlInput() @@ -38,10 +39,9 @@ signal.signal(signal.SIGTERM, program_exit) try: while True: item = menu.get_selection() - if item.menu_type == MenuType.EXEC_CMD: - graphics.clear() - graphics.show() + if item.menu_type == MenuType.EXIT_CMD: os.system(item.data["command"]) + program_exit() except Exception as e: ic(e) program_exit() diff --git a/menu.py b/menu.py index c9d14ae..5f1e745 100644 --- a/menu.py +++ b/menu.py @@ -5,8 +5,8 @@ from graphics import Graphics class MenuType(Enum): SUB_MENU = auto() - EXEC_CMD = auto() - EXEC_PLUGIN = auto() + EXIT_CMD = auto() + PLUGIN = auto() @dataclass class MenuItem: