RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 22:17:44 +00:00
Code Issues Activity Actions

LibGUI+Userland: Make Window::*add_menu take name using new string

Browse source
This commit is contained in:
Karol Kosek 2023-04-16 11:56:01 +02:00 • committed by Andreas Kling
parent 60a338758c
commit 969543a847
52 changed files with 162 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/2048/main.cpp
View file

@ -169,7 +169,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
};
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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&) {
start_a_new_game();
@ -201,7 +201,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/2048.md"), "/bin/Help");

4
Userland/Games/BrickGame/main.cpp
View file

@ -51,7 +51,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto game = TRY(window->set_main_widget<BrickGame>(app_name));
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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->reset();
@ -73,7 +73,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help");

6
Userland/Games/Chess/main.cpp
View file

@ -57,7 +57,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
widget->set_coordinates(Config::read_bool("Games"sv, "Chess"sv, "ShowCoordinates"sv, true));
widget->set_show_available_moves(Config::read_bool("Games"sv, "Chess"sv, "ShowAvailableMoves"sv, true));
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_string));
TRY(game_menu->try_add_action(GUI::Action::create("&Resign", { Mod_None, Key_F3 }, [&](auto&) {
widget->resign();
@ -123,7 +123,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto engine_menu = TRY(window->try_add_menu("&Engine"));
auto engine_menu = TRY(window->try_add_menu("&Engine"_short_string));
GUI::ActionGroup engines_action_group;
engines_action_group.set_exclusive(true);
@ -144,7 +144,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(engine_submenu->try_add_action(*action));
}
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Chess.md"), "/bin/Help");

4
Userland/Games/ColorLines/main.cpp
View file

@ -50,7 +50,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto game = TRY(window->set_main_widget<ColorLines>(app_name));
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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->reset();
@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help");

4
Userland/Games/FlappyBug/main.cpp
View file

@ -55,12 +55,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return high_score;
};
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_string));
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/FlappyBug.md"), "/bin/Help");

4
Userland/Games/Flood/main.cpp
View file

@ -167,7 +167,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
};
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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&) {
start_a_new_game();
@ -183,7 +183,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Flood.md"), "/bin/Help");

4
Userland/Games/GameOfLife/main.cpp
View file

@ -126,7 +126,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
rotate_pattern_action->set_enabled(false);
(void)TRY(main_toolbar.try_add_action(rotate_pattern_action));
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_string));
TRY(game_menu->try_add_action(clear_board_action));
TRY(game_menu->try_add_action(randomize_cells_action));
@ -138,7 +138,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/GameOfLife.md"), "/bin/Help");

4
Userland/Games/Hearts/main.cpp
View file

@ -88,7 +88,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::MessageBox::show(settings_dialog, "Settings have been successfully saved and will take effect in the next game."sv, "Settings Changed Successfully"sv, GUI::MessageBox::Type::Information);
};
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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.setup(player_name);
@ -101,7 +101,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(game_menu->try_add_separator());
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Hearts.md"), "/bin/Help");

8
Userland/Games/MasterWord/main.cpp
View file

@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_focused_widget(&game);
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_string));
TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) {
game.reset();
@ -71,7 +71,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto settings_menu = TRY(window->try_add_menu("&Settings"));
auto settings_menu = TRY(window->try_add_menu(TRY("&Settings"_string)));
TRY(settings_menu->try_add_action(GUI::Action::create("Set &Word Length...", [&](auto&) {
auto word_length = Config::read_i32("MasterWord"sv, ""sv, "word_length"sv, 5);
@ -98,7 +98,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
toggle_check_guesses->set_checked(game.is_checking_guesses());
TRY(settings_menu->try_add_action(toggle_check_guesses));
auto theme_menu = TRY(window->try_add_menu("&Theme"));
auto theme_menu = TRY(window->try_add_menu("&Theme"_short_string));
auto system_theme_action = GUI::Action::create("&System", [&](auto&) {
game.set_use_system_theme(true);
Config::write_bool("MasterWord"sv, ""sv, "use_system_theme"sv, true);
@ -121,7 +121,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
theme_actions.add_action(system_theme_action);
theme_actions.add_action(wordle_theme_action);
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/MasterWord.md"), "/bin/Help");

6
Userland/Games/Minesweeper/main.cpp
View file

@ -58,7 +58,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto field = TRY(Field::create(flag_label, time_label, face_button));
TRY(widget->try_add_child(field));
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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&) {
field->reset();
@ -78,7 +78,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto difficulty_menu = TRY(window->try_add_menu("&Difficulty"));
auto difficulty_menu = TRY(window->try_add_menu(TRY("&Difficulty"_string)));
GUI::ActionGroup difficulty_actions;
difficulty_actions.set_exclusive(true);
@ -118,7 +118,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(difficulty_menu->try_add_action(action));
difficulty_actions.add_action(action);
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Minesweeper.md"), "/bin/Help");

4
Userland/Games/Snake/main.cpp
View file

@ -77,7 +77,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return true;
};
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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.reset();
@ -144,7 +144,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit();
})));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Snake.md"), "/bin/Help");

4
Userland/Games/Solitaire/main.cpp
View file

@ -204,7 +204,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
toggle_auto_collect_action->set_checked(game.is_auto_collecting());
toggle_auto_collect_action->set_status_tip("Auto-collect to foundation piles");
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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&) {
if (!confirm_end_current_game())
@ -227,7 +227,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(game_menu->try_add_separator());
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_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)));

6
Userland/Games/Spider/main.cpp
View file

@ -246,7 +246,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
two_suit_action->set_checked(mode == Spider::Mode::TwoSuit);
suit_actions.add_action(two_suit_action);
auto game_menu = TRY(window->try_add_menu("&Game"));
auto game_menu = TRY(window->try_add_menu("&Game"_short_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&) {
if (!confirm_end_current_game())
return;
@ -266,7 +266,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(game_menu->try_add_separator());
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
auto view_menu = TRY(window->try_add_menu("&View"));
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
GUI::ActionGroup statistic_display_actions;
statistic_display_actions.set_exclusive(true);
@ -288,7 +288,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(view_menu->try_add_action(high_score_action));
TRY(view_menu->try_add_action(best_time_actions));
auto help_menu = TRY(window->try_add_menu("&Help"));
auto help_menu = TRY(window->try_add_menu("&Help"_short_string));
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_about_action("Spider", app_icon, window));