diff --git a/Userland/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp index 78842f55e7..a3c2709643 100644 --- a/Userland/Games/Chess/main.cpp +++ b/Userland/Games/Chess/main.cpp @@ -32,7 +32,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = GUI::Icon::default_icon("app-chess"); auto window = TRY(GUI::Window::try_create()); - auto& widget = window->set_main_widget(); + auto widget = TRY(window->try_set_main_widget()); TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/bin/ChessEngine", "x")); @@ -48,145 +48,145 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_icon(app_icon.bitmap_for_size(16)); - widget.set_piece_set(Config::read_string("Chess", "Style", "PieceSet", "stelar7")); - widget.set_board_theme(Config::read_string("Chess", "Style", "BoardTheme", "Beige")); - widget.set_coordinates(Config::read_bool("Chess", "Style", "Coordinates", true)); - widget.set_show_available_moves(Config::read_bool("Chess", "Style", "ShowAvailableMoves", true)); + widget->set_piece_set(Config::read_string("Chess", "Style", "PieceSet", "stelar7")); + widget->set_board_theme(Config::read_string("Chess", "Style", "BoardTheme", "Beige")); + widget->set_coordinates(Config::read_bool("Chess", "Style", "Coordinates", true)); + widget->set_show_available_moves(Config::read_bool("Chess", "Style", "ShowAvailableMoves", true)); - auto& game_menu = window->add_menu("&Game"); + auto game_menu = TRY(window->try_add_menu("&Game")); - game_menu.add_action(GUI::Action::create("&Resign", { Mod_None, Key_F3 }, [&](auto&) { - widget.resign(); - })); - game_menu.add_action(GUI::Action::create("&Flip Board", { Mod_Ctrl, Key_F }, [&](auto&) { - widget.flip_board(); - })); - game_menu.add_separator(); + TRY(game_menu->try_add_action(GUI::Action::create("&Resign", { Mod_None, Key_F3 }, [&](auto&) { + widget->resign(); + }))); + TRY(game_menu->try_add_action(GUI::Action::create("&Flip Board", { Mod_Ctrl, Key_F }, [&](auto&) { + widget->flip_board(); + }))); + TRY(game_menu->try_add_separator()); - game_menu.add_action(GUI::Action::create("&Import PGN...", { Mod_Ctrl, Key_O }, [&](auto&) { + TRY(game_menu->try_add_action(GUI::Action::create("&Import PGN...", { Mod_Ctrl, Key_O }, [&](auto&) { Optional import_path = GUI::FilePicker::get_open_filepath(window); if (!import_path.has_value()) return; - if (!widget.import_pgn(import_path.value())) { + if (!widget->import_pgn(import_path.value())) { GUI::MessageBox::show(window, "Unable to import game.\n", "Error", GUI::MessageBox::Type::Error); return; } dbgln("Imported PGN file from {}", import_path.value()); - })); - game_menu.add_action(GUI::Action::create("&Export PGN...", { Mod_Ctrl, Key_S }, [&](auto&) { + }))); + TRY(game_menu->try_add_action(GUI::Action::create("&Export PGN...", { Mod_Ctrl, Key_S }, [&](auto&) { Optional export_path = GUI::FilePicker::get_save_filepath(window, "Untitled", "pgn"); if (!export_path.has_value()) return; - if (!widget.export_pgn(export_path.value())) { + if (!widget->export_pgn(export_path.value())) { GUI::MessageBox::show(window, "Unable to export game.\n", "Error", GUI::MessageBox::Type::Error); return; } dbgln("Exported PGN file to {}", export_path.value()); - })); - game_menu.add_action(GUI::Action::create("&Copy FEN", { Mod_Ctrl, Key_C }, [&](auto&) { - GUI::Clipboard::the().set_data(widget.get_fen().bytes()); + }))); + TRY(game_menu->try_add_action(GUI::Action::create("&Copy FEN", { Mod_Ctrl, Key_C }, [&](auto&) { + GUI::Clipboard::the().set_data(widget->get_fen().bytes()); GUI::MessageBox::show(window, "Board state copied to clipboard as FEN.", "Copy FEN", GUI::MessageBox::Type::Information); - })); - game_menu.add_separator(); + }))); + TRY(game_menu->try_add_separator()); - game_menu.add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) { - if (widget.board().game_result() == Chess::Board::Result::NotFinished) { - if (widget.resign() < 0) + TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) { + if (widget->board().game_result() == Chess::Board::Result::NotFinished) { + if (widget->resign() < 0) return; } - widget.reset(); - })); - game_menu.add_separator(); - game_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { + widget->reset(); + }))); + TRY(game_menu->try_add_separator()); + TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); - })); + }))); - auto& style_menu = window->add_menu("&Style"); + auto style_menu = TRY(window->try_add_menu("&Style")); GUI::ActionGroup piece_set_action_group; piece_set_action_group.set_exclusive(true); - auto& piece_set_menu = style_menu.add_submenu("&Piece Set"); - piece_set_menu.set_icon(app_icon.bitmap_for_size(16)); + auto piece_set_menu = TRY(style_menu->try_add_submenu("&Piece Set")); + piece_set_menu->set_icon(app_icon.bitmap_for_size(16)); Core::DirIterator di("/res/icons/chess/sets/", Core::DirIterator::SkipParentAndBaseDir); while (di.has_next()) { auto set = di.next_path(); auto action = GUI::Action::create_checkable(set, [&](auto& action) { - widget.set_piece_set(action.text()); - widget.update(); + widget->set_piece_set(action.text()); + widget->update(); Config::write_string("Chess", "Style", "PieceSet", action.text()); }); piece_set_action_group.add_action(*action); - if (widget.piece_set() == set) + if (widget->piece_set() == set) action->set_checked(true); - piece_set_menu.add_action(*action); + TRY(piece_set_menu->try_add_action(*action)); } GUI::ActionGroup board_theme_action_group; board_theme_action_group.set_exclusive(true); - auto& board_theme_menu = style_menu.add_submenu("Board Theme"); - board_theme_menu.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/chess/mini-board.png").release_value_but_fixme_should_propagate_errors()); + auto board_theme_menu = TRY(style_menu->try_add_submenu("Board Theme")); + board_theme_menu->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/chess/mini-board.png").release_value_but_fixme_should_propagate_errors()); for (auto& theme : Vector({ "Beige", "Green", "Blue" })) { auto action = GUI::Action::create_checkable(theme, [&](auto& action) { - widget.set_board_theme(action.text()); - widget.update(); + widget->set_board_theme(action.text()); + widget->update(); Config::write_string("Chess", "Style", "BoardTheme", action.text()); }); board_theme_action_group.add_action(*action); - if (widget.board_theme().name == theme) + if (widget->board_theme().name == theme) action->set_checked(true); - board_theme_menu.add_action(*action); + TRY(board_theme_menu->try_add_action(*action)); } auto coordinates_action = GUI::Action::create_checkable("Coordinates", [&](auto& action) { - widget.set_coordinates(action.is_checked()); - widget.update(); + widget->set_coordinates(action.is_checked()); + widget->update(); Config::write_bool("Chess", "Style", "Coordinates", action.is_checked()); }); - coordinates_action->set_checked(widget.coordinates()); - style_menu.add_action(coordinates_action); + coordinates_action->set_checked(widget->coordinates()); + TRY(style_menu->try_add_action(coordinates_action)); auto show_available_moves_action = GUI::Action::create_checkable("Show Available Moves", [&](auto& action) { - widget.set_show_available_moves(action.is_checked()); - widget.update(); + widget->set_show_available_moves(action.is_checked()); + widget->update(); Config::write_bool("Chess", "Style", "ShowAvailableMoves", action.is_checked()); }); - show_available_moves_action->set_checked(widget.show_available_moves()); - style_menu.add_action(show_available_moves_action); + show_available_moves_action->set_checked(widget->show_available_moves()); + TRY(style_menu->try_add_action(show_available_moves_action)); - auto& engine_menu = window->add_menu("&Engine"); + auto engine_menu = TRY(window->try_add_menu("&Engine")); GUI::ActionGroup engines_action_group; engines_action_group.set_exclusive(true); - auto& engine_submenu = engine_menu.add_submenu("&Engine"); + auto engine_submenu = TRY(engine_menu->try_add_submenu("&Engine")); for (auto& engine : Vector({ "Human", "ChessEngine" })) { auto action = GUI::Action::create_checkable(engine, [&](auto& action) { if (action.text() == "Human") { - widget.set_engine(nullptr); + widget->set_engine(nullptr); } else { - widget.set_engine(Engine::construct(action.text())); - widget.input_engine_move(); + widget->set_engine(Engine::construct(action.text())); + widget->input_engine_move(); } }); engines_action_group.add_action(*action); if (engine == String("Human")) action->set_checked(true); - engine_submenu.add_action(*action); + TRY(engine_submenu->try_add_action(*action)); } - auto& help_menu = window->add_menu("&Help"); - help_menu.add_action(GUI::CommonActions::make_about_action("Chess", app_icon, window)); + auto help_menu = TRY(window->try_add_menu("&Help")); + TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Chess", app_icon, window))); window->show(); - widget.reset(); + widget->reset(); return app->exec(); }