KeyboardSettings: Migrate to using SettingsWindow :^)

Userland/Applications/KeyboardSettings/CMakeLists.txt

@@ -8,6 +8,7 @@ compile_gml(Keyboard.gml KeyboardWidgetGML.h keyboard_widget_gml)
 
 set(SOURCES
     main.cpp
+    KeyboardSettingsWidget.cpp
     KeyboardWidgetGML.h
 )
 

Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2020, Hüseyin Aslıtürk <asliturk@hotmail.com>
+ * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include "KeyboardSettingsWidget.h"
+#include <AK/JsonObject.h>
+#include <AK/QuickSort.h>
+#include <Applications/KeyboardSettings/KeyboardWidgetGML.h>
+#include <LibConfig/Client.h>
+#include <LibCore/DirIterator.h>
+#include <LibCore/File.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/ItemListModel.h>
+#include <LibGUI/MessageBox.h>
+#include <LibKeyboard/CharacterMap.h>
+#include <spawn.h>
+
+KeyboardSettingsWidget::KeyboardSettingsWidget()
+{
+    load_from_gml(keyboard_widget_gml);
+
+    auto proc_keymap = Core::File::construct("/proc/keymap");
+    if (!proc_keymap->open(Core::OpenMode::ReadOnly))
+        VERIFY_NOT_REACHED();
+
+    auto json = JsonValue::from_string(proc_keymap->read_all()).release_value_but_fixme_should_propagate_errors();
+    auto const& keymap_object = json.as_object();
+    VERIFY(keymap_object.has("keymap"));
+    String current_keymap = keymap_object.get("keymap").to_string();
+    dbgln("KeyboardSettings thinks the current keymap is: {}", current_keymap);
+
+    Core::DirIterator iterator("/res/keymaps/", Core::DirIterator::Flags::SkipDots);
+    if (iterator.has_error()) {
+        GUI::MessageBox::show(nullptr, String::formatted("Error on reading mapping file list: {}", iterator.error_string()), "Keyboard settings", GUI::MessageBox::Type::Error);
+        GUI::Application::the()->quit(-1);
+    }
+
+    while (iterator.has_next()) {
+        auto name = iterator.next_path();
+        m_character_map_files.append(name.replace(".json", ""));
+    }
+    quick_sort(m_character_map_files);
+
+    size_t initial_keymap_index = SIZE_MAX;
+    for (size_t i = 0; i < m_character_map_files.size(); ++i) {
+        if (m_character_map_files[i].equals_ignoring_case(current_keymap))
+            initial_keymap_index = i;
+    }
+    VERIFY(initial_keymap_index < m_character_map_files.size());
+
+    m_character_map_file_combo = find_descendant_of_type_named<GUI::ComboBox>("character_map_file_combo");
+    m_character_map_file_combo->set_only_allow_values_from_model(true);
+    m_character_map_file_combo->set_model(*GUI::ItemListModel<String>::create(m_character_map_files));
+    m_character_map_file_combo->set_selected_index(initial_keymap_index);
+
+    m_num_lock_checkbox = find_descendant_of_type_named<GUI::CheckBox>("num_lock_checkbox");
+    m_num_lock_checkbox->set_checked(Config::read_bool("KeyboardSettings", "StartupEnable", "NumLock", true));
+}
+
+void KeyboardSettingsWidget::apply_settings()
+{
+    String character_map_file = m_character_map_file_combo->text();
+    if (character_map_file.is_empty()) {
+        GUI::MessageBox::show(window(), "Please select character mapping file.", "Keyboard settings", GUI::MessageBox::Type::Error);
+        return;
+    }
+    pid_t child_pid;
+    const char* argv[] = { "/bin/keymap", character_map_file.characters(), nullptr };
+    if ((errno = posix_spawn(&child_pid, "/bin/keymap", nullptr, nullptr, const_cast<char**>(argv), environ))) {
+        perror("posix_spawn");
+        exit(1);
+    }
+
+    Config::write_bool("KeyboardSettings", "StartupEnable", "NumLock", m_num_lock_checkbox->is_checked());
+}

Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/ComboBox.h>
+#include <LibGUI/SettingsWindow.h>
+
+class KeyboardSettingsWidget final : public GUI::SettingsWindow::Tab {
+    C_OBJECT(KeyboardSettingsWidget)
+public:
+    virtual ~KeyboardSettingsWidget() override = default;
+
+    virtual void apply_settings() override;
+
+private:
+    KeyboardSettingsWidget();
+
+    Vector<String> m_character_map_files;
+
+    RefPtr<GUI::ComboBox> m_character_map_file_combo;
+    RefPtr<GUI::CheckBox> m_num_lock_checkbox;
+};

Userland/Applications/KeyboardSettings/main.cpp

@@ -5,24 +5,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/JsonObject.h>
-#include <AK/QuickSort.h>
-#include <Applications/KeyboardSettings/KeyboardWidgetGML.h>
-#include <LibCore/DirIterator.h>
-#include <LibCore/File.h>
-#include <LibGUI/Action.h>
+#include "KeyboardSettingsWidget.h"
 #include <LibGUI/Application.h>
-#include <LibGUI/BoxLayout.h>
-#include <LibGUI/Button.h>
-#include <LibGUI/CheckBox.h>
-#include <LibGUI/ComboBox.h>
-#include <LibGUI/ItemListModel.h>
-#include <LibGUI/Label.h>
-#include <LibGUI/MessageBox.h>
-#include <LibGUI/TabWidget.h>
+#include <LibGUI/SettingsWindow.h>
 #include <LibGUI/WindowServerConnection.h>
-#include <LibKeyboard/CharacterMap.h>
-#include <spawn.h>
 
 // Including this after to avoid LibIPC errors
 #include <LibConfig/Client.h>
@@ -64,120 +50,10 @@ int main(int argc, char** argv)
 
     auto app_icon = GUI::Icon::default_icon("app-keyboard-settings");
 
-    auto proc_keymap = Core::File::construct("/proc/keymap");
-    if (!proc_keymap->open(Core::OpenMode::ReadOnly))
-        VERIFY_NOT_REACHED();
-
-    auto json = JsonValue::from_string(proc_keymap->read_all()).release_value_but_fixme_should_propagate_errors();
-    auto const& keymap_object = json.as_object();
-    VERIFY(keymap_object.has("keymap"));
-    String current_keymap = keymap_object.get("keymap").to_string();
-    dbgln("KeyboardSettings thinks the current keymap is: {}", current_keymap);
-
-    Vector<String> character_map_files;
-    Core::DirIterator iterator("/res/keymaps/", Core::DirIterator::Flags::SkipDots);
-    if (iterator.has_error()) {
-        GUI::MessageBox::show(nullptr, String::formatted("Error on reading mapping file list: {}", iterator.error_string()), "Keyboard settings", GUI::MessageBox::Type::Error);
-        return -1;
-    }
-
-    while (iterator.has_next()) {
-        auto name = iterator.next_path();
-        character_map_files.append(name.replace(".json", ""));
-    }
-    quick_sort(character_map_files);
-
-    size_t initial_keymap_index = SIZE_MAX;
-    for (size_t i = 0; i < character_map_files.size(); ++i) {
-        if (character_map_files[i].equals_ignoring_case(current_keymap))
-            initial_keymap_index = i;
-    }
-    VERIFY(initial_keymap_index < character_map_files.size());
-
-    auto window = GUI::Window::construct();
-    window->set_title("Keyboard Settings");
-    window->resize(400, 480);
-    window->set_resizable(false);
-    window->set_minimizable(false);
-
-    auto& main_widget = window->set_main_widget<GUI::Widget>();
-    main_widget.set_fill_with_background_color(true);
-    main_widget.set_layout<GUI::VerticalBoxLayout>();
-    main_widget.layout()->set_margins(4);
-    main_widget.layout()->set_spacing(6);
-
-    auto& tab_widget = main_widget.add<GUI::TabWidget>();
-    auto& keyboard_widget = tab_widget.add_tab<GUI::Widget>("Keyboard");
-
-    keyboard_widget.load_from_gml(keyboard_widget_gml);
-
-    auto& character_map_file_combo = *keyboard_widget.find_descendant_of_type_named<GUI::ComboBox>("character_map_file_combo");
-    character_map_file_combo.set_only_allow_values_from_model(true);
-    character_map_file_combo.set_model(*GUI::ItemListModel<String>::create(character_map_files));
-    character_map_file_combo.set_selected_index(initial_keymap_index);
-
-    auto& num_lock_checkbox = *keyboard_widget.find_descendant_of_type_named<GUI::CheckBox>("num_lock_checkbox");
-    num_lock_checkbox.set_checked(Config::read_bool("KeyboardSettings", "StartupEnable", "NumLock", true));
-
-    auto apply_settings = [&](bool quit) {
-        String character_map_file = character_map_file_combo.text();
-        if (character_map_file.is_empty()) {
-            GUI::MessageBox::show(window, "Please select character mapping file.", "Keyboard settings", GUI::MessageBox::Type::Error);
-            return;
-        }
-        pid_t child_pid;
-        const char* argv[] = { "/bin/keymap", character_map_file.characters(), nullptr };
-        if ((errno = posix_spawn(&child_pid, "/bin/keymap", nullptr, nullptr, const_cast<char**>(argv), environ))) {
-            perror("posix_spawn");
-            exit(1);
-        }
-
-        Config::write_bool("KeyboardSettings", "StartupEnable", "NumLock", num_lock_checkbox.is_checked());
-
-        if (quit)
-            app->quit();
-    };
-
-    auto& bottom_widget = root_widget.add<GUI::Widget>();
-    bottom_widget.set_layout<GUI::HorizontalBoxLayout>();
-    bottom_widget.layout()->add_spacer();
-    bottom_widget.set_fixed_height(30);
-
-    auto& ok_button = bottom_widget.add<GUI::Button>();
-    ok_button.set_text("OK");
-    ok_button.set_fixed_width(60);
-    ok_button.on_click = [&](auto) {
-        apply_settings(true);
-    };
-
-    auto& cancel_button = bottom_widget.add<GUI::Button>();
-    cancel_button.set_text("Cancel");
-    cancel_button.set_fixed_width(60);
-    cancel_button.on_click = [&](auto) {
-        app->quit();
-    };
-
-    auto& apply_button = bottom_widget.add<GUI::Button>();
-    apply_button.set_text("Apply");
-    apply_button.set_fixed_width(60);
-    apply_button.on_click = [&](auto) {
-        apply_settings(false);
-    };
-
-    auto quit_action = GUI::CommonActions::make_quit_action(
-        [&](auto&) {
-            app->quit();
-        });
-
-    auto menubar = GUI::Menubar::construct();
-
-    auto& file_menu = window->add_menu("&File");
-    file_menu.add_action(quit_action);
-
-    auto& help_menu = window->add_menu("&Help");
-    help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Settings", app_icon, window));
+    auto window = GUI::SettingsWindow::construct("Keyboard Settings");
+    window->set_icon(app_icon.bitmap_for_size(16));
+    window->add_tab<KeyboardSettingsWidget>("Keyboard");
 
     window->show();
-
     return app->exec();
 }