mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 10:27:36 +00:00
Userland: Port to automatic GML initializer where possible
This commit is contained in:
parent
dec066fa5c
commit
adc845e0cb
41 changed files with 148 additions and 245 deletions
|
@ -14,13 +14,6 @@
|
|||
|
||||
namespace MapsSettings {
|
||||
|
||||
ErrorOr<NonnullRefPtr<MapsSettingsWidget>> MapsSettingsWidget::create()
|
||||
{
|
||||
auto widget = TRY(try_create());
|
||||
TRY(widget->setup());
|
||||
return widget;
|
||||
}
|
||||
|
||||
void MapsSettingsWidget::apply_settings()
|
||||
{
|
||||
// Tile Provider
|
||||
|
@ -43,7 +36,7 @@ void MapsSettingsWidget::reset_default_values()
|
|||
set_tile_provider(Maps::default_tile_provider_url_format);
|
||||
}
|
||||
|
||||
ErrorOr<void> MapsSettingsWidget::setup()
|
||||
ErrorOr<void> MapsSettingsWidget::initialize()
|
||||
{
|
||||
// Tile Provider
|
||||
Vector<GUI::JsonArrayModel::FieldSpec> tile_provider_fields;
|
||||
|
|
|
@ -14,16 +14,15 @@ class MapsSettingsWidget final : public GUI::SettingsWindow::Tab {
|
|||
C_OBJECT_ABSTRACT(MapsSettingsWidget)
|
||||
|
||||
public:
|
||||
static ErrorOr<NonnullRefPtr<MapsSettingsWidget>> create();
|
||||
static ErrorOr<NonnullRefPtr<MapsSettingsWidget>> try_create();
|
||||
ErrorOr<void> initialize();
|
||||
|
||||
virtual void apply_settings() override;
|
||||
virtual void reset_default_values() override;
|
||||
|
||||
private:
|
||||
MapsSettingsWidget() = default;
|
||||
static ErrorOr<NonnullRefPtr<MapsSettingsWidget>> try_create();
|
||||
|
||||
ErrorOr<void> setup();
|
||||
void set_tile_provider(StringView url);
|
||||
|
||||
RefPtr<GUI::ComboBox> m_tile_provider_combobox;
|
||||
|
|
|
@ -27,7 +27,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
auto window = TRY(GUI::SettingsWindow::create("Maps Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
|
||||
window->set_icon(app_icon.bitmap_for_size(16));
|
||||
|
||||
(void)TRY(window->add_tab(TRY(MapsSettings::MapsSettingsWidget::create()), "Maps"_string, "maps"sv));
|
||||
(void)TRY(window->add_tab<MapsSettings::MapsSettingsWidget>("Maps"_string, "maps"sv));
|
||||
|
||||
window->show();
|
||||
return app->exec();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue