From bfd313bd9a62dfe4f0b3c6e5352a94654c583afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
Date: Tue, 26 Sep 2023 15:48:55 +0200
Subject: [PATCH] py,ux: rearrange System menu
Move About to top and make graphics mode part of settings.
---
python_payload/st3m/run.py | 3 +--
python_payload/st3m/settings_menu.py | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/python_payload/st3m/run.py b/python_payload/st3m/run.py
index 65bff7221e..9461fb10cd 100644
--- a/python_payload/st3m/run.py
+++ b/python_payload/st3m/run.py
@@ -211,13 +211,12 @@ def run_main() -> None:
menu_system = ApplicationMenu(
[
MenuItemBack(),
+ MenuItemLaunchPersistentView("About", About),
MenuItemForeground("Settings", menu_settings),
- MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/graphics_mode")),
MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/gr33nhouse")),
MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/updat3r")),
MenuItemAction("Disk Mode (Flash)", machine.disk_mode_flash),
MenuItemAction("Disk Mode (SD)", machine.disk_mode_sd),
- MenuItemLaunchPersistentView("About", About),
MenuItemAction("Yeet Local Changes", _yeet_local_changes),
MenuItemAction("Reboot", machine.reset),
],
diff --git a/python_payload/st3m/settings_menu.py b/python_payload/st3m/settings_menu.py
index 6a0eeb432f..6f802daaf1 100644
--- a/python_payload/st3m/settings_menu.py
+++ b/python_payload/st3m/settings_menu.py
@@ -216,6 +216,7 @@ settings_menu_structure: "MenuStructure" = [
MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/w1f1")),
MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/audio_config")),
MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/appearance")),
+ MenuItemAppLaunch(BundleMetadata("/flash/sys/apps/graphics_mode")),
onoff_wifi,
onoff_wifi_preference,
onoff_show_tray,
--
GitLab