mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
feat: implement keyboard layout settigns
This commit is contained in:
parent
8594c0ae14
commit
aa47d7c333
1 changed files with 29 additions and 1 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
use crate::wifi;
|
use crate::wifi;
|
||||||
use locales::t;
|
use locales::t;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
use std::fmt::Display;
|
use std::{fmt::Display, collections::HashMap};
|
||||||
use userprefs::Manager;
|
use userprefs::Manager;
|
||||||
|
|
||||||
pub trait PrefHandler {
|
pub trait PrefHandler {
|
||||||
|
|
@ -17,6 +17,7 @@ enum DevicePrefsOp {
|
||||||
ConnectKnownNetworksOnBoot,
|
ConnectKnownNetworksOnBoot,
|
||||||
AutobacklightOnBoot,
|
AutobacklightOnBoot,
|
||||||
AutobacklightTimeout,
|
AutobacklightTimeout,
|
||||||
|
KeyboardLayout,
|
||||||
WLANMenu,
|
WLANMenu,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -27,6 +28,7 @@ impl Display for DevicePrefsOp {
|
||||||
Self::AutobacklightTimeout => write!(f, "Autobacklight timeout"),
|
Self::AutobacklightTimeout => write!(f, "Autobacklight timeout"),
|
||||||
Self::ConnectKnownNetworksOnBoot => write!(f, "Connect to known networks on boot"),
|
Self::ConnectKnownNetworksOnBoot => write!(f, "Connect to known networks on boot"),
|
||||||
Self::RadioOnOnBoot => write!(f, "Enable WiFi on boot"),
|
Self::RadioOnOnBoot => write!(f, "Enable WiFi on boot"),
|
||||||
|
Self::KeyboardLayout => write!(f, "Keyboard layout"),
|
||||||
Self::WLANMenu => write!(f, "WLAN settings"),
|
Self::WLANMenu => write!(f, "WLAN settings"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -114,6 +116,7 @@ impl DevicePrefs {
|
||||||
ConnectKnownNetworksOnBoot,
|
ConnectKnownNetworksOnBoot,
|
||||||
AutobacklightOnBoot,
|
AutobacklightOnBoot,
|
||||||
AutobacklightTimeout,
|
AutobacklightTimeout,
|
||||||
|
KeyboardLayout,
|
||||||
WLANMenu,
|
WLANMenu,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -124,6 +127,7 @@ impl DevicePrefs {
|
||||||
DevicePrefsOp::RadioOnOnBoot => self.radio_on_on_boot(),
|
DevicePrefsOp::RadioOnOnBoot => self.radio_on_on_boot(),
|
||||||
DevicePrefsOp::ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),
|
DevicePrefsOp::ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),
|
||||||
DevicePrefsOp::AutobacklightTimeout => self.autobacklight_timeout(),
|
DevicePrefsOp::AutobacklightTimeout => self.autobacklight_timeout(),
|
||||||
|
DevicePrefsOp::KeyboardLayout => self.keyboard_layout(),
|
||||||
DevicePrefsOp::WLANMenu => self.wlan_menu(),
|
DevicePrefsOp::WLANMenu => self.wlan_menu(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -228,6 +232,30 @@ impl DevicePrefs {
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn keyboard_layout(&mut self) -> Result<(), DevicePrefsError> {
|
||||||
|
let kl = self.up.keyboard_layout_or_default()?;
|
||||||
|
|
||||||
|
let mut mappings = HashMap::new();
|
||||||
|
|
||||||
|
mappings.insert("QWERTY", 0 as usize);
|
||||||
|
mappings.insert("AZERTY", 1);
|
||||||
|
mappings.insert("QWERTZ", 2);
|
||||||
|
mappings.insert("Dvorak", 3);
|
||||||
|
|
||||||
|
self.modals
|
||||||
|
.add_list(mappings.keys().cloned().collect())
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let new_result = self
|
||||||
|
.modals
|
||||||
|
.get_radiobutton(&format!("Current layout: {}", keyboard::KeyMap::from(kl)))
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let new_result = mappings[new_result.as_str()];
|
||||||
|
|
||||||
|
Ok(self.up.set_keyboard_layout(new_result)?)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn yes_no_to_bool(val: &str) -> bool {
|
fn yes_no_to_bool(val: &str) -> bool {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue