This commit is contained in:
@@ -650,6 +650,15 @@ impl App {
|
||||
));
|
||||
if let Some(d) = &self.station_device {
|
||||
ui.heading(format!("#{}", d["number"]));
|
||||
match d["_registration"].as_str() {
|
||||
Some("NEW") => {
|
||||
ui.colored_label(GREEN, tr(en, "Neu im Inventory registriert", "Newly registered in inventory"));
|
||||
}
|
||||
Some("EXISTING") => {
|
||||
ui.label(tr(en, "Bereits im Inventory vorhanden", "Existing inventory device"));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
let stage = match d["stage"].as_str().unwrap_or("") {
|
||||
"INTAKE" => "Eingang",
|
||||
"INSPECTION" => "Inspektion",
|
||||
@@ -912,6 +921,16 @@ impl App {
|
||||
}
|
||||
ui.add_enabled_ui(!conflict, |ui| {
|
||||
if key == "wifi" {
|
||||
if diagnostics::needs_lan_disconnect() {
|
||||
ui.colored_label(
|
||||
ORANGE,
|
||||
tr(
|
||||
en,
|
||||
"LAN-Kabel entfernen: Bei diesem mobilen Gerät muss der WLAN-Test ohne aktive Kabelverbindung erfolgen.",
|
||||
"Disconnect Ethernet: test Wi-Fi on this mobile device without an active wired connection.",
|
||||
),
|
||||
);
|
||||
}
|
||||
self.wifi.set_language(en);
|
||||
let was_busy = self.wifi.busy();
|
||||
self.wifi.ui(ui, self.receiver.is_some());
|
||||
@@ -1437,6 +1456,29 @@ impl App {
|
||||
ui.selectable_value(&mut self.settings_draft.language, "de".into(), "Deutsch");
|
||||
ui.selectable_value(&mut self.settings_draft.language, "en".into(), "English");
|
||||
});
|
||||
ui.label(tr(en, "Tastaturbelegung", "Keyboard layout"));
|
||||
egui::ComboBox::from_id_salt("keyboard-layout")
|
||||
.selected_text(match self.settings_draft.keyboard_layout.as_str() {
|
||||
"us" => "English (US)",
|
||||
_ => "Deutsch (DE)",
|
||||
})
|
||||
.show_ui(ui, |ui| {
|
||||
ui.selectable_value(
|
||||
&mut self.settings_draft.keyboard_layout,
|
||||
"de".into(),
|
||||
"Deutsch (DE)",
|
||||
);
|
||||
ui.selectable_value(
|
||||
&mut self.settings_draft.keyboard_layout,
|
||||
"us".into(),
|
||||
"English (US)",
|
||||
);
|
||||
});
|
||||
ui.small(tr(
|
||||
en,
|
||||
"Die Tastaturbelegung wird beim nächsten Start des USB-Systems angewendet.",
|
||||
"The keyboard layout is applied on the next USB-system boot.",
|
||||
));
|
||||
ui.label(tr(en, "WLAN-Testserver", "Wi-Fi test server"));
|
||||
ui.text_edit_singleline(&mut self.settings_draft.test_url);
|
||||
ui.horizontal(|ui| {
|
||||
|
||||
Reference in New Issue
Block a user