mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 15:57: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
|
@ -61,13 +61,6 @@ void CardGamePreview::paint_event(GUI::PaintEvent& event)
|
|||
stack->paint(painter, background_color);
|
||||
}
|
||||
|
||||
ErrorOr<NonnullRefPtr<CardSettingsWidget>> CardSettingsWidget::create()
|
||||
{
|
||||
auto card_settings_widget = TRY(try_create());
|
||||
TRY(card_settings_widget->initialize());
|
||||
return card_settings_widget;
|
||||
}
|
||||
|
||||
ErrorOr<void> CardSettingsWidget::initialize()
|
||||
{
|
||||
auto background_color = Gfx::Color::from_string(Config::read_string("Games"sv, "Cards"sv, "BackgroundColor"sv)).value_or(Gfx::Color::from_rgb(0x008000));
|
||||
|
|
|
@ -21,7 +21,7 @@ class CardSettingsWidget final : public GUI::SettingsWindow::Tab {
|
|||
C_OBJECT_ABSTRACT(CardSettingsWidget)
|
||||
public:
|
||||
static ErrorOr<NonnullRefPtr<CardSettingsWidget>> try_create();
|
||||
static ErrorOr<NonnullRefPtr<CardSettingsWidget>> create();
|
||||
ErrorOr<void> initialize();
|
||||
virtual ~CardSettingsWidget() override = default;
|
||||
|
||||
virtual void apply_settings() override;
|
||||
|
@ -29,7 +29,6 @@ public:
|
|||
|
||||
private:
|
||||
CardSettingsWidget() = default;
|
||||
ErrorOr<void> initialize();
|
||||
|
||||
bool set_card_back_image_path(StringView);
|
||||
String card_back_image_path() const;
|
||||
|
|
|
@ -231,13 +231,6 @@ void ChessGamePreview::paint_event(GUI::PaintEvent& event)
|
|||
}
|
||||
}
|
||||
|
||||
ErrorOr<NonnullRefPtr<ChessSettingsWidget>> ChessSettingsWidget::create()
|
||||
{
|
||||
auto chess_settings_widget = TRY(try_create());
|
||||
TRY(chess_settings_widget->initialize());
|
||||
return chess_settings_widget;
|
||||
}
|
||||
|
||||
ErrorOr<void> ChessSettingsWidget::initialize()
|
||||
{
|
||||
auto piece_set_name = Config::read_string("Games"sv, "Chess"sv, "PieceSet"sv, "Classic"sv);
|
||||
|
|
|
@ -18,7 +18,7 @@ class ChessSettingsWidget final : public GUI::SettingsWindow::Tab {
|
|||
C_OBJECT_ABSTRACT(ChessSettingsWidget)
|
||||
public:
|
||||
static ErrorOr<NonnullRefPtr<ChessSettingsWidget>> try_create();
|
||||
static ErrorOr<NonnullRefPtr<ChessSettingsWidget>> create();
|
||||
ErrorOr<void> initialize();
|
||||
virtual ~ChessSettingsWidget() override = default;
|
||||
|
||||
virtual void apply_settings() override;
|
||||
|
@ -26,7 +26,6 @@ public:
|
|||
|
||||
private:
|
||||
ChessSettingsWidget() = default;
|
||||
ErrorOr<void> initialize();
|
||||
|
||||
Vector<ByteString> m_piece_sets;
|
||||
|
||||
|
|
|
@ -35,10 +35,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
auto window = TRY(GUI::SettingsWindow::create("Games Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
|
||||
window->set_icon(app_icon.bitmap_for_size(16));
|
||||
auto widget_cards = TRY(GamesSettings::CardSettingsWidget::create());
|
||||
auto widget_chess = TRY(GamesSettings::ChessSettingsWidget::create());
|
||||
(void)TRY(window->add_tab(widget_cards, "Cards"_string, "cards"sv));
|
||||
(void)TRY(window->add_tab(widget_chess, "Chess"_string, "chess"sv));
|
||||
(void)TRY(window->add_tab<GamesSettings::CardSettingsWidget>("Cards"_string, "cards"sv));
|
||||
(void)TRY(window->add_tab<GamesSettings::ChessSettingsWidget>("Chess"_string, "chess"sv));
|
||||
window->set_active_tab(selected_tab);
|
||||
|
||||
window->show();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue