From be6f898e630f7653a2d0edbd71bb6093ea37c039 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 24 Nov 2022 00:47:32 +0800 Subject: [PATCH] final re-org of top level menu before casting into CI --- services/status/src/mainmenu.rs | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/services/status/src/mainmenu.rs b/services/status/src/mainmenu.rs index 3d13e7e72..78c4eeae3 100644 --- a/services/status/src/mainmenu.rs +++ b/services/status/src/mainmenu.rs @@ -48,6 +48,14 @@ pub fn create_main_menu(keys: Arc>, menu_management_sid: xous::S close_on_select: true, }); + menuitems.push(MenuItem { + name: String::from_str(t!("mainmenu.preferences", xous::LANG)), + action_conn: Some(status_conn), + action_opcode: StatusOpcode::Preferences.to_u32().unwrap(), + action_payload: MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true, + }); + let key_init = keys.lock().unwrap().is_initialized().unwrap(); if !key_init { menuitems.push(MenuItem { @@ -91,22 +99,6 @@ pub fn create_main_menu(keys: Arc>, menu_management_sid: xous::S action_payload: MenuPayload::Scalar([0, 0, 0, 0]), close_on_select: true, }); - - menuitems.push(MenuItem { - name: String::from_str(t!("mainmenu.preferences", xous::LANG)), - action_conn: Some(status_conn), - action_opcode: StatusOpcode::Preferences.to_u32().unwrap(), - action_payload: MenuPayload::Scalar([0, 0, 0, 0]), - close_on_select: true, - }); - - menuitems.push(MenuItem { - name: String::from_str(t!("mainmenu.lockdevice", xous::LANG)), - action_conn: Some(status_conn), - action_opcode: StatusOpcode::Reboot.to_u32().unwrap(), - action_payload: MenuPayload::Scalar([0, 0, 0, 0]), - close_on_select: true, - }); if key_init { menuitems.push(MenuItem { @@ -117,6 +109,15 @@ pub fn create_main_menu(keys: Arc>, menu_management_sid: xous::S close_on_select: true, }); } + + menuitems.push(MenuItem { + name: String::from_str(t!("mainmenu.lockdevice", xous::LANG)), + action_conn: Some(status_conn), + action_opcode: StatusOpcode::Reboot.to_u32().unwrap(), + action_payload: MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true, + }); + menuitems.push(MenuItem { name: String::from_str(t!("mainmenu.battery_disconnect", xous::LANG)), action_conn: Some(status_conn),