From aa47d7c3334891ea8204389636671de85e48e5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gianguido=20Sor=C3=A0?= Date: Wed, 2 Nov 2022 17:57:18 +0100 Subject: [PATCH] feat: implement keyboard layout settigns --- services/status/src/preferences.rs | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/services/status/src/preferences.rs b/services/status/src/preferences.rs index bd2111ddd..b27ef3030 100644 --- a/services/status/src/preferences.rs +++ b/services/status/src/preferences.rs @@ -1,7 +1,7 @@ use crate::wifi; use locales::t; use num_traits::*; -use std::fmt::Display; +use std::{fmt::Display, collections::HashMap}; use userprefs::Manager; pub trait PrefHandler { @@ -17,6 +17,7 @@ enum DevicePrefsOp { ConnectKnownNetworksOnBoot, AutobacklightOnBoot, AutobacklightTimeout, + KeyboardLayout, WLANMenu, } @@ -27,6 +28,7 @@ impl Display for DevicePrefsOp { Self::AutobacklightTimeout => write!(f, "Autobacklight timeout"), Self::ConnectKnownNetworksOnBoot => write!(f, "Connect to known networks on boot"), Self::RadioOnOnBoot => write!(f, "Enable WiFi on boot"), + Self::KeyboardLayout => write!(f, "Keyboard layout"), Self::WLANMenu => write!(f, "WLAN settings"), } } @@ -114,6 +116,7 @@ impl DevicePrefs { ConnectKnownNetworksOnBoot, AutobacklightOnBoot, AutobacklightTimeout, + KeyboardLayout, WLANMenu, ] } @@ -124,6 +127,7 @@ impl DevicePrefs { DevicePrefsOp::RadioOnOnBoot => self.radio_on_on_boot(), DevicePrefsOp::ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(), DevicePrefsOp::AutobacklightTimeout => self.autobacklight_timeout(), + DevicePrefsOp::KeyboardLayout => self.keyboard_layout(), DevicePrefsOp::WLANMenu => self.wlan_menu(), }; @@ -228,6 +232,30 @@ impl DevicePrefs { 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 {