mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 00:57:45 +00:00
LibGUI: Remove Menu::try_add_action()
And fall back to the infallible add_action().
This commit is contained in:
parent
eec328e2ab
commit
f2faf2767f
51 changed files with 758 additions and 769 deletions
|
@ -199,34 +199,34 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
auto game_menu = TRY(window->try_add_menu("&Game"_string));
|
||||
|
||||
TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) {
|
||||
game_menu->add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) {
|
||||
if (!confirm_end_current_game())
|
||||
return;
|
||||
|
||||
game.setup(mode);
|
||||
})));
|
||||
}));
|
||||
game_menu->add_separator();
|
||||
auto undo_action = GUI::CommonActions::make_undo_action([&](auto&) {
|
||||
game.perform_undo();
|
||||
});
|
||||
undo_action->set_enabled(false);
|
||||
TRY(game_menu->try_add_action(undo_action));
|
||||
game_menu->add_action(undo_action);
|
||||
game_menu->add_separator();
|
||||
TRY(game_menu->try_add_action(TRY(Cards::make_cards_settings_action(window))));
|
||||
TRY(game_menu->try_add_action(single_card_draw_action));
|
||||
TRY(game_menu->try_add_action(three_card_draw_action));
|
||||
game_menu->add_action(TRY(Cards::make_cards_settings_action(window)));
|
||||
game_menu->add_action(single_card_draw_action);
|
||||
game_menu->add_action(three_card_draw_action);
|
||||
game_menu->add_separator();
|
||||
TRY(game_menu->try_add_action(toggle_auto_collect_action));
|
||||
game_menu->add_action(toggle_auto_collect_action);
|
||||
game_menu->add_separator();
|
||||
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
||||
game_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
|
||||
|
||||
auto help_menu = TRY(window->try_add_menu("&Help"_string));
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window)));
|
||||
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
|
||||
help_menu->add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window));
|
||||
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {
|
||||
help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {
|
||||
Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help");
|
||||
})));
|
||||
}));
|
||||
|
||||
window->set_resizable(false);
|
||||
window->resize(Solitaire::Game::width, Solitaire::Game::height + statusbar.max_height().as_int());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue