mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
touch up some UI interactions
This commit is contained in:
parent
d561e07beb
commit
ec8a16f3d7
2 changed files with 38 additions and 30 deletions
|
|
@ -139,10 +139,10 @@
|
||||||
"en-tts": "Sleep now"
|
"en-tts": "Sleep now"
|
||||||
},
|
},
|
||||||
"mainmenu.wifimenu": {
|
"mainmenu.wifimenu": {
|
||||||
"en": "WiFi menu",
|
"en": "WiFi submenu...",
|
||||||
"en-tts": "WiFi menu",
|
"en-tts": "WiFi submenu...",
|
||||||
"ja": "WiFiメニュー",
|
"ja": "WiFiメニュー...",
|
||||||
"zh": "无线网络菜单"
|
"zh": "无线网络菜单..."
|
||||||
},
|
},
|
||||||
"mainmenu.backlighton": {
|
"mainmenu.backlighton": {
|
||||||
"en": "Backlight on",
|
"en": "Backlight on",
|
||||||
|
|
@ -199,10 +199,10 @@
|
||||||
"en-tts": "Set timezone"
|
"en-tts": "Set timezone"
|
||||||
},
|
},
|
||||||
"mainmenu.pddb": {
|
"mainmenu.pddb": {
|
||||||
"en": "PDDB Submenu",
|
"en": "PDDB submenu...",
|
||||||
"ja": "PDDBサブメニュー",
|
"ja": "PDDBサブメニュー",
|
||||||
"zh": "PDDB子菜单",
|
"zh": "PDDB子菜单",
|
||||||
"en-tts": "PDDB submenu"
|
"en-tts": "PDDB submenu..."
|
||||||
},
|
},
|
||||||
"mainmenu.app": {
|
"mainmenu.app": {
|
||||||
"en": "Switch to App...",
|
"en": "Switch to App...",
|
||||||
|
|
@ -301,16 +301,16 @@
|
||||||
"en-tts": "Fill in SSID and password:"
|
"en-tts": "Fill in SSID and password:"
|
||||||
},
|
},
|
||||||
"wlan.ssid": {
|
"wlan.ssid": {
|
||||||
"en": "SSID",
|
"en": "[ SSID ]",
|
||||||
"ja": "SSID",
|
"ja": "[ SSID ]",
|
||||||
"zh": "SSID",
|
"zh": "[ SSID ]",
|
||||||
"en-tts": "SSID"
|
"en-tts": "[ SSID ]"
|
||||||
},
|
},
|
||||||
"wlan.password": {
|
"wlan.password": {
|
||||||
"en": "Password",
|
"en": "[ password ]",
|
||||||
"ja": "パスワード",
|
"ja": "[ パスワード ]",
|
||||||
"zh": "密码",
|
"zh": "[ 密码 ]",
|
||||||
"en-tts": "Password"
|
"en-tts": "[ password ]"
|
||||||
},
|
},
|
||||||
"wlan.no_networks": {
|
"wlan.no_networks": {
|
||||||
"en": "No networks available.",
|
"en": "No networks available.",
|
||||||
|
|
@ -349,10 +349,10 @@
|
||||||
"en-tts": "Known networks:\n"
|
"en-tts": "Known networks:\n"
|
||||||
},
|
},
|
||||||
"wlan.cancel": {
|
"wlan.cancel": {
|
||||||
"en": "Cancel",
|
"en": "❌ Cancel request ❌",
|
||||||
"ja": "キャンセル",
|
"ja": "❌ キャンセル ❌",
|
||||||
"zh": "取消",
|
"zh": "❌ 取消请求 ❌",
|
||||||
"en-tts": "Cancel"
|
"en-tts": "Cancel the requested action"
|
||||||
},
|
},
|
||||||
"wlan.choose_delete": {
|
"wlan.choose_delete": {
|
||||||
"en": "Choose a network to delete:",
|
"en": "Choose a network to delete:",
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,13 @@ use locales::t;
|
||||||
|
|
||||||
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive, PartialEq, PartialOrd)]
|
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive, PartialEq, PartialOrd)]
|
||||||
enum WlanManOp {
|
enum WlanManOp {
|
||||||
TurnWlanOn = 3,
|
ScanForNetworks = 3,
|
||||||
TurnWlanOff,
|
|
||||||
AddNetworkManually,
|
|
||||||
ScanForNetworks,
|
|
||||||
Status,
|
Status,
|
||||||
|
AddNetworkManually,
|
||||||
|
KnownNetworks,
|
||||||
DeleteNetwork,
|
DeleteNetwork,
|
||||||
KnownNetworks = 9,
|
TurnWlanOn,
|
||||||
|
TurnWlanOff = 9,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Display for WlanManOp {
|
impl Display for WlanManOp {
|
||||||
|
|
@ -91,13 +91,13 @@ impl WLANMan {
|
||||||
use WlanManOp::*;
|
use WlanManOp::*;
|
||||||
|
|
||||||
vec![
|
vec![
|
||||||
TurnWlanOn,
|
|
||||||
TurnWlanOff,
|
|
||||||
AddNetworkManually,
|
|
||||||
ScanForNetworks,
|
ScanForNetworks,
|
||||||
Status,
|
Status,
|
||||||
|
AddNetworkManually,
|
||||||
KnownNetworks,
|
KnownNetworks,
|
||||||
DeleteNetwork,
|
DeleteNetwork,
|
||||||
|
TurnWlanOn,
|
||||||
|
TurnWlanOff,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -193,7 +193,7 @@ impl WLANMan {
|
||||||
|
|
||||||
fn show_available_networks(&mut self) -> Result<(), WLANError> {
|
fn show_available_networks(&mut self) -> Result<(), WLANError> {
|
||||||
let networks = self.scan_networks()?;
|
let networks = self.scan_networks()?;
|
||||||
let networks: Vec<&str> = networks.iter().map(|s| s.as_str()).collect();
|
let mut networks: Vec<&str> = networks.iter().map(|s| s.as_str()).collect();
|
||||||
|
|
||||||
if networks.is_empty() {
|
if networks.is_empty() {
|
||||||
self.modals
|
self.modals
|
||||||
|
|
@ -202,10 +202,16 @@ impl WLANMan {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
networks.push(t!("wlan.cancel", xous::LANG));
|
||||||
|
|
||||||
self.modals.add_list(networks).unwrap();
|
self.modals.add_list(networks).unwrap();
|
||||||
|
|
||||||
let ssid = self.modals.get_radiobutton(t!("wlan.ssid_choose", xous::LANG)).unwrap();
|
let ssid = self.modals.get_radiobutton(t!("wlan.ssid_choose", xous::LANG)).unwrap();
|
||||||
|
|
||||||
|
if ssid == t!("wlan.cancel", xous::LANG) {
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
self.fill_password_for_ssid(&ssid)
|
self.fill_password_for_ssid(&ssid)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -244,7 +250,7 @@ impl WLANMan {
|
||||||
// TODO: make a proper translation for this. But, I think for now, this is a fairly
|
// TODO: make a proper translation for this. But, I think for now, this is a fairly
|
||||||
// technical screen that we can leave in English.
|
// technical screen that we can leave in English.
|
||||||
let status_str = format!(
|
let status_str = format!(
|
||||||
"Connection status: \n\n - SSID: {}\n - Link state: {:?}\n - IP: {}\n - Gateway: {}\n - Subnet mask: {}\n - DNS 1: {}\n - DNS 2: {}\n - DHCP state: {:?}",
|
"Connection status: \n\n ▪ SSID: {}\n ▪ Link state: {:?}\n ▪ IP: {}\n ▪ Gateway: {}\n ▪ Subnet mask: {}\n ▪ DNS 1: {}\n ▪ DNS 2: {}\n ▪ DHCP state: {:?}",
|
||||||
ssid,
|
ssid,
|
||||||
ls,
|
ls,
|
||||||
format_ip(ip.addr),
|
format_ip(ip.addr),
|
||||||
|
|
@ -278,7 +284,7 @@ impl WLANMan {
|
||||||
|
|
||||||
networks_string += &networks
|
networks_string += &networks
|
||||||
.iter()
|
.iter()
|
||||||
.map(|s| format!(" - {}", s))
|
.map(|s| format!(" ▪ {}", s))
|
||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>()
|
||||||
.join("\n");
|
.join("\n");
|
||||||
|
|
||||||
|
|
@ -396,9 +402,11 @@ fn run_menu_thread() {
|
||||||
|
|
||||||
match FromPrimitive::from_usize(msg.body.id()) {
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
Some(other) => {
|
Some(other) => {
|
||||||
if other >= WlanManOp::TurnWlanOn && other <= WlanManOp::KnownNetworks {
|
if other >= WlanManOp::ScanForNetworks && other <= WlanManOp::TurnWlanOff {
|
||||||
hello.consume_menu_action(other);
|
hello.consume_menu_action(other);
|
||||||
continue;
|
continue;
|
||||||
|
} else {
|
||||||
|
log::warn!("Received out of range opcode. Did WlanManOp get re-ordered, but the bounds check was not updated as well?");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue