diff --git a/python_payload/apps/audio_passthrough/flow3r.toml b/python_payload/apps/audio_passthrough/flow3r.toml index 9ec2f0a28b7370bc3027df69a0240190b8c8339f..2b57ba917194aa19ab2016c1f4fb8b17f7f856d3 100644 --- a/python_payload/apps/audio_passthrough/flow3r.toml +++ b/python_payload/apps/audio_passthrough/flow3r.toml @@ -1,6 +1,6 @@ [app] name = "Audio Passthrough" -menu = "Apps" +menu = "Media" [entry] class = "AudioPassthrough" diff --git a/python_payload/apps/wurzelitzer/flow3r.toml b/python_payload/apps/wurzelitzer/flow3r.toml index 614fbbfae47f04ee09c94fd00a9dcc610b82588f..0751bd28c66e36b5f89c3aaa701fe61b4a08475d 100644 --- a/python_payload/apps/wurzelitzer/flow3r.toml +++ b/python_payload/apps/wurzelitzer/flow3r.toml @@ -1,6 +1,6 @@ [app] name = "Wurzelitzer" -menu = "Music" +menu = "Media" wifi_preference = true [metadata] diff --git a/python_payload/st3m/application.py b/python_payload/st3m/application.py index 9dfd13264fcd0affff09d545de969dfda10f2902..2c9ce60ced75b4855d7fc1e92c3dca9b0280dc82 100644 --- a/python_payload/st3m/application.py +++ b/python_payload/st3m/application.py @@ -97,8 +97,8 @@ class BundleMetadata: [app] # Required, displayed in the menu. name = "Name of the application" - # One of "Apps", "Badge", "Music". Picks which menu the bundle's class - # will be loadable from. + # One of "Apps", "Badge", "Music", "Games", "Media". Picks which menu + # the bundle's class will be loadable from. menu = "Apps" [entry] @@ -147,8 +147,10 @@ class BundleMetadata: if "menu" not in app or type(app["menu"]) != str: raise BundleMetadataBroken("missing app.menu key") self.menu = app["menu"] - if self.menu not in ["Apps", "Music", "Badge", "Hidden"]: - raise BundleMetadataBroken("app.menu must be either Apps, Music or Badge") + if self.menu not in ["Apps", "Music", "Badge", "Games", "Media", "Hidden"]: + raise BundleMetadataBroken( + "app.menu must be either Apps, Music, Badge, Games or Media" + ) version = 0 if t.get("metadata") is not None: @@ -218,7 +220,7 @@ class BundleMetadata: """ Returns MenuItemAppLauch entries for this bundle for a given menu kind. - Kind is one of 'Apps', 'Badge', 'Music'. + Kind is one of 'Apps', 'Badge', 'Music', 'Games', 'Media'. """ if self.menu != kind: return [] diff --git a/python_payload/st3m/run.py b/python_payload/st3m/run.py index 280168ad1931b1878157a7ff04b7817fc0265b9e..c1ecc6cdd25eda9d730a5e9f7fb217c6c1d8c500 100644 --- a/python_payload/st3m/run.py +++ b/python_payload/st3m/run.py @@ -247,6 +247,8 @@ def run_main() -> None: [ MenuItemForeground("Badge", _make_bundle_menu(bundles, "Badge")), MenuItemForeground("Music", _make_bundle_menu(bundles, "Music")), + MenuItemForeground("Media", _make_bundle_menu(bundles, "Media")), + MenuItemForeground("Games", _make_bundle_menu(bundles, "Games")), MenuItemForeground("Apps", _make_bundle_menu(bundles, "Apps")), MenuItemForeground("System", menu_system), ],