Userland: Port some applications to the GML compiler

Meta/Lagom/Tools/CodeGenerators/GMLCompiler/main.cpp

@@ -221,7 +221,7 @@ static ErrorOr<String> generate_initializer_for(Optional<StringView> property_na
             if (auto const enum_value = TRY(generate_enum_initializer_for(*property_name, value)); enum_value.has_value())
                 return String::formatted("{}", *enum_value);
 
-            if (*property_name == "bitmap"sv)
+            if (*property_name == "bitmap"sv || *property_name == "icon"sv)
                 return String::formatted(R"~~~(TRY(Gfx::Bitmap::load_from_file("{}"sv)))~~~", TRY(escape_string(value)));
         }
 

Userland/Applications/ClockSettings/CMakeLists.txt

@@ -4,18 +4,15 @@ serenity_component(
     TARGETS ClockSettings
 )
 
-stringify_gml(ClockSettingsWidget.gml ClockSettingsWidgetGML.h clock_settings_widget_gml)
-stringify_gml(TimeZoneSettingsWidget.gml TimeZoneSettingsWidgetGML.h time_zone_settings_widget_gml)
+compile_gml(ClockSettingsWidget.gml ClockSettingsWidgetGML.cpp)
+compile_gml(TimeZoneSettingsWidget.gml TimeZoneSettingsWidgetGML.cpp)
 
 set(SOURCES
     main.cpp
     ClockSettingsWidget.cpp
     TimeZoneSettingsWidget.cpp
-)
-
-set(GENERATED_SOURCES
-    ClockSettingsWidgetGML.h
-    TimeZoneSettingsWidgetGML.h
+    ClockSettingsWidgetGML.cpp
+    TimeZoneSettingsWidgetGML.cpp
 )
 
 serenity_app(ClockSettings ICON app-analog-clock) # FIXME: Create a ClockSettings icon.

Userland/Applications/ClockSettings/ClockSettingsWidget.cpp

@@ -1,35 +1,28 @@
 /*
  * Copyright (c) 2022, cflip <[email protected]>
  * Copyright (c) 2022, Sam Atkins <[email protected]>
+ * Copyright (c) 2025, RatcheT2497 <[email protected]>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include "ClockSettingsWidget.h"
-#include <Applications/ClockSettings/ClockSettingsWidgetGML.h>
 #include <LibConfig/Client.h>
 #include <LibCore/DateTime.h>
 #include <LibGUI/CheckBox.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/RadioButton.h>
 #include <LibGUI/TextBox.h>
 
+namespace ClockSettings {
+
 constexpr auto time_format_12h = "%I:%M %p"sv;
 constexpr auto time_format_12h_seconds = "%r"sv;
 constexpr auto time_format_24h = "%R"sv;
 constexpr auto time_format_24h_seconds = "%T"sv;
 
-ErrorOr<NonnullRefPtr<ClockSettingsWidget>> ClockSettingsWidget::try_create()
-{
-    auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ClockSettingsWidget()));
-    TRY(widget->setup());
-    return widget;
-}
-
-ErrorOr<void> ClockSettingsWidget::setup()
+ErrorOr<void> ClockSettingsWidget::initialize()
 {
-    TRY(load_from_gml(clock_settings_widget_gml));
-
     m_24_hour_radio = *find_descendant_of_type_named<GUI::RadioButton>("24hour_radio");
     auto& twelve_hour_radio = *find_descendant_of_type_named<GUI::RadioButton>("12hour_radio");
     m_show_seconds_checkbox = *find_descendant_of_type_named<GUI::CheckBox>("seconds_checkbox");
@@ -130,3 +123,5 @@ void ClockSettingsWidget::update_clock_preview()
 {
     m_clock_preview->set_text(Core::DateTime::now().to_string(m_time_format).release_value_but_fixme_should_propagate_errors());
 }
+
+}

Userland/Applications/ClockSettings/ClockSettingsWidget.gml

@@ -1,4 +1,4 @@
-@GUI::Frame {
+@ClockSettings::ClockSettingsWidget {
     fill_with_background_color: true
     layout: @GUI::VerticalBoxLayout {
         margins: [10]

Userland/Applications/ClockSettings/ClockSettingsWidget.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, cflip <[email protected]>
+ * Copyright (c) 2025, RatcheT2497 <[email protected]>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -9,15 +10,17 @@
 #include <AK/RefPtr.h>
 #include <LibGUI/SettingsWindow.h>
 
+namespace ClockSettings {
+
 class ClockSettingsWidget final : public GUI::SettingsWindow::Tab {
     C_OBJECT_ABSTRACT(ClockSettingsWidget)
 
 public:
     static ErrorOr<NonnullRefPtr<ClockSettingsWidget>> try_create();
+    ErrorOr<void> initialize();
 
 private:
     ClockSettingsWidget() = default;
-    ErrorOr<void> setup();
 
     virtual void apply_settings() override;
     virtual void reset_default_values() override;
@@ -34,3 +37,5 @@ class ClockSettingsWidget final : public GUI::SettingsWindow::Tab {
 
     ByteString m_time_format;
 };
+
+}

Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp

@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2022, Tim Flynn <[email protected]>
+ * Copyright (c) 2025, RatcheT2497 <[email protected]>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include "TimeZoneSettingsWidget.h"
 #include <AK/Time.h>
-#include <Applications/ClockSettings/TimeZoneSettingsWidgetGML.h>
 #include <LibGUI/ComboBox.h>
 #include <LibGUI/Event.h>
 #include <LibGUI/ImageWidget.h>
@@ -24,6 +24,8 @@
 #include <spawn.h>
 #include <unistd.h>
 
+namespace ClockSettings {
+
 static constexpr auto PI_OVER_180 = M_PIf32 / 180.0f;
 static constexpr auto PI_OVER_4 = M_PIf32 / 4.0f;
 static constexpr auto TAU = M_PIf32 * 2.0f;
@@ -38,28 +40,17 @@ static constexpr auto TIME_ZONE_TEXT_HEIGHT = 40;
 static constexpr auto TIME_ZONE_TEXT_PADDING = 5;
 static constexpr auto TIME_ZONE_TEXT_COLOR = Gfx::Color::from_rgb(0xeaf688);
 
-ErrorOr<NonnullRefPtr<TimeZoneSettingsWidget>> TimeZoneSettingsWidget::create()
+ErrorOr<void> TimeZoneSettingsWidget::initialize()
 {
-    auto timezonesettings_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) TimeZoneSettingsWidget));
-
     auto time_zone_map_bitmap = TRY(Gfx::Bitmap::load_from_file("/res/graphics/map.png"sv));
     auto time_zone_rect = time_zone_map_bitmap->rect().shrunken(TIME_ZONE_MAP_NORTHERN_TRIM, 0, TIME_ZONE_MAP_SOUTHERN_TRIM, 0);
     time_zone_map_bitmap = TRY(time_zone_map_bitmap->cropped(time_zone_rect));
 
-    timezonesettings_widget->m_time_zone_map = *timezonesettings_widget->find_descendant_of_type_named<GUI::ImageWidget>("time_zone_map");
-    timezonesettings_widget->m_time_zone_map->set_bitmap(time_zone_map_bitmap);
+    m_time_zone_map = find_descendant_of_type_named<GUI::ImageWidget>("time_zone_map");
+    m_time_zone_map->set_bitmap(time_zone_map_bitmap);
 
     auto time_zone_marker = TRY(Gfx::Bitmap::load_from_file("/res/icons/32x32/ladyball.png"sv));
-    timezonesettings_widget->m_time_zone_marker = TRY(time_zone_marker->scaled(0.75f, 0.75f));
-
-    timezonesettings_widget->set_time_zone_location();
-
-    return timezonesettings_widget;
-}
-
-TimeZoneSettingsWidget::TimeZoneSettingsWidget()
-{
-    load_from_gml(time_zone_settings_widget_gml).release_value_but_fixme_should_propagate_errors();
+    m_time_zone_marker = TRY(time_zone_marker->scaled(0.75f, 0.75f));
 
     static auto time_zones = []() {
         Vector<StringView> time_zones;
@@ -81,6 +72,10 @@ TimeZoneSettingsWidget::TimeZoneSettingsWidget()
     m_time_zone_combo_box->on_change = [&](auto, auto) {
         set_modified(true);
     };
+
+    set_time_zone_location();
+
+    return {};
 }
 
 void TimeZoneSettingsWidget::second_paint_event(GUI::PaintEvent& event)
@@ -176,3 +171,5 @@ void TimeZoneSettingsWidget::set_time_zone()
 {
     GUI::Process::spawn_or_show_error(window(), "/bin/timezone"sv, Array { m_time_zone.characters() });
 }
+
+}

Userland/Applications/ClockSettings/TimeZoneSettingsWidget.gml

@@ -1,4 +1,4 @@
-@GUI::Frame {
+@ClockSettings::TimeZoneSettingsWidget {
     fill_with_background_color: true
     layout: @GUI::VerticalBoxLayout {
         margins: [10]

Userland/Applications/ClockSettings/TimeZoneSettingsWidget.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, Tim Flynn <[email protected]>
+ * Copyright (c) 2025, RatcheT2497 <[email protected]>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -13,13 +14,16 @@
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/Window.h>
 
+namespace ClockSettings {
+
 class TimeZoneSettingsWidget final : public GUI::SettingsWindow::Tab {
     C_OBJECT_ABSTRACT(TimeZoneSettingsWidget)
 public:
-    static ErrorOr<NonnullRefPtr<TimeZoneSettingsWidget>> create();
+    static ErrorOr<NonnullRefPtr<TimeZoneSettingsWidget>> try_create();
+    ErrorOr<void> initialize();
 
 private:
-    TimeZoneSettingsWidget();
+    TimeZoneSettingsWidget() = default;
 
     virtual void second_paint_event(GUI::PaintEvent&) override;
 
@@ -38,3 +42,5 @@ class TimeZoneSettingsWidget final : public GUI::SettingsWindow::Tab {
     Optional<Gfx::FloatPoint> m_time_zone_location;
     ByteString m_time_zone_text;
 };
+
+}

Userland/Applications/ClockSettings/main.cpp

@@ -36,8 +36,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     auto app_icon = GUI::Icon::default_icon("app-analog-clock"sv); // FIXME: Create a ClockSettings icon.
 
     auto window = TRY(GUI::SettingsWindow::create("Clock Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
-    (void)TRY(window->add_tab<ClockSettingsWidget>("Clock"_string, "clock"sv));
-    auto timezonesettings_widget = TRY(TimeZoneSettingsWidget::create());
+    (void)TRY(window->add_tab<ClockSettings::ClockSettingsWidget>("Clock"_string, "clock"sv));
+    auto timezonesettings_widget = TRY(ClockSettings::TimeZoneSettingsWidget::try_create());
     TRY(window->add_tab(timezonesettings_widget, "Time Zone"_string, "time-zone"sv));
 
     window->set_icon(app_icon.bitmap_for_size(16));

Userland/Applications/DisplaySettings/BackgroundSettings.gml

@@ -1,4 +1,4 @@
-@GUI::Widget {
+@DisplaySettings::BackgroundSettingsWidget {
     fill_with_background_color: true
     layout: @GUI::VerticalBoxLayout {
         margins: [8]

Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp

@@ -9,7 +9,6 @@
 #include "BackgroundSettingsWidget.h"
 #include <AK/LexicalPath.h>
 #include <AK/StringBuilder.h>
-#include <Applications/DisplaySettings/BackgroundSettingsGML.h>
 #include <LibConfig/Client.h>
 #include <LibCore/ConfigFile.h>
 #include <LibDesktop/Launcher.h>
@@ -31,29 +30,19 @@
 
 namespace DisplaySettings {
 
-ErrorOr<NonnullRefPtr<BackgroundSettingsWidget>> BackgroundSettingsWidget::try_create(bool& background_settings_changed)
+ErrorOr<void> BackgroundSettingsWidget::initialize()
 {
-    auto background_settings_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) BackgroundSettingsWidget(background_settings_changed)));
+    TRY(m_modes.try_append("Tile"_string));
+    TRY(m_modes.try_append("Center"_string));
+    TRY(m_modes.try_append("Stretch"_string));
 
-    TRY(background_settings_widget->m_modes.try_append("Tile"_string));
-    TRY(background_settings_widget->m_modes.try_append("Center"_string));
-    TRY(background_settings_widget->m_modes.try_append("Stretch"_string));
-
-    TRY(background_settings_widget->create_frame());
-    TRY(background_settings_widget->load_current_settings());
-
-    return background_settings_widget;
-}
-
-BackgroundSettingsWidget::BackgroundSettingsWidget(bool& background_settings_changed)
-    : m_background_settings_changed { background_settings_changed }
-{
+    TRY(create_frame());
+    TRY(load_current_settings());
+    return {};
 }
 
 ErrorOr<void> BackgroundSettingsWidget::create_frame()
 {
-    TRY(load_from_gml(background_settings_gml));
-
     m_monitor_widget = *find_descendant_of_type_named<DisplaySettings::MonitorWidget>("monitor_widget");
 
     m_wallpaper_view = *find_descendant_of_type_named<GUI::IconView>("wallpaper_view");
@@ -113,7 +102,6 @@ ErrorOr<void> BackgroundSettingsWidget::create_frame()
             return;
         m_wallpaper_view->selection().clear();
         m_monitor_widget->set_wallpaper(MUST(String::from_byte_string(response.release_value().filename())));
-        m_background_settings_changed = true;
         set_modified(true);
     };
 
@@ -123,7 +111,6 @@ ErrorOr<void> BackgroundSettingsWidget::create_frame()
     bool first_mode_change = true;
     m_mode_combo->on_change = [this, first_mode_change](auto&, const GUI::ModelIndex& index) mutable {
         m_monitor_widget->set_wallpaper_mode(m_modes.at(index.row()));
-        m_background_settings_changed = !first_mode_change;
         first_mode_change = false;
         set_modified(true);
     };
@@ -134,7 +121,6 @@ ErrorOr<void> BackgroundSettingsWidget::create_frame()
     bool first_color_change = true;
     m_color_input->on_change = [this, first_color_change]() mutable {
         m_monitor_widget->set_background_color(m_color_input->color());
-        m_background_settings_changed = !first_color_change;
         first_color_change = false;
         set_modified(true);
     };
@@ -172,7 +158,6 @@ ErrorOr<void> BackgroundSettingsWidget::load_current_settings()
 
     m_color_input->set_color(palette_desktop_color, GUI::AllowCallback::No);
     m_monitor_widget->set_background_color(palette_desktop_color);
-    m_background_settings_changed = false;
 
     return {};
 }

Userland/Applications/DisplaySettings/BackgroundSettingsWidget.h

@@ -2,6 +2,7 @@
  * Copyright (c) 2019-2020, Jesse Buhagiar <[email protected]>
  * Copyright (c) 2021, Andreas Kling <[email protected]>
  * Copyright (c) 2022, the SerenityOS developers.
+ * Copyright (c) 2025, RatcheT2497 <[email protected]>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -23,21 +24,20 @@ class BackgroundSettingsWidget : public GUI::SettingsWindow::Tab {
     C_OBJECT_ABSTRACT(BackgroundSettingsWidget);
 
 public:
-    static ErrorOr<NonnullRefPtr<BackgroundSettingsWidget>> try_create(bool& background_settings_changed);
+    static ErrorOr<NonnullRefPtr<BackgroundSettingsWidget>> try_create();
     virtual ~BackgroundSettingsWidget() override = default;
+    ErrorOr<void> initialize();
 
     virtual void apply_settings() override;
 
 private:
-    BackgroundSettingsWidget(bool& background_settings_changed);
+    BackgroundSettingsWidget() = default;
 
     ErrorOr<void> create_frame();
     ErrorOr<void> load_current_settings();
 
     Vector<String> m_modes;
 
-    bool& m_background_settings_changed;
-
     RefPtr<DisplaySettings::MonitorWidget> m_monitor_widget;
     RefPtr<GUI::IconView> m_wallpaper_view;
     RefPtr<GUI::ComboBox> m_mode_combo;

Userland/Applications/DisplaySettings/CMakeLists.txt

@@ -4,12 +4,12 @@ serenity_component(
     TARGETS DisplaySettings
 )
 
-stringify_gml(BackgroundSettings.gml BackgroundSettingsGML.h background_settings_gml)
-stringify_gml(DesktopSettings.gml DesktopSettingsGML.h desktop_settings_gml)
-stringify_gml(EffectsSettings.gml EffectsSettingsGML.h effects_settings_gml)
-stringify_gml(FontSettings.gml FontSettingsGML.h font_settings_gml)
-stringify_gml(MonitorSettings.gml MonitorSettingsGML.h monitor_settings_window_gml)
-stringify_gml(ThemesSettings.gml ThemesSettingsGML.h themes_settings_gml)
+compile_gml(BackgroundSettings.gml BackgroundSettingsGML.cpp)
+compile_gml(DesktopSettings.gml DesktopSettingsGML.cpp)
+compile_gml(EffectsSettings.gml EffectsSettingsGML.cpp)
+compile_gml(FontSettings.gml FontSettingsGML.cpp)
+compile_gml(MonitorSettings.gml MonitorSettingsGML.cpp)
+compile_gml(ThemesSettings.gml ThemesSettingsGML.cpp)
 
 set(SOURCES
     BackgroundSettingsWidget.cpp
@@ -20,17 +20,15 @@ set(SOURCES
     MonitorWidget.cpp
     ThemePreviewWidget.cpp
     ThemesSettingsWidget.cpp
+    BackgroundSettingsGML.cpp
+    DesktopSettingsGML.cpp
+    EffectsSettingsGML.cpp
+    FontSettingsGML.cpp
+    MonitorSettingsGML.cpp
+    ThemesSettingsGML.cpp
     main.cpp
 )
 
-set(GENERATED_SOURCES
-    BackgroundSettingsGML.h
-    DesktopSettingsGML.h
-    EffectsSettingsGML.h
-    FontSettingsGML.h
-    MonitorSettingsGML.h
-    ThemesSettingsGML.h
-)
 
 serenity_app(DisplaySettings ICON app-display-settings)
 target_link_libraries(DisplaySettings PRIVATE LibCore LibDesktop LibGfx LibGUI LibConfig LibIPC LibMain LibEDID LibThreading LibFileSystemAccessClient LibURL)