RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:57:45 +00:00
Code Issues Activity Actions

KeyboardSettings: Convert KeyboardSettingsWidget to a failable factory

Browse source
This commit is contained in:
Karol Kosek 2023-05-09 22:52:49 +02:00 • committed by Andreas Kling
parent 90819e2d71
commit 956a932a87
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp
View file

@ -149,26 +149,33 @@ private:
DeprecatedString m_active_keymap; DeprecatedString m_active_keymap;
}; };
KeyboardSettingsWidget::KeyboardSettingsWidget() ErrorOr<NonnullRefPtr<KeyboardSettingsWidget>> KeyboardSettingsWidget::try_create()
{ {
load_from_gml(keyboard_widget_gml).release_value_but_fixme_should_propagate_errors(); auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) KeyboardSettingsWidget()));
auto proc_keymap = MUST(Core::File::open("/sys/kernel/keymap"sv, Core::File::OpenMode::Read)); TRY(widget->setup());
return widget;
}
auto keymap = proc_keymap->read_until_eof().release_value_but_fixme_should_propagate_errors(); ErrorOr<void> KeyboardSettingsWidget::setup()
auto json = JsonValue::from_string(keymap).release_value_but_fixme_should_propagate_errors(); {
TRY(load_from_gml(keyboard_widget_gml));
auto proc_keymap = TRY(Core::File::open("/sys/kernel/keymap"sv, Core::File::OpenMode::Read));
auto keymap = TRY(proc_keymap->read_until_eof());
auto json = TRY(JsonValue::from_string(keymap));
auto const& keymap_object = json.as_object(); auto const& keymap_object = json.as_object();
VERIFY(keymap_object.has("keymap"sv)); VERIFY(keymap_object.has("keymap"sv));
m_initial_active_keymap = keymap_object.get_deprecated_string("keymap"sv).value(); m_initial_active_keymap = keymap_object.get_deprecated_string("keymap"sv).value();
dbgln("KeyboardSettings thinks the current keymap is: {}", m_initial_active_keymap); dbgln("KeyboardSettings thinks the current keymap is: {}", m_initial_active_keymap);
auto mapper_config(Core::ConfigFile::open("/etc/Keyboard.ini").release_value_but_fixme_should_propagate_errors()); auto mapper_config(TRY(Core::ConfigFile::open("/etc/Keyboard.ini")));
auto keymaps = mapper_config->read_entry("Mapping", "Keymaps", ""); auto keymaps = mapper_config->read_entry("Mapping", "Keymaps", "");
auto keymaps_vector = keymaps.split(','); auto keymaps_vector = keymaps.split(',');
m_selected_keymaps_listview = find_descendant_of_type_named<GUI::ListView>("selected_keymaps"); m_selected_keymaps_listview = find_descendant_of_type_named<GUI::ListView>("selected_keymaps");
m_selected_keymaps_listview->horizontal_scrollbar().set_visible(false); m_selected_keymaps_listview->horizontal_scrollbar().set_visible(false);
m_selected_keymaps_listview->set_model(adopt_ref(*new KeymapModel())); m_selected_keymaps_listview->set_model(TRY(try_make_ref_counted<KeymapModel>()));
auto& keymaps_list_model = static_cast<KeymapModel&>(*m_selected_keymaps_listview->model()); auto& keymaps_list_model = static_cast<KeymapModel&>(*m_selected_keymaps_listview->model());
for (auto& keymap : keymaps_vector) { for (auto& keymap : keymaps_vector) {
@ -267,6 +274,7 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
m_caps_lock_checkbox->on_checked = [&](auto) { m_caps_lock_checkbox->on_checked = [&](auto) {
set_modified(true); set_modified(true);
}; };
return {};
} }
KeyboardSettingsWidget::~KeyboardSettingsWidget() KeyboardSettingsWidget::~KeyboardSettingsWidget()

6
Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h
View file

@ -16,8 +16,9 @@
#include <LibGUI/TextEditor.h> #include <LibGUI/TextEditor.h>
class KeyboardSettingsWidget final : public GUI::SettingsWindow::Tab { class KeyboardSettingsWidget final : public GUI::SettingsWindow::Tab {
C_OBJECT(KeyboardSettingsWidget) C_OBJECT_ABSTRACT(KeyboardSettingsWidget)
public: public:
static ErrorOr<NonnullRefPtr<KeyboardSettingsWidget>> try_create();
virtual ~KeyboardSettingsWidget() override; virtual ~KeyboardSettingsWidget() override;
virtual void apply_settings() override; virtual void apply_settings() override;
@ -25,7 +26,8 @@ public:
void window_activated(bool is_active_window); void window_activated(bool is_active_window);
private: private:
KeyboardSettingsWidget(); KeyboardSettingsWidget() = default;
ErrorOr<void> setup();
void set_keymaps(Vector<DeprecatedString> const& keymaps, DeprecatedString const& active_keymap); void set_keymaps(Vector<DeprecatedString> const& keymaps, DeprecatedString const& active_keymap);