KeyboardMapper: Without arguments, load current keymap

3 files changed, 23 insertions, 6 deletions

diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
index a8cf0440d1..3c88339b71 100644
--- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
+++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
@@ -31,6 +31,7 @@
 #include <LibGUI/InputBox.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/RadioButton.h>
+#include <LibKeyboard/CharacterMap.h>
 #include <LibKeyboard/CharacterMapFile.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -145,9 +146,7 @@ void KeyboardMapperWidget::create_frame()
 void KeyboardMapperWidget::load_from_file(String file_name)
 {
     auto result = Keyboard::CharacterMapFile::load_from_file(file_name);
-    if (!result.has_value()) {
-        ASSERT_NOT_REACHED();
-    }
+    ASSERT(result.has_value());
 
     m_file_name = file_name;
     m_character_map = result.value();
@@ -161,6 +160,23 @@ void KeyboardMapperWidget::load_from_file(String file_name)
     update_window_title();
 }
 
+void KeyboardMapperWidget::load_from_system()
+{
+    auto result = Keyboard::CharacterMap::fetch_system_map();
+    ASSERT(!result.is_error());
+
+    m_file_name = String::formatted("/res/keymaps/{}.json", result.value().character_map_name());
+    m_character_map = result.value().character_map_data();
+    set_current_map("map");
+
+    for (Widget* widget : m_map_group->child_widgets()) {
+        auto radio_button = (GUI::RadioButton*)widget;
+        radio_button->set_checked(radio_button->name() == "map");
+    }
+
+    update_window_title();
+}
+
 void KeyboardMapperWidget::save()
 {
     save_to_file(m_file_name);
diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.h b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.h
index e0df34ed78..cf406a3756 100644
--- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.h
+++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.h
@@ -39,6 +39,7 @@ public:
 
     void create_frame();
     void load_from_file(const String);
+    void load_from_system();
     void save();
     void save_to_file(const StringView&);
 
diff --git a/Userland/Applications/KeyboardMapper/main.cpp b/Userland/Applications/KeyboardMapper/main.cpp
index db5afa4a99..c9ccf17e25 100644
--- a/Userland/Applications/KeyboardMapper/main.cpp
+++ b/Userland/Applications/KeyboardMapper/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
     if (path != nullptr) {
         keyboard_mapper_widget->load_from_file(path);
     } else {
-        keyboard_mapper_widget->load_from_file("/res/keymaps/en.json");
+        keyboard_mapper_widget->load_from_system();
     }
 
     // Actions
@@ -84,8 +84,8 @@ int main(int argc, char** argv)
         });
 
     auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
-        String m_name = "Unnamed";
-        Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, m_name, "json");
+        String name = "Unnamed";
+        Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, name, "json");
         if (!save_path.has_value())
             return;