diff options
author | Dylan Katz <dykatz@uw.edu> | 2022-01-28 23:29:55 -0800 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-01-29 13:45:34 +0100 |
commit | caecb6ba72ab9bff2f8ae4950fa1ae68651a3931 (patch) | |
tree | d7810b7faa4f7c7e80f5e148f2d96c0cd8de841e /Userland/Applications/DisplaySettings | |
parent | 362df5b6dd6a1425f3a4a267ad5529e99bb6743c (diff) | |
download | serenity-caecb6ba72ab9bff2f8ae4950fa1ae68651a3931.zip |
DisplaySettings: Set icons from GML
Diffstat (limited to 'Userland/Applications/DisplaySettings')
-rw-r--r-- | Userland/Applications/DisplaySettings/DesktopSettings.gml | 6 | ||||
-rw-r--r-- | Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Userland/Applications/DisplaySettings/DesktopSettings.gml b/Userland/Applications/DisplaySettings/DesktopSettings.gml index 58477d596e..00983ae0ef 100644 --- a/Userland/Applications/DisplaySettings/DesktopSettings.gml +++ b/Userland/Applications/DisplaySettings/DesktopSettings.gml @@ -50,20 +50,24 @@ layout: @GUI::HorizontalBoxLayout { } + @GUI::Label { - name: "light_bulb_label" fixed_height: 32 fixed_width: 32 + icon: "/res/icons/32x32/app-welcome.png" } + @GUI::Widget { layout: @GUI::VerticalBoxLayout { margins: [6] } + @GUI::Label { text: "Use the Ctrl+Alt+Arrow hotkeys to move between workspaces." text_alignment: "TopLeft" word_wrap: true } + @GUI::Label { text: "Use the Ctrl+Shift+Alt+Arrow hotkeys to move between\nworkspaces and move the active window." text_alignment: "TopLeft" diff --git a/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp b/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp index bb4b984685..6ef80b7573 100644 --- a/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp +++ b/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp @@ -29,9 +29,6 @@ void DesktopSettingsWidget::create_frame() { load_from_gml(desktop_settings_gml); - auto& light_bulb_label = *find_descendant_of_type_named<GUI::Label>("light_bulb_label"); - light_bulb_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/app-welcome.png").release_value_but_fixme_should_propagate_errors()); - m_workspace_rows_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("workspace_rows_spinbox"); m_workspace_columns_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("workspace_columns_spinbox"); } |