RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:17:34 +00:00
Code Issues Activity Actions

KeyboardSettings: Set icons from GML

Browse source
This commit is contained in:
Dylan Katz 2022-01-28 23:11:38 -08:00 • committed by Andreas Kling
parent ca912a87f1
commit 90b371ef47
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Applications/KeyboardSettings/Keyboard.gml
View file

@ -23,7 +23,7 @@
@GUI::Label { @GUI::Label {
fixed_width: 32 fixed_width: 32
fixed_height: 32 fixed_height: 32
name: "character_map_image_label" icon: "/res/icons/32x32/app-keyboard-mapper.png"
} }
@GUI::Widget @GUI::Widget
@ -59,6 +59,7 @@
text: "Test your current keymap below" text: "Test your current keymap below"
text_alignment: "CenterLeft" text_alignment: "CenterLeft"
} }
@GUI::Button { @GUI::Button {
text: "Clear" text: "Clear"
name: "button_clear_test_typing_area" name: "button_clear_test_typing_area"
@ -85,7 +86,7 @@
@GUI::Label { @GUI::Label {
fixed_width: 32 fixed_width: 32
fixed_height: 32 fixed_height: 32
name: "num_lock_image_label" icon: "/res/icons/32x32/app-calculator.png"
} }
@GUI::CheckBox { @GUI::CheckBox {

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

@ -52,9 +52,6 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
} }
VERIFY(initial_keymap_index < m_character_map_files.size()); VERIFY(initial_keymap_index < m_character_map_files.size());
auto& character_map_image_label = *find_descendant_of_type_named<GUI::Label>("character_map_image_label");
character_map_image_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/app-keyboard-mapper.png").release_value_but_fixme_should_propagate_errors());
m_character_map_file_combo = find_descendant_of_type_named<GUI::ComboBox>("character_map_file_combo"); 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_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_model(*GUI::ItemListModel<String>::create(m_character_map_files));
@ -73,8 +70,6 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
m_test_typing_area->set_focus(true); m_test_typing_area->set_focus(true);
}; };
auto& num_lock_image_label = *find_descendant_of_type_named<GUI::Label>("num_lock_image_label");
num_lock_image_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/app-calculator.png").release_value_but_fixme_should_propagate_errors());
m_num_lock_checkbox = find_descendant_of_type_named<GUI::CheckBox>("num_lock_checkbox"); 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)); m_num_lock_checkbox->set_checked(Config::read_bool("KeyboardSettings", "StartupEnable", "NumLock", true));
} }