1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:07:45 +00:00

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

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

View file

@ -141,7 +141,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->set_most_recently_open_file(file.filename());
};
auto file_menu = TRY(window->try_add_menu("&File"));
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
auto response = FileSystemAccessClient::Client::the().save_file(window, "Untitled", "gml");
@ -218,7 +218,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
app->quit();
})));
auto edit_menu = TRY(window->try_add_menu("&Edit"));
auto edit_menu = TRY(window->try_add_menu("&Edit"_short_string));
TRY(edit_menu->try_add_action(editor->undo_action()));
TRY(edit_menu->try_add_action(editor->redo_action()));
TRY(edit_menu->try_add_separator());
@ -253,7 +253,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
vim_emulation_setting_action->set_checked(false);
TRY(edit_menu->try_add_action(vim_emulation_setting_action));
auto view_menu = TRY(window->try_add_menu("&View"));
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
GUI::ActionGroup views_group;
views_group.set_exclusive(true);
views_group.set_unchecking_allowed(false);
@ -285,7 +285,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
view_frame_action->activate();
};
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/man1/GMLPlayground.md"), "/bin/Help");

View file

@ -1409,7 +1409,7 @@ void HackStudioWidget::update_recent_projects_submenu()
ErrorOr<void> HackStudioWidget::create_file_menu(GUI::Window& window)
{
auto& file_menu = window.add_menu("&File");
auto& file_menu = window.add_menu("&File"_short_string);
auto& new_submenu = file_menu.add_submenu("&New...");
new_submenu.add_action(*m_new_project_action);
@ -1444,7 +1444,7 @@ ErrorOr<void> HackStudioWidget::create_file_menu(GUI::Window& window)
ErrorOr<void> HackStudioWidget::create_edit_menu(GUI::Window& window)
{
auto& edit_menu = window.add_menu("&Edit");
auto& edit_menu = window.add_menu("&Edit"_short_string);
auto icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv));
edit_menu.add_action(GUI::Action::create("&Find in Files...", { Mod_Ctrl | Mod_Shift, Key_F }, icon, [this](auto&) {
reveal_action_tab(*m_find_in_files_widget);
@ -1472,7 +1472,7 @@ ErrorOr<void> HackStudioWidget::create_edit_menu(GUI::Window& window)
void HackStudioWidget::create_build_menu(GUI::Window& window)
{
auto& build_menu = window.add_menu("&Build");
auto& build_menu = window.add_menu("&Build"_short_string);
build_menu.add_action(*m_build_action);
build_menu.add_separator();
build_menu.add_action(*m_run_action);
@ -1495,7 +1495,7 @@ ErrorOr<void> HackStudioWidget::create_view_menu(GUI::Window& window)
});
show_dotfiles_action->set_checked(Config::read_bool("HackStudio"sv, "Global"sv, "ShowDotfiles"sv, false));
auto& view_menu = window.add_menu("&View");
auto& view_menu = window.add_menu("&View"_short_string);
view_menu.add_action(hide_action_tabs_action);
view_menu.add_action(open_locator_action);
view_menu.add_action(show_dotfiles_action);
@ -1574,7 +1574,7 @@ ErrorOr<void> HackStudioWidget::create_view_menu(GUI::Window& window)
void HackStudioWidget::create_help_menu(GUI::Window& window)
{
auto& help_menu = window.add_menu("&Help");
auto& help_menu = window.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("Hack Studio", GUI::Icon::default_icon("app-hack-studio"sv), &window));
}

View file

@ -89,10 +89,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->resize(685, 500);
window->set_icon(app_icon.bitmap_for_size(16));
auto& file_menu = window->add_menu("&File");
auto& file_menu = window->add_menu("&File"_short_string);
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = window->add_menu("&Help");
auto& help_menu = window->add_menu("&Help"_short_string);
help_menu.add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Inspector.md"), "/bin/Help");

View file

@ -265,10 +265,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
filesystem_events_tree_view->set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows);
filesystem_events_tree_view->set_model(profile->file_event_model());
auto file_menu = TRY(window->try_add_menu("&File"));
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
TRY(file_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));
auto invert_action = GUI::Action::create_checkable("&Invert Tree", { Mod_Ctrl, Key_I }, [&](auto& action) {
profile->set_inverted(action.is_checked());
@ -294,7 +294,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(view_menu->try_add_action(disassembly_action));
TRY(view_menu->try_add_action(source_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/man1/Profiler.md"), "/bin/Help");

View file

@ -293,7 +293,7 @@ MainWidget::MainWidget()
void MainWidget::initialize_menu(GUI::Window* window)
{
auto& file_menu = window->add_menu("&File");
auto& file_menu = window->add_menu("&File"_short_string);
file_menu.add_action(*m_new_action);
file_menu.add_action(*m_open_action);
file_menu.add_action(*m_save_action);
@ -304,7 +304,7 @@ void MainWidget::initialize_menu(GUI::Window* window)
GUI::Application::the()->quit();
}));
auto& edit_menu = window->add_menu("&Edit");
auto& edit_menu = window->add_menu("&Edit"_short_string);
edit_menu.add_action(*m_copy_action);
edit_menu.add_action(*m_cut_action);
edit_menu.add_action(*m_paste_action);
@ -314,7 +314,7 @@ void MainWidget::initialize_menu(GUI::Window* window)
edit_menu.add_separator();
edit_menu.add_action(*m_run_script_action);
auto& help_menu = window->add_menu("&Help");
auto& help_menu = window->add_menu("&Help"_short_string);
help_menu.add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/SQLStudio.md"), "/bin/Help");