mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-15 12:23:15 +00:00
LibGUI+Userland: Make Window::*add_menu take name using new string
This commit is contained in:
parent
60a338758c
commit
969543a847
|
@ -375,7 +375,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
time.set_x(widget->width() - time.width() - 6);
|
time.set_x(widget->width() - time.width() - 6);
|
||||||
widget->set_stat_label(time);
|
widget->set_stat_label(time);
|
||||||
|
|
||||||
auto& file_menu = window->add_menu("&File");
|
auto& file_menu = window->add_menu("&File"_short_string);
|
||||||
|
|
||||||
file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
||||||
auto response = FileSystemAccessClient::Client::the().open_file(window);
|
auto response = FileSystemAccessClient::Client::the().open_file(window);
|
||||||
|
@ -390,7 +390,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
app->quit();
|
app->quit();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
auto& view_menu = window->add_menu("&View");
|
auto& view_menu = window->add_menu("&View"_short_string);
|
||||||
view_menu.add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
|
view_menu.add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
|
||||||
window->set_fullscreen(!window->is_fullscreen());
|
window->set_fullscreen(!window->is_fullscreen());
|
||||||
}));
|
}));
|
||||||
|
@ -448,7 +448,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
view_menu.add_action(*show_frame_rate_action);
|
view_menu.add_action(*show_frame_rate_action);
|
||||||
|
|
||||||
auto& texture_menu = window->add_menu("&Texture");
|
auto& texture_menu = window->add_menu(TRY("&Texture"_string));
|
||||||
|
|
||||||
auto texture_enabled_action = GUI::Action::create_checkable("&Enable Texture", [&widget](auto& action) {
|
auto texture_enabled_action = GUI::Action::create_checkable("&Enable Texture", [&widget](auto& action) {
|
||||||
widget->set_texture_enabled(action.is_checked());
|
widget->set_texture_enabled(action.is_checked());
|
||||||
|
@ -562,7 +562,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
texture_mag_filter_nearest_action->set_checked(true);
|
texture_mag_filter_nearest_action->set_checked(true);
|
||||||
|
|
||||||
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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("3D File Viewer", app_icon, window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("3D File Viewer", app_icon, window));
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,7 @@ BrowserWindow::BrowserWindow(CookieJar& cookie_jar, URL url)
|
||||||
|
|
||||||
void BrowserWindow::build_menus()
|
void BrowserWindow::build_menus()
|
||||||
{
|
{
|
||||||
auto& file_menu = add_menu("&File");
|
auto& file_menu = add_menu("&File"_short_string);
|
||||||
file_menu.add_action(WindowActions::the().create_new_tab_action());
|
file_menu.add_action(WindowActions::the().create_new_tab_action());
|
||||||
file_menu.add_action(WindowActions::the().create_new_window_action());
|
file_menu.add_action(WindowActions::the().create_new_window_action());
|
||||||
|
|
||||||
|
@ -169,7 +169,7 @@ void BrowserWindow::build_menus()
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
auto& view_menu = add_menu("&View");
|
auto& view_menu = add_menu("&View"_short_string);
|
||||||
view_menu.add_action(WindowActions::the().show_bookmarks_bar_action());
|
view_menu.add_action(WindowActions::the().show_bookmarks_bar_action());
|
||||||
view_menu.add_action(WindowActions::the().vertical_tabs_action());
|
view_menu.add_action(WindowActions::the().vertical_tabs_action());
|
||||||
view_menu.add_separator();
|
view_menu.add_separator();
|
||||||
|
@ -221,7 +221,7 @@ void BrowserWindow::build_menus()
|
||||||
m_reload_action = GUI::CommonActions::make_reload_action([this](auto&) { active_tab().reload(); }, this);
|
m_reload_action = GUI::CommonActions::make_reload_action([this](auto&) { active_tab().reload(); }, this);
|
||||||
m_reload_action->set_status_tip("Reload current page");
|
m_reload_action->set_status_tip("Reload current page");
|
||||||
|
|
||||||
auto& go_menu = add_menu("&Go");
|
auto& go_menu = add_menu("&Go"_short_string);
|
||||||
go_menu.add_action(*m_go_back_action);
|
go_menu.add_action(*m_go_back_action);
|
||||||
go_menu.add_action(*m_go_forward_action);
|
go_menu.add_action(*m_go_forward_action);
|
||||||
go_menu.add_action(*m_go_home_action);
|
go_menu.add_action(*m_go_home_action);
|
||||||
|
@ -276,7 +276,7 @@ void BrowserWindow::build_menus()
|
||||||
this);
|
this);
|
||||||
m_take_full_screenshot_action->set_status_tip("Save a screenshot of the entirety of the current tab to the Downloads directory"sv);
|
m_take_full_screenshot_action->set_status_tip("Save a screenshot of the entirety of the current tab to the Downloads directory"sv);
|
||||||
|
|
||||||
auto& inspect_menu = add_menu("&Inspect");
|
auto& inspect_menu = add_menu("&Inspect"_string.release_value_but_fixme_should_propagate_errors());
|
||||||
inspect_menu.add_action(*m_view_source_action);
|
inspect_menu.add_action(*m_view_source_action);
|
||||||
inspect_menu.add_action(*m_inspect_dom_tree_action);
|
inspect_menu.add_action(*m_inspect_dom_tree_action);
|
||||||
|
|
||||||
|
@ -304,7 +304,7 @@ void BrowserWindow::build_menus()
|
||||||
storage_window_action->set_status_tip("Show History inspector for this tab");
|
storage_window_action->set_status_tip("Show History inspector for this tab");
|
||||||
inspect_menu.add_action(history_window_action);
|
inspect_menu.add_action(history_window_action);
|
||||||
|
|
||||||
auto& settings_menu = add_menu("&Settings");
|
auto& settings_menu = add_menu("&Settings"_string.release_value_but_fixme_should_propagate_errors());
|
||||||
|
|
||||||
m_change_homepage_action = GUI::Action::create(
|
m_change_homepage_action = GUI::Action::create(
|
||||||
"Set Homepage URL...", g_icon_bag.go_home, [this](auto&) {
|
"Set Homepage URL...", g_icon_bag.go_home, [this](auto&) {
|
||||||
|
@ -358,7 +358,7 @@ void BrowserWindow::build_menus()
|
||||||
});
|
});
|
||||||
settings_menu.add_action(move(open_settings_action));
|
settings_menu.add_action(move(open_settings_action));
|
||||||
|
|
||||||
auto& debug_menu = add_menu("&Debug");
|
auto& debug_menu = add_menu("&Debug"_short_string);
|
||||||
debug_menu.add_action(GUI::Action::create(
|
debug_menu.add_action(GUI::Action::create(
|
||||||
"Dump &DOM Tree", g_icon_bag.dom_tree, [this](auto&) {
|
"Dump &DOM Tree", g_icon_bag.dom_tree, [this](auto&) {
|
||||||
active_tab().view().debug_request("dump-dom-tree");
|
active_tab().view().debug_request("dump-dom-tree");
|
||||||
|
@ -475,7 +475,7 @@ void BrowserWindow::build_menus()
|
||||||
same_origin_policy_action->set_checked(false);
|
same_origin_policy_action->set_checked(false);
|
||||||
debug_menu.add_action(same_origin_policy_action);
|
debug_menu.add_action(same_origin_policy_action);
|
||||||
|
|
||||||
auto& help_menu = add_menu("&Help");
|
auto& help_menu = add_menu("&Help"_short_string);
|
||||||
help_menu.add_action(GUI::CommonActions::make_command_palette_action(this));
|
help_menu.add_action(GUI::CommonActions::make_command_palette_action(this));
|
||||||
help_menu.add_action(WindowActions::the().about_action());
|
help_menu.add_action(WindowActions::the().about_action());
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,12 +39,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
window->set_icon(app_icon.bitmap_for_size(16));
|
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&) {
|
file_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
auto& edit_menu = window->add_menu("&Edit");
|
auto& edit_menu = window->add_menu("&Edit"_short_string);
|
||||||
edit_menu.add_action(GUI::CommonActions::make_copy_action([&](auto&) {
|
edit_menu.add_action(GUI::CommonActions::make_copy_action([&](auto&) {
|
||||||
GUI::Clipboard::the().set_plain_text(widget->get_entry());
|
GUI::Clipboard::the().set_plain_text(widget->get_entry());
|
||||||
}));
|
}));
|
||||||
|
@ -58,7 +58,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
auto& constants_menu = window->add_menu("&Constants");
|
auto& constants_menu = window->add_menu(TRY("&Constants"_string));
|
||||||
auto const power = Crypto::NumberTheory::Power("10"_bigint, "10"_bigint);
|
auto const power = Crypto::NumberTheory::Power("10"_bigint, "10"_bigint);
|
||||||
|
|
||||||
constants_menu.add_action(GUI::Action::create("&Pi", TRY(Gfx::Bitmap::load_from_file("/res/icons/calculator/pi.png"sv)), [&](auto&) {
|
constants_menu.add_action(GUI::Action::create("&Pi", TRY(Gfx::Bitmap::load_from_file("/res/icons/calculator/pi.png"sv)), [&](auto&) {
|
||||||
|
@ -71,7 +71,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
widget->set_typed_entry(Crypto::BigFraction { Crypto::SignedBigInteger(16180339887), power });
|
widget->set_typed_entry(Crypto::BigFraction { Crypto::SignedBigInteger(16180339887), power });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
auto& round_menu = window->add_menu("&Round");
|
auto& round_menu = window->add_menu("&Round"_short_string);
|
||||||
GUI::ActionGroup preview_actions;
|
GUI::ActionGroup preview_actions;
|
||||||
|
|
||||||
static constexpr auto rounding_modes = Array { 0, 2, 4 };
|
static constexpr auto rounding_modes = Array { 0, 2, 4 };
|
||||||
|
@ -121,7 +121,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
round_menu.action_at(last_rounding_mode.value())->activate();
|
round_menu.action_at(last_rounding_mode.value())->activate();
|
||||||
|
|
||||||
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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("Calculator", app_icon, window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("Calculator", app_icon, window));
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
view_month_action->set_checked(true);
|
view_month_action->set_checked(true);
|
||||||
};
|
};
|
||||||
|
|
||||||
auto& file_menu = window->add_menu("&File");
|
auto& file_menu = window->add_menu("&File"_short_string);
|
||||||
file_menu.add_action(GUI::Action::create("&Add Event", { Mod_Ctrl | Mod_Shift, Key_E }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/add-event.png"sv)),
|
file_menu.add_action(GUI::Action::create("&Add Event", { Mod_Ctrl | Mod_Shift, Key_E }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/add-event.png"sv)),
|
||||||
[&](const GUI::Action&) {
|
[&](const GUI::Action&) {
|
||||||
AddEventDialog::show(calendar->selected_date(), window);
|
AddEventDialog::show(calendar->selected_date(), window);
|
||||||
|
@ -141,11 +141,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
})));
|
})));
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
TRY(view_menu->try_add_action(*view_month_action));
|
TRY(view_menu->try_add_action(*view_month_action));
|
||||||
TRY(view_menu->try_add_action(*view_year_action));
|
TRY(view_menu->try_add_action(*view_year_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Calendar", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Calendar", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -151,12 +151,12 @@ CharacterMapWidget::CharacterMapWidget()
|
||||||
|
|
||||||
void CharacterMapWidget::initialize_menubar(GUI::Window& window)
|
void CharacterMapWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
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([](GUI::Action&) {
|
file_menu.add_action(GUI::CommonActions::make_quit_action([](GUI::Action&) {
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->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_command_palette_action(&window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_help_action([&](auto&) {
|
help_menu.add_action(GUI::CommonActions::make_help_action([&](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/CharacterMap.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/CharacterMap.md"), "/bin/Help");
|
||||||
|
|
|
@ -998,7 +998,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
|
||||||
refresh_tree_view();
|
refresh_tree_view();
|
||||||
});
|
});
|
||||||
|
|
||||||
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(mkdir_action));
|
TRY(file_menu->try_add_action(mkdir_action));
|
||||||
TRY(file_menu->try_add_action(touch_action));
|
TRY(file_menu->try_add_action(touch_action));
|
||||||
TRY(file_menu->try_add_action(focus_dependent_delete_action));
|
TRY(file_menu->try_add_action(focus_dependent_delete_action));
|
||||||
|
@ -1010,7 +1010,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->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(cut_action));
|
TRY(edit_menu->try_add_action(cut_action));
|
||||||
TRY(edit_menu->try_add_action(copy_action));
|
TRY(edit_menu->try_add_action(copy_action));
|
||||||
TRY(edit_menu->try_add_action(paste_action));
|
TRY(edit_menu->try_add_action(paste_action));
|
||||||
|
@ -1033,7 +1033,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
|
||||||
show_dotfiles_action->set_checked(show_dotfiles);
|
show_dotfiles_action->set_checked(show_dotfiles);
|
||||||
show_dotfiles_in_view(show_dotfiles);
|
show_dotfiles_in_view(show_dotfiles);
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"));
|
auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"));
|
||||||
TRY(layout_menu->try_add_action(*layout_toolbar_action));
|
TRY(layout_menu->try_add_action(*layout_toolbar_action));
|
||||||
TRY(layout_menu->try_add_action(*layout_location_action));
|
TRY(layout_menu->try_add_action(*layout_location_action));
|
||||||
|
@ -1054,7 +1054,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
|
||||||
breadcrumbbar.show_location_text_box();
|
breadcrumbbar.show_location_text_box();
|
||||||
});
|
});
|
||||||
|
|
||||||
auto go_menu = TRY(window->try_add_menu("&Go"));
|
auto go_menu = TRY(window->try_add_menu("&Go"_short_string));
|
||||||
TRY(go_menu->try_add_action(go_back_action));
|
TRY(go_menu->try_add_action(go_back_action));
|
||||||
TRY(go_menu->try_add_action(go_forward_action));
|
TRY(go_menu->try_add_action(go_forward_action));
|
||||||
TRY(go_menu->try_add_action(open_parent_directory_action));
|
TRY(go_menu->try_add_action(open_parent_directory_action));
|
||||||
|
@ -1064,7 +1064,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
|
||||||
TRY(go_menu->try_add_separator());
|
TRY(go_menu->try_add_separator());
|
||||||
TRY(go_menu->try_add_action(directory_view->open_terminal_action()));
|
TRY(go_menu->try_add_action(directory_view->open_terminal_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("File Manager"sv, GUI::Icon::default_icon("app-file-manager"sv), window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("File Manager"sv, GUI::Icon::default_icon("app-file-manager"sv), window)));
|
||||||
|
|
||||||
|
|
|
@ -664,7 +664,7 @@ ErrorOr<void> MainWidget::initialize(DeprecatedString const& path, RefPtr<Gfx::B
|
||||||
|
|
||||||
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
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(*m_new_action));
|
TRY(file_menu->try_add_action(*m_new_action));
|
||||||
TRY(file_menu->try_add_action(*m_open_action));
|
TRY(file_menu->try_add_action(*m_open_action));
|
||||||
TRY(file_menu->try_add_action(*m_save_action));
|
TRY(file_menu->try_add_action(*m_save_action));
|
||||||
|
@ -676,7 +676,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->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(*m_undo_action));
|
TRY(edit_menu->try_add_action(*m_undo_action));
|
||||||
TRY(edit_menu->try_add_action(*m_redo_action));
|
TRY(edit_menu->try_add_action(*m_redo_action));
|
||||||
TRY(edit_menu->try_add_separator());
|
TRY(edit_menu->try_add_separator());
|
||||||
|
@ -691,12 +691,12 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
|
|
||||||
m_context_menu = edit_menu;
|
m_context_menu = edit_menu;
|
||||||
|
|
||||||
auto go_menu = TRY(window.try_add_menu("&Go"));
|
auto go_menu = TRY(window.try_add_menu("&Go"_short_string));
|
||||||
TRY(go_menu->try_add_action(*m_previous_glyph_action));
|
TRY(go_menu->try_add_action(*m_previous_glyph_action));
|
||||||
TRY(go_menu->try_add_action(*m_next_glyph_action));
|
TRY(go_menu->try_add_action(*m_next_glyph_action));
|
||||||
TRY(go_menu->try_add_action(*m_go_to_glyph_action));
|
TRY(go_menu->try_add_action(*m_go_to_glyph_action));
|
||||||
|
|
||||||
auto view_menu = TRY(window.try_add_menu("&View"));
|
auto view_menu = TRY(window.try_add_menu("&View"_short_string));
|
||||||
auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"));
|
auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"));
|
||||||
TRY(layout_menu->try_add_action(*m_show_toolbar_action));
|
TRY(layout_menu->try_add_action(*m_show_toolbar_action));
|
||||||
TRY(layout_menu->try_add_action(*m_show_statusbar_action));
|
TRY(layout_menu->try_add_action(*m_show_statusbar_action));
|
||||||
|
@ -714,7 +714,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
TRY(scale_menu->try_add_action(*m_scale_ten_action));
|
TRY(scale_menu->try_add_action(*m_scale_ten_action));
|
||||||
TRY(scale_menu->try_add_action(*m_scale_fifteen_action));
|
TRY(scale_menu->try_add_action(*m_scale_fifteen_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_command_palette_action(&window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/FontEditor.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/FontEditor.md"), "/bin/Help");
|
||||||
|
|
|
@ -202,17 +202,17 @@ ErrorOr<void> MainWidget::initialize_fallibles(GUI::Window& window)
|
||||||
(void)TRY(m_toolbar->try_add_action(*m_go_forward_action));
|
(void)TRY(m_toolbar->try_add_action(*m_go_forward_action));
|
||||||
(void)TRY(m_toolbar->try_add_action(*m_go_home_action));
|
(void)TRY(m_toolbar->try_add_action(*m_go_home_action));
|
||||||
|
|
||||||
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&) {
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
})));
|
})));
|
||||||
|
|
||||||
auto go_menu = TRY(window.try_add_menu("&Go"));
|
auto go_menu = TRY(window.try_add_menu("&Go"_short_string));
|
||||||
TRY(go_menu->try_add_action(*m_go_back_action));
|
TRY(go_menu->try_add_action(*m_go_back_action));
|
||||||
TRY(go_menu->try_add_action(*m_go_forward_action));
|
TRY(go_menu->try_add_action(*m_go_forward_action));
|
||||||
TRY(go_menu->try_add_action(*m_go_home_action));
|
TRY(go_menu->try_add_action(*m_go_home_action));
|
||||||
|
|
||||||
auto help_menu = TRY(window.try_add_menu("&Help"));
|
auto help_menu = TRY(window.try_add_menu("&Help"_short_string));
|
||||||
String help_page_path = TRY(TRY(try_make_ref_counted<Manual::PageNode>(Manual::sections[1 - 1], TRY("Help"_string)))->path());
|
String help_page_path = TRY(TRY(try_make_ref_counted<Manual::PageNode>(Manual::sections[1 - 1], TRY("Help"_string)))->path());
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
|
||||||
TRY(help_menu->try_add_action(GUI::Action::create("&Contents", { Key_F1 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"sv)), [this, help_page_path = move(help_page_path)](auto&) {
|
TRY(help_menu->try_add_action(GUI::Action::create("&Contents", { Key_F1 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"sv)), [this, help_page_path = move(help_page_path)](auto&) {
|
||||||
|
|
|
@ -403,7 +403,7 @@ void HexEditorWidget::update_inspector_values(size_t position)
|
||||||
|
|
||||||
void HexEditorWidget::initialize_menubar(GUI::Window& window)
|
void HexEditorWidget::initialize_menubar(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_new_action);
|
||||||
file_menu.add_action(*m_open_action);
|
file_menu.add_action(*m_open_action);
|
||||||
file_menu.add_action(*m_save_action);
|
file_menu.add_action(*m_save_action);
|
||||||
|
@ -415,7 +415,7 @@ void HexEditorWidget::initialize_menubar(GUI::Window& window)
|
||||||
GUI::Application::the()->quit();
|
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_undo_action);
|
edit_menu.add_action(*m_undo_action);
|
||||||
edit_menu.add_action(*m_redo_action);
|
edit_menu.add_action(*m_redo_action);
|
||||||
edit_menu.add_separator();
|
edit_menu.add_separator();
|
||||||
|
@ -462,7 +462,7 @@ void HexEditorWidget::initialize_menubar(GUI::Window& window)
|
||||||
edit_menu.add_separator();
|
edit_menu.add_separator();
|
||||||
edit_menu.add_action(*m_goto_offset_action);
|
edit_menu.add_action(*m_goto_offset_action);
|
||||||
|
|
||||||
auto& view_menu = window.add_menu("&View");
|
auto& view_menu = window.add_menu("&View"_short_string);
|
||||||
|
|
||||||
auto show_toolbar = Config::read_bool("HexEditor"sv, "Layout"sv, "ShowToolbar"sv, true);
|
auto show_toolbar = Config::read_bool("HexEditor"sv, "Layout"sv, "ShowToolbar"sv, true);
|
||||||
m_layout_toolbar_action->set_checked(show_toolbar);
|
m_layout_toolbar_action->set_checked(show_toolbar);
|
||||||
|
@ -509,7 +509,7 @@ void HexEditorWidget::initialize_menubar(GUI::Window& window)
|
||||||
// Default to little endian mode
|
// Default to little endian mode
|
||||||
little_endian_mode->set_checked(true);
|
little_endian_mode->set_checked(true);
|
||||||
|
|
||||||
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_command_palette_action(&window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
|
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/HexEditor.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/HexEditor.md"), "/bin/Help");
|
||||||
|
|
|
@ -297,7 +297,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
(void)TRY(main_toolbar->try_add_action(reset_zoom_action));
|
(void)TRY(main_toolbar->try_add_action(reset_zoom_action));
|
||||||
(void)TRY(main_toolbar->try_add_action(zoom_out_action));
|
(void)TRY(main_toolbar->try_add_action(zoom_out_action));
|
||||||
|
|
||||||
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(open_action));
|
TRY(file_menu->try_add_action(open_action));
|
||||||
TRY(file_menu->try_add_action(delete_action));
|
TRY(file_menu->try_add_action(delete_action));
|
||||||
TRY(file_menu->try_add_separator());
|
TRY(file_menu->try_add_separator());
|
||||||
|
@ -314,7 +314,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
TRY(file_menu->try_add_action(quit_action));
|
TRY(file_menu->try_add_action(quit_action));
|
||||||
|
|
||||||
auto image_menu = TRY(window->try_add_menu("&Image"));
|
auto image_menu = TRY(window->try_add_menu("&Image"_short_string));
|
||||||
TRY(image_menu->try_add_action(rotate_counterclockwise_action));
|
TRY(image_menu->try_add_action(rotate_counterclockwise_action));
|
||||||
TRY(image_menu->try_add_action(rotate_clockwise_action));
|
TRY(image_menu->try_add_action(rotate_clockwise_action));
|
||||||
TRY(image_menu->try_add_action(vertical_flip_action));
|
TRY(image_menu->try_add_action(vertical_flip_action));
|
||||||
|
@ -322,13 +322,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(image_menu->try_add_separator());
|
TRY(image_menu->try_add_separator());
|
||||||
TRY(image_menu->try_add_action(desktop_wallpaper_action));
|
TRY(image_menu->try_add_action(desktop_wallpaper_action));
|
||||||
|
|
||||||
auto navigate_menu = TRY(window->try_add_menu("&Navigate"));
|
auto navigate_menu = TRY(window->try_add_menu(TRY("&Navigate"_string)));
|
||||||
TRY(navigate_menu->try_add_action(go_first_action));
|
TRY(navigate_menu->try_add_action(go_first_action));
|
||||||
TRY(navigate_menu->try_add_action(go_back_action));
|
TRY(navigate_menu->try_add_action(go_back_action));
|
||||||
TRY(navigate_menu->try_add_action(go_forward_action));
|
TRY(navigate_menu->try_add_action(go_forward_action));
|
||||||
TRY(navigate_menu->try_add_action(go_last_action));
|
TRY(navigate_menu->try_add_action(go_last_action));
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
TRY(view_menu->try_add_action(full_screen_action));
|
TRY(view_menu->try_add_action(full_screen_action));
|
||||||
TRY(view_menu->try_add_separator());
|
TRY(view_menu->try_add_separator());
|
||||||
TRY(view_menu->try_add_action(zoom_in_action));
|
TRY(view_menu->try_add_action(zoom_in_action));
|
||||||
|
@ -353,7 +353,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(view_menu->try_add_separator());
|
TRY(view_menu->try_add_separator());
|
||||||
TRY(view_menu->try_add_action(hide_show_toolbar_action));
|
TRY(view_menu->try_add_action(hide_show_toolbar_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/ImageViewer.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/ImageViewer.md"), "/bin/Help");
|
||||||
|
|
|
@ -86,17 +86,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
auto_modifier_action->set_checkable(true);
|
auto_modifier_action->set_checkable(true);
|
||||||
auto_modifier_action->set_checked(false);
|
auto_modifier_action->set_checked(false);
|
||||||
|
|
||||||
auto& file_menu = window->add_menu("&File");
|
auto& file_menu = window->add_menu("&File"_short_string);
|
||||||
file_menu.add_action(open_action);
|
file_menu.add_action(open_action);
|
||||||
file_menu.add_action(save_action);
|
file_menu.add_action(save_action);
|
||||||
file_menu.add_action(save_as_action);
|
file_menu.add_action(save_as_action);
|
||||||
file_menu.add_separator();
|
file_menu.add_separator();
|
||||||
file_menu.add_action(quit_action);
|
file_menu.add_action(quit_action);
|
||||||
|
|
||||||
auto& settings_menu = window->add_menu("&Settings");
|
auto& settings_menu = window->add_menu(TRY("&Settings"_string));
|
||||||
settings_menu.add_action(auto_modifier_action);
|
settings_menu.add_action(auto_modifier_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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Mapper", app_icon, window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Mapper", app_icon, window));
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->set_icon(app_icon.bitmap_for_size(16));
|
window->set_icon(app_icon.bitmap_for_size(16));
|
||||||
auto magnifier = TRY(window->set_main_widget<MagnifierWidget>());
|
auto magnifier = TRY(window->set_main_widget<MagnifierWidget>());
|
||||||
|
|
||||||
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_save_as_action([&](auto&) {
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) {
|
||||||
AK::DeprecatedString filename = "file for saving";
|
AK::DeprecatedString filename = "file for saving";
|
||||||
auto do_save = [&]() -> ErrorOr<void> {
|
auto do_save = [&]() -> ErrorOr<void> {
|
||||||
|
@ -140,7 +140,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
size_action_group->add_action(eight_x_action);
|
size_action_group->add_action(eight_x_action);
|
||||||
size_action_group->set_exclusive(true);
|
size_action_group->set_exclusive(true);
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
TRY(view_menu->try_add_action(two_x_action));
|
TRY(view_menu->try_add_action(two_x_action));
|
||||||
TRY(view_menu->try_add_action(four_x_action));
|
TRY(view_menu->try_add_action(four_x_action));
|
||||||
TRY(view_menu->try_add_action(eight_x_action));
|
TRY(view_menu->try_add_action(eight_x_action));
|
||||||
|
@ -152,7 +152,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(view_menu->try_add_action(show_grid_action));
|
TRY(view_menu->try_add_action(show_grid_action));
|
||||||
TRY(view_menu->try_add_action(choose_grid_color_action));
|
TRY(view_menu->try_add_action(choose_grid_color_action));
|
||||||
|
|
||||||
auto timeline_menu = TRY(window->try_add_menu("&Timeline"));
|
auto timeline_menu = TRY(window->try_add_menu(TRY("&Timeline"_string)));
|
||||||
auto previous_frame_action = GUI::Action::create(
|
auto previous_frame_action = GUI::Action::create(
|
||||||
"&Previous frame", { Key_Left }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv)), [&](auto&) {
|
"&Previous frame", { Key_Left }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv)), [&](auto&) {
|
||||||
pause_action->set_checked(true);
|
pause_action->set_checked(true);
|
||||||
|
@ -170,7 +170,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
TRY(window->try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(magnifier))));
|
TRY(window->try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(magnifier))));
|
||||||
|
|
||||||
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Magnifier.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Magnifier.md"), "/bin/Help");
|
||||||
|
|
|
@ -45,14 +45,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->set_title("Mail");
|
window->set_title("Mail");
|
||||||
window->resize(640, 400);
|
window->resize(640, 400);
|
||||||
|
|
||||||
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&) {
|
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
|
||||||
mail_widget->on_window_close();
|
mail_widget->on_window_close();
|
||||||
app->quit();
|
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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("Mail", app_icon, window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("Mail", app_icon, window));
|
||||||
|
|
||||||
|
|
|
@ -208,7 +208,7 @@ PDFViewerWidget::PDFViewerWidget()
|
||||||
|
|
||||||
void PDFViewerWidget::initialize_menubar(GUI::Window& window)
|
void PDFViewerWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
auto& file_menu = window.add_menu("&File");
|
auto& file_menu = window.add_menu("&File"_short_string);
|
||||||
file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
||||||
auto response = FileSystemAccessClient::Client::the().open_file(&window);
|
auto response = FileSystemAccessClient::Client::the().open_file(&window);
|
||||||
if (!response.is_error())
|
if (!response.is_error())
|
||||||
|
@ -225,7 +225,7 @@ void PDFViewerWidget::initialize_menubar(GUI::Window& window)
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
auto& view_menu = window.add_menu("&View");
|
auto& view_menu = window.add_menu("&View"_short_string);
|
||||||
view_menu.add_action(*m_toggle_sidebar_action);
|
view_menu.add_action(*m_toggle_sidebar_action);
|
||||||
view_menu.add_separator();
|
view_menu.add_separator();
|
||||||
auto& view_mode_menu = view_menu.add_submenu("View &Mode");
|
auto& view_mode_menu = view_menu.add_submenu("View &Mode");
|
||||||
|
@ -236,7 +236,7 @@ void PDFViewerWidget::initialize_menubar(GUI::Window& window)
|
||||||
view_menu.add_action(*m_zoom_out_action);
|
view_menu.add_action(*m_zoom_out_action);
|
||||||
view_menu.add_action(*m_reset_zoom_action);
|
view_menu.add_action(*m_reset_zoom_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_command_palette_action(&window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("PDF Viewer", GUI::Icon::default_icon("app-pdf-viewer"sv), &window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("PDF Viewer", GUI::Icon::default_icon("app-pdf-viewer"sv), &window));
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,12 +80,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
partition_table_view.set_model(partition_model);
|
partition_table_view.set_model(partition_model);
|
||||||
partition_table_view.set_focus(true);
|
partition_table_view.set_focus(true);
|
||||||
|
|
||||||
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&) {
|
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
|
||||||
app->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Partition Editor", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Partition Editor", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
}));
|
}));
|
||||||
main_widget_updater->start();
|
main_widget_updater->start();
|
||||||
|
|
||||||
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::Action::create("Export", { Mod_Ctrl, Key_E }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/file-export.png"sv)), [&](const GUI::Action&) {
|
TRY(file_menu->try_add_action(GUI::Action::create("Export", { Mod_Ctrl, Key_E }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/file-export.png"sv)), [&](const GUI::Action&) {
|
||||||
save_path = GUI::FilePicker::get_save_filepath(window, "Untitled", "wav");
|
save_path = GUI::FilePicker::get_save_filepath(window, "Untitled", "wav");
|
||||||
if (!save_path.has_value())
|
if (!save_path.has_value())
|
||||||
|
@ -83,10 +83,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
return;
|
return;
|
||||||
})));
|
})));
|
||||||
|
|
||||||
auto edit_menu = TRY(window->try_add_menu("&Edit"));
|
auto edit_menu = TRY(window->try_add_menu("&Edit"_short_string));
|
||||||
TRY(main_widget->add_track_actions(edit_menu));
|
TRY(main_widget->add_track_actions(edit_menu));
|
||||||
|
|
||||||
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Piano", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Piano", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,7 @@ static constexpr int s_zoom_level_fit_image = 10;
|
||||||
|
|
||||||
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
auto file_menu = TRY(window.try_add_menu("&File"));
|
auto file_menu = TRY(window.try_add_menu("&File"_short_string));
|
||||||
|
|
||||||
m_new_image_action = GUI::Action::create(
|
m_new_image_action = GUI::Action::create(
|
||||||
"&New Image...", { Mod_Ctrl, Key_N }, g_icon_bag.filetype_pixelpaint, [&](auto&) {
|
"&New Image...", { Mod_Ctrl, Key_N }, g_icon_bag.filetype_pixelpaint, [&](auto&) {
|
||||||
|
@ -289,7 +289,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
})));
|
})));
|
||||||
|
|
||||||
m_edit_menu = TRY(window.try_add_menu("&Edit"));
|
m_edit_menu = TRY(window.try_add_menu("&Edit"_short_string));
|
||||||
|
|
||||||
m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) {
|
m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) {
|
||||||
auto* editor = current_image_editor();
|
auto* editor = current_image_editor();
|
||||||
|
@ -477,7 +477,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
GUI::MessageBox::show_error(&window, MUST(String::formatted("Writing color palette failed: {}", result.release_error())));
|
GUI::MessageBox::show_error(&window, MUST(String::formatted("Writing color palette failed: {}", result.release_error())));
|
||||||
})));
|
})));
|
||||||
|
|
||||||
m_view_menu = TRY(window.try_add_menu("&View"));
|
m_view_menu = TRY(window.try_add_menu("&View"_short_string));
|
||||||
|
|
||||||
m_zoom_in_action = GUI::CommonActions::make_zoom_in_action(
|
m_zoom_in_action = GUI::CommonActions::make_zoom_in_action(
|
||||||
[&](auto&) {
|
[&](auto&) {
|
||||||
|
@ -593,14 +593,14 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
TRY(scopes_menu->try_add_action(histogram_action));
|
TRY(scopes_menu->try_add_action(histogram_action));
|
||||||
TRY(scopes_menu->try_add_action(vectorscope_action));
|
TRY(scopes_menu->try_add_action(vectorscope_action));
|
||||||
|
|
||||||
m_tool_menu = TRY(window.try_add_menu("&Tool"));
|
m_tool_menu = TRY(window.try_add_menu("&Tool"_short_string));
|
||||||
m_toolbox->for_each_tool([&](auto& tool) {
|
m_toolbox->for_each_tool([&](auto& tool) {
|
||||||
if (tool.action())
|
if (tool.action())
|
||||||
m_tool_menu->add_action(*tool.action());
|
m_tool_menu->add_action(*tool.action());
|
||||||
return IterationDecision::Continue;
|
return IterationDecision::Continue;
|
||||||
});
|
});
|
||||||
|
|
||||||
m_image_menu = TRY(window.try_add_menu("&Image"));
|
m_image_menu = TRY(window.try_add_menu("&Image"_short_string));
|
||||||
TRY(m_image_menu->try_add_action(GUI::Action::create(
|
TRY(m_image_menu->try_add_action(GUI::Action::create(
|
||||||
"Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
|
"Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
|
||||||
auto* editor = current_image_editor();
|
auto* editor = current_image_editor();
|
||||||
|
@ -697,7 +697,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
editor->did_complete_action("Crop Image to Content"sv);
|
editor->did_complete_action("Crop Image to Content"sv);
|
||||||
})));
|
})));
|
||||||
|
|
||||||
m_layer_menu = TRY(window.try_add_menu("&Layer"));
|
m_layer_menu = TRY(window.try_add_menu("&Layer"_short_string));
|
||||||
|
|
||||||
m_layer_menu->on_visibility_change = [this](bool visible) {
|
m_layer_menu->on_visibility_change = [this](bool visible) {
|
||||||
if (!visible)
|
if (!visible)
|
||||||
|
@ -1058,7 +1058,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
editor->did_complete_action("Crop Layer to Content"sv);
|
editor->did_complete_action("Crop Layer to Content"sv);
|
||||||
})));
|
})));
|
||||||
|
|
||||||
m_filter_menu = TRY(window.try_add_menu("&Filter"));
|
m_filter_menu = TRY(window.try_add_menu("&Filter"_short_string));
|
||||||
|
|
||||||
TRY(m_filter_menu->try_add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
|
TRY(m_filter_menu->try_add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
|
||||||
auto* editor = current_image_editor();
|
auto* editor = current_image_editor();
|
||||||
|
@ -1082,7 +1082,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
}
|
}
|
||||||
})));
|
})));
|
||||||
|
|
||||||
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_command_palette_action(&window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window)));
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
|
||||||
{
|
{
|
||||||
auto* window = this->window();
|
auto* window = this->window();
|
||||||
// Set up the menu bar.
|
// Set up the menu bar.
|
||||||
auto file_menu = TRY(window->try_add_menu("&File"));
|
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
|
||||||
auto open_action = GUI::CommonActions::make_open_action([this](auto&) {
|
auto open_action = GUI::CommonActions::make_open_action([this](auto&) {
|
||||||
auto response = FileSystemAccessClient::Client::the().open_file(this->window());
|
auto response = FileSystemAccessClient::Client::the().open_file(this->window());
|
||||||
if (response.is_error())
|
if (response.is_error())
|
||||||
|
@ -68,7 +68,7 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
})));
|
})));
|
||||||
|
|
||||||
auto presentation_menu = TRY(window->try_add_menu("&Presentation"));
|
auto presentation_menu = TRY(window->try_add_menu(TRY("&Presentation"_string)));
|
||||||
m_next_slide_action = GUI::Action::create("&Next", { KeyCode::Key_Right }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [this](auto&) {
|
m_next_slide_action = GUI::Action::create("&Next", { KeyCode::Key_Right }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [this](auto&) {
|
||||||
if (m_current_presentation) {
|
if (m_current_presentation) {
|
||||||
m_current_presentation->next_frame();
|
m_current_presentation->next_frame();
|
||||||
|
@ -95,7 +95,7 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
|
||||||
TRY(presentation_menu->try_add_action(*m_previous_slide_action));
|
TRY(presentation_menu->try_add_action(*m_previous_slide_action));
|
||||||
TRY(presentation_menu->try_add_action(*m_present_from_first_slide_action));
|
TRY(presentation_menu->try_add_action(*m_present_from_first_slide_action));
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
m_full_screen_action = GUI::Action::create("Toggle &Full Screen", { KeyModifier::Mod_Shift, KeyCode::Key_F5 }, { KeyCode::Key_F11 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fullscreen.png"sv)), [this](auto&) {
|
m_full_screen_action = GUI::Action::create("Toggle &Full Screen", { KeyModifier::Mod_Shift, KeyCode::Key_F5 }, { KeyCode::Key_F11 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fullscreen.png"sv)), [this](auto&) {
|
||||||
auto* window = this->window();
|
auto* window = this->window();
|
||||||
window->set_fullscreen(!window->is_fullscreen());
|
window->set_fullscreen(!window->is_fullscreen());
|
||||||
|
@ -114,7 +114,7 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
|
||||||
|
|
||||||
update_slides_actions();
|
update_slides_actions();
|
||||||
|
|
||||||
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_about_action("Presenter", GUI::Icon::default_icon("app-presenter"sv))));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Presenter", GUI::Icon::default_icon("app-presenter"sv))));
|
||||||
|
|
||||||
return {};
|
return {};
|
||||||
|
|
|
@ -92,12 +92,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->set_title("Settings");
|
window->set_title("Settings");
|
||||||
window->resize(420, 265);
|
window->resize(420, 265);
|
||||||
|
|
||||||
auto file_menu = TRY(window->try_add_menu("&File"));
|
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
|
||||||
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
|
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
|
||||||
app->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Settings", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Settings", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
player->set_loop_mode(Player::LoopMode::Playlist);
|
player->set_loop_mode(Player::LoopMode::Playlist);
|
||||||
}
|
}
|
||||||
|
|
||||||
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_open_action([&](auto&) {
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
||||||
Optional<DeprecatedString> path = GUI::FilePicker::get_open_filepath(window, "Open sound file...");
|
Optional<DeprecatedString> path = GUI::FilePicker::get_open_filepath(window, "Open sound file...");
|
||||||
if (path.has_value()) {
|
if (path.has_value()) {
|
||||||
|
@ -73,7 +73,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
app->quit();
|
app->quit();
|
||||||
})));
|
})));
|
||||||
|
|
||||||
auto playback_menu = TRY(window->try_add_menu("&Playback"));
|
auto playback_menu = TRY(window->try_add_menu(TRY("&Playback"_string)));
|
||||||
GUI::ActionGroup loop_actions;
|
GUI::ActionGroup loop_actions;
|
||||||
loop_actions.set_exclusive(true);
|
loop_actions.set_exclusive(true);
|
||||||
auto loop_none = GUI::Action::create_checkable("&No Loop", { Mod_Ctrl, Key_N }, [&](auto&) {
|
auto loop_none = GUI::Action::create_checkable("&No Loop", { Mod_Ctrl, Key_N }, [&](auto&) {
|
||||||
|
@ -120,7 +120,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
});
|
});
|
||||||
TRY(playback_menu->try_add_action(shuffle_mode));
|
TRY(playback_menu->try_add_action(shuffle_mode));
|
||||||
|
|
||||||
auto visualization_menu = TRY(window->try_add_menu("&Visualization"));
|
auto visualization_menu = TRY(window->try_add_menu(TRY("&Visualization"_string)));
|
||||||
GUI::ActionGroup visualization_actions;
|
GUI::ActionGroup visualization_actions;
|
||||||
visualization_actions.set_exclusive(true);
|
visualization_actions.set_exclusive(true);
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
selected_visualization_widget->set_checked(true);
|
selected_visualization_widget->set_checked(true);
|
||||||
|
|
||||||
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
tree_map_widget.set_focus(true);
|
tree_map_widget.set_focus(true);
|
||||||
|
|
||||||
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::Action::create("&Analyze", { KeyCode::Key_F5 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) {
|
TRY(file_menu->try_add_action(GUI::Action::create("&Analyze", { KeyCode::Key_F5 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) {
|
||||||
// FIXME: Just modify the tree in memory instead of traversing the entire file system
|
// FIXME: Just modify the tree in memory instead of traversing the entire file system
|
||||||
if (auto result = tree_map_widget.analyze(statusbar); result.is_error()) {
|
if (auto result = tree_map_widget.analyze(statusbar); result.is_error()) {
|
||||||
|
@ -73,7 +73,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
app->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action(APP_NAME, app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action(APP_NAME, app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -649,7 +649,7 @@ void SpreadsheetWidget::clipboard_action(bool is_cut)
|
||||||
|
|
||||||
ErrorOr<void> SpreadsheetWidget::initialize_menubar(GUI::Window& window)
|
ErrorOr<void> SpreadsheetWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
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(*m_new_action));
|
TRY(file_menu->try_add_action(*m_new_action));
|
||||||
TRY(file_menu->try_add_action(*m_open_action));
|
TRY(file_menu->try_add_action(*m_open_action));
|
||||||
TRY(file_menu->try_add_action(*m_save_action));
|
TRY(file_menu->try_add_action(*m_save_action));
|
||||||
|
@ -668,7 +668,7 @@ ErrorOr<void> SpreadsheetWidget::initialize_menubar(GUI::Window& window)
|
||||||
}));
|
}));
|
||||||
TRY(file_menu->try_add_action(*m_quit_action));
|
TRY(file_menu->try_add_action(*m_quit_action));
|
||||||
|
|
||||||
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(*m_undo_action));
|
TRY(edit_menu->try_add_action(*m_undo_action));
|
||||||
TRY(edit_menu->try_add_action(*m_redo_action));
|
TRY(edit_menu->try_add_action(*m_redo_action));
|
||||||
TRY(edit_menu->try_add_separator());
|
TRY(edit_menu->try_add_separator());
|
||||||
|
@ -677,7 +677,7 @@ ErrorOr<void> SpreadsheetWidget::initialize_menubar(GUI::Window& window)
|
||||||
TRY(edit_menu->try_add_action(*m_paste_action));
|
TRY(edit_menu->try_add_action(*m_paste_action));
|
||||||
TRY(edit_menu->try_add_action(*m_insert_emoji_action));
|
TRY(edit_menu->try_add_action(*m_insert_emoji_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(*m_search_action));
|
TRY(help_menu->try_add_action(*m_search_action));
|
||||||
TRY(help_menu->try_add_action(*m_functions_help_action));
|
TRY(help_menu->try_add_action(*m_functions_help_action));
|
||||||
TRY(help_menu->try_add_action(*m_about_action));
|
TRY(help_menu->try_add_action(*m_about_action));
|
||||||
|
|
|
@ -424,7 +424,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
},
|
},
|
||||||
&process_table_view);
|
&process_table_view);
|
||||||
|
|
||||||
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&) {
|
file_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->quit();
|
||||||
}));
|
}));
|
||||||
|
@ -443,7 +443,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
process_context_menu->popup(event.screen_position(), process_properties_action);
|
process_context_menu->popup(event.screen_position(), process_properties_action);
|
||||||
};
|
};
|
||||||
|
|
||||||
auto& frequency_menu = window->add_menu("F&requency");
|
auto& frequency_menu = window->add_menu(TRY("F&requency"_string));
|
||||||
GUI::ActionGroup frequency_action_group;
|
GUI::ActionGroup frequency_action_group;
|
||||||
frequency_action_group.set_exclusive(true);
|
frequency_action_group.set_exclusive(true);
|
||||||
|
|
||||||
|
@ -462,7 +462,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
make_frequency_action(3);
|
make_frequency_action(3);
|
||||||
make_frequency_action(5);
|
make_frequency_action(5);
|
||||||
|
|
||||||
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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("System Monitor", app_icon, window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("System Monitor", app_icon, window));
|
||||||
|
|
||||||
|
|
|
@ -341,7 +341,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(terminal->context_menu().try_add_separator());
|
TRY(terminal->context_menu().try_add_separator());
|
||||||
TRY(terminal->context_menu().try_add_action(open_settings_action));
|
TRY(terminal->context_menu().try_add_action(open_settings_action));
|
||||||
|
|
||||||
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::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"sv)), [&](auto&) {
|
TRY(file_menu->try_add_action(GUI::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"sv)), [&](auto&) {
|
||||||
GUI::Process::spawn_or_show_error(window, "/bin/Terminal"sv);
|
GUI::Process::spawn_or_show_error(window, "/bin/Terminal"sv);
|
||||||
})));
|
})));
|
||||||
|
@ -388,7 +388,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
GUI::Application::the()->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(terminal->copy_action()));
|
TRY(edit_menu->try_add_action(terminal->copy_action()));
|
||||||
TRY(edit_menu->try_add_action(terminal->paste_action()));
|
TRY(edit_menu->try_add_action(terminal->paste_action()));
|
||||||
TRY(edit_menu->try_add_separator());
|
TRY(edit_menu->try_add_separator());
|
||||||
|
@ -398,7 +398,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
find_window->move_to_front();
|
find_window->move_to_front();
|
||||||
})));
|
})));
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
TRY(view_menu->try_add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
|
TRY(view_menu->try_add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
|
||||||
window->set_fullscreen(!window->is_fullscreen());
|
window->set_fullscreen(!window->is_fullscreen());
|
||||||
})));
|
})));
|
||||||
|
@ -422,7 +422,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
adjust_font_size(-1);
|
adjust_font_size(-1);
|
||||||
})));
|
})));
|
||||||
|
|
||||||
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Terminal.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Terminal.md"), "/bin/Help");
|
||||||
|
|
|
@ -369,7 +369,7 @@ WebView::OutOfProcessWebView& MainWidget::ensure_web_view()
|
||||||
|
|
||||||
void MainWidget::initialize_menubar(GUI::Window& window)
|
void MainWidget::initialize_menubar(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_new_action);
|
||||||
file_menu.add_action(*m_open_action);
|
file_menu.add_action(*m_open_action);
|
||||||
file_menu.add_action(*m_save_action);
|
file_menu.add_action(*m_save_action);
|
||||||
|
@ -401,7 +401,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
GUI::Application::the()->quit();
|
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_editor->undo_action());
|
edit_menu.add_action(m_editor->undo_action());
|
||||||
edit_menu.add_action(m_editor->redo_action());
|
edit_menu.add_action(m_editor->redo_action());
|
||||||
edit_menu.add_separator();
|
edit_menu.add_separator();
|
||||||
|
@ -465,7 +465,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
m_layout_ruler_action->set_checked(show_ruler);
|
m_layout_ruler_action->set_checked(show_ruler);
|
||||||
m_editor->set_ruler_visible(show_ruler);
|
m_editor->set_ruler_visible(show_ruler);
|
||||||
|
|
||||||
auto& view_menu = window.add_menu("&View");
|
auto& view_menu = window.add_menu("&View"_short_string);
|
||||||
auto& layout_menu = view_menu.add_submenu("&Layout");
|
auto& layout_menu = view_menu.add_submenu("&Layout");
|
||||||
layout_menu.add_action(*m_layout_toolbar_action);
|
layout_menu.add_action(*m_layout_toolbar_action);
|
||||||
layout_menu.add_action(*m_layout_statusbar_action);
|
layout_menu.add_action(*m_layout_statusbar_action);
|
||||||
|
@ -687,7 +687,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
syntax_actions.add_action(*m_sql_highlight);
|
syntax_actions.add_action(*m_sql_highlight);
|
||||||
syntax_menu.add_action(*m_sql_highlight);
|
syntax_menu.add_action(*m_sql_highlight);
|
||||||
|
|
||||||
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_command_palette_action(&window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
|
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/TextEditor.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/TextEditor.md"), "/bin/Help");
|
||||||
|
|
|
@ -238,7 +238,7 @@ MainWidget::MainWidget(NonnullRefPtr<AlignmentModel> alignment_model)
|
||||||
|
|
||||||
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
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_open_action([&](auto&) {
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
||||||
if (request_close() == GUI::Window::CloseRequestDecision::StayOpen)
|
if (request_close() == GUI::Window::CloseRequestDecision::StayOpen)
|
||||||
return;
|
return;
|
||||||
|
@ -282,7 +282,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||||
|
|
||||||
TRY(window.try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(*m_preview_widget))));
|
TRY(window.try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(*m_preview_widget))));
|
||||||
|
|
||||||
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_command_palette_action(&window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Theme Editor", GUI::Icon::default_icon("app-theme-editor"sv), &window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Theme Editor", GUI::Icon::default_icon("app-theme-editor"sv), &window)));
|
||||||
|
|
||||||
|
|
|
@ -352,7 +352,7 @@ void VideoPlayerWidget::set_seek_mode(Video::PlaybackManager::SeekMode seek_mode
|
||||||
ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
|
ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
|
||||||
{
|
{
|
||||||
// File menu
|
// File menu
|
||||||
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_open_action([&](auto&) {
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
||||||
Optional<DeprecatedString> path = GUI::FilePicker::get_open_filepath(&window, "Open video file...");
|
Optional<DeprecatedString> path = GUI::FilePicker::get_open_filepath(&window, "Open video file...");
|
||||||
if (path.has_value())
|
if (path.has_value())
|
||||||
|
@ -364,7 +364,7 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
|
||||||
})));
|
})));
|
||||||
|
|
||||||
// Playback menu
|
// Playback menu
|
||||||
auto playback_menu = TRY(window.try_add_menu("&Playback"));
|
auto playback_menu = TRY(window.try_add_menu(TRY("&Playback"_string)));
|
||||||
|
|
||||||
// FIXME: Maybe seek mode should be in an options dialog instead. The playback menu may get crowded.
|
// FIXME: Maybe seek mode should be in an options dialog instead. The playback menu may get crowded.
|
||||||
// For now, leave it here for convenience.
|
// For now, leave it here for convenience.
|
||||||
|
@ -373,7 +373,7 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
|
||||||
set_seek_mode(Video::PlaybackManager::DEFAULT_SEEK_MODE);
|
set_seek_mode(Video::PlaybackManager::DEFAULT_SEEK_MODE);
|
||||||
|
|
||||||
// View menu
|
// View menu
|
||||||
auto view_menu = TRY(window.try_add_menu("&View"));
|
auto view_menu = TRY(window.try_add_menu("&View"_short_string));
|
||||||
TRY(view_menu->try_add_action(*m_toggle_fullscreen_action));
|
TRY(view_menu->try_add_action(*m_toggle_fullscreen_action));
|
||||||
|
|
||||||
auto sizing_mode_menu = TRY(view_menu->try_add_submenu("&Sizing mode"));
|
auto sizing_mode_menu = TRY(view_menu->try_add_submenu("&Sizing mode"));
|
||||||
|
@ -393,7 +393,7 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
|
||||||
TRY(sizing_mode_menu->try_add_action(*m_size_fullsize_action));
|
TRY(sizing_mode_menu->try_add_action(*m_size_fullsize_action));
|
||||||
|
|
||||||
// Help menu
|
// Help menu
|
||||||
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_about_action("Video Player", TRY(GUI::Icon::try_create_default_icon("app-video-player"sv)), &window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Video Player", TRY(GUI::Icon::try_create_default_icon("app-video-player"sv)), &window)));
|
||||||
|
|
||||||
return {};
|
return {};
|
||||||
|
|
|
@ -84,12 +84,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
set_window_frame_enabled(!hide_window_frame);
|
set_window_frame_enabled(!hide_window_frame);
|
||||||
show_window_frame_action->set_checked(window_frame_enabled);
|
show_window_frame_action->set_checked(window_frame_enabled);
|
||||||
|
|
||||||
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(move(show_window_frame_action)));
|
TRY(file_menu->try_add_action(move(show_window_frame_action)));
|
||||||
TRY(file_menu->try_add_separator());
|
TRY(file_menu->try_add_separator());
|
||||||
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
TRY(file_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
||||||
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Eyes.md"), "/bin/Help");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Eyes.md"), "/bin/Help");
|
||||||
|
|
|
@ -197,7 +197,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->set_resizable(false);
|
window->set_resizable(false);
|
||||||
window->resize(WIDTH, HEIGHT);
|
window->resize(WIDTH, HEIGHT);
|
||||||
|
|
||||||
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(); })));
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
||||||
|
|
||||||
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-libgfx-demo"sv));
|
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-libgfx-demo"sv));
|
||||||
|
|
|
@ -116,7 +116,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->set_resizable(false);
|
window->set_resizable(false);
|
||||||
window->resize(WIDTH * 2, HEIGHT * 3);
|
window->resize(WIDTH * 2, HEIGHT * 3);
|
||||||
|
|
||||||
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(); })));
|
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
||||||
|
|
||||||
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-libgfx-demo"sv));
|
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-libgfx-demo"sv));
|
||||||
|
|
|
@ -413,7 +413,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->resize(window->minimum_size() * 2);
|
window->resize(window->minimum_size() * 2);
|
||||||
auto mandelbrot = TRY(window->set_main_widget<Mandelbrot>());
|
auto mandelbrot = TRY(window->set_main_widget<Mandelbrot>());
|
||||||
|
|
||||||
auto file_menu = TRY(window->try_add_menu("&File"));
|
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
|
||||||
|
|
||||||
auto& export_submenu = file_menu->add_submenu("&Export");
|
auto& export_submenu = file_menu->add_submenu("&Export");
|
||||||
|
|
||||||
|
@ -469,12 +469,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
auto app_icon = GUI::Icon::default_icon("app-mandelbrot"sv);
|
auto app_icon = GUI::Icon::default_icon("app-mandelbrot"sv);
|
||||||
window->set_icon(app_icon.bitmap_for_size(16));
|
window->set_icon(app_icon.bitmap_for_size(16));
|
||||||
|
|
||||||
auto view_menu = TRY(window->try_add_menu("&View"));
|
auto view_menu = TRY(window->try_add_menu("&View"_short_string));
|
||||||
TRY(view_menu->try_add_action(zoom_in_action));
|
TRY(view_menu->try_add_action(zoom_in_action));
|
||||||
TRY(view_menu->try_add_action(reset_zoom_action));
|
TRY(view_menu->try_add_action(reset_zoom_action));
|
||||||
TRY(view_menu->try_add_action(zoom_out_action));
|
TRY(view_menu->try_add_action(zoom_out_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Mandelbrot Demo", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Mandelbrot Demo", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -76,12 +76,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->set_title("Screensaver");
|
window->set_title("Screensaver");
|
||||||
window->resize(360, 240);
|
window->resize(360, 240);
|
||||||
|
|
||||||
auto file_menu = TRY(window->try_add_menu("&File"));
|
auto file_menu = TRY(window->try_add_menu("&File"_short_string));
|
||||||
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
|
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
|
||||||
app->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Screensaver", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Screensaver", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -141,7 +141,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->set_most_recently_open_file(file.filename());
|
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 save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
|
||||||
auto response = FileSystemAccessClient::Client::the().save_file(window, "Untitled", "gml");
|
auto response = FileSystemAccessClient::Client::the().save_file(window, "Untitled", "gml");
|
||||||
|
@ -218,7 +218,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
app->quit();
|
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->undo_action()));
|
||||||
TRY(edit_menu->try_add_action(editor->redo_action()));
|
TRY(edit_menu->try_add_action(editor->redo_action()));
|
||||||
TRY(edit_menu->try_add_separator());
|
TRY(edit_menu->try_add_separator());
|
||||||
|
@ -253,7 +253,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
vim_emulation_setting_action->set_checked(false);
|
vim_emulation_setting_action->set_checked(false);
|
||||||
TRY(edit_menu->try_add_action(vim_emulation_setting_action));
|
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;
|
GUI::ActionGroup views_group;
|
||||||
views_group.set_exclusive(true);
|
views_group.set_exclusive(true);
|
||||||
views_group.set_unchecking_allowed(false);
|
views_group.set_unchecking_allowed(false);
|
||||||
|
@ -285,7 +285,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
view_frame_action->activate();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/GMLPlayground.md"), "/bin/Help");
|
||||||
|
|
|
@ -1409,7 +1409,7 @@ void HackStudioWidget::update_recent_projects_submenu()
|
||||||
|
|
||||||
ErrorOr<void> HackStudioWidget::create_file_menu(GUI::Window& window)
|
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...");
|
auto& new_submenu = file_menu.add_submenu("&New...");
|
||||||
new_submenu.add_action(*m_new_project_action);
|
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)
|
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));
|
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&) {
|
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);
|
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)
|
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_action(*m_build_action);
|
||||||
build_menu.add_separator();
|
build_menu.add_separator();
|
||||||
build_menu.add_action(*m_run_action);
|
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));
|
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(hide_action_tabs_action);
|
||||||
view_menu.add_action(open_locator_action);
|
view_menu.add_action(open_locator_action);
|
||||||
view_menu.add_action(show_dotfiles_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)
|
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_command_palette_action(&window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"sv), &window));
|
help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"sv), &window));
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,10 +89,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
window->resize(685, 500);
|
window->resize(685, 500);
|
||||||
window->set_icon(app_icon.bitmap_for_size(16));
|
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(); }));
|
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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Inspector.md"), "/bin/Help");
|
||||||
|
|
|
@ -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_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows);
|
||||||
filesystem_events_tree_view->set_model(profile->file_event_model());
|
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(); })));
|
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) {
|
auto invert_action = GUI::Action::create_checkable("&Invert Tree", { Mod_Ctrl, Key_I }, [&](auto& action) {
|
||||||
profile->set_inverted(action.is_checked());
|
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(disassembly_action));
|
||||||
TRY(view_menu->try_add_action(source_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Profiler.md"), "/bin/Help");
|
||||||
|
|
|
@ -293,7 +293,7 @@ MainWidget::MainWidget()
|
||||||
|
|
||||||
void MainWidget::initialize_menu(GUI::Window* window)
|
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_new_action);
|
||||||
file_menu.add_action(*m_open_action);
|
file_menu.add_action(*m_open_action);
|
||||||
file_menu.add_action(*m_save_action);
|
file_menu.add_action(*m_save_action);
|
||||||
|
@ -304,7 +304,7 @@ void MainWidget::initialize_menu(GUI::Window* window)
|
||||||
GUI::Application::the()->quit();
|
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_copy_action);
|
||||||
edit_menu.add_action(*m_cut_action);
|
edit_menu.add_action(*m_cut_action);
|
||||||
edit_menu.add_action(*m_paste_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_separator();
|
||||||
edit_menu.add_action(*m_run_script_action);
|
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_command_palette_action(window));
|
||||||
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/SQLStudio.md"), "/bin/Help");
|
||||||
|
|
|
@ -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&) {
|
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();
|
start_a_new_game();
|
||||||
|
@ -201,7 +201,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/2048.md"), "/bin/Help");
|
||||||
|
|
|
@ -51,7 +51,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
auto game = TRY(window->set_main_widget<BrickGame>(app_name));
|
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&) {
|
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();
|
game->reset();
|
||||||
|
@ -73,7 +73,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help");
|
||||||
|
|
|
@ -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_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));
|
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&) {
|
TRY(game_menu->try_add_action(GUI::Action::create("&Resign", { Mod_None, Key_F3 }, [&](auto&) {
|
||||||
widget->resign();
|
widget->resign();
|
||||||
|
@ -123,7 +123,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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;
|
GUI::ActionGroup engines_action_group;
|
||||||
engines_action_group.set_exclusive(true);
|
engines_action_group.set_exclusive(true);
|
||||||
|
@ -144,7 +144,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(engine_submenu->try_add_action(*action));
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Chess.md"), "/bin/Help");
|
||||||
|
|
|
@ -50,7 +50,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
auto game = TRY(window->set_main_widget<ColorLines>(app_name));
|
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&) {
|
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();
|
game->reset();
|
||||||
|
@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help");
|
||||||
|
|
|
@ -55,12 +55,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
return high_score;
|
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&) {
|
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||||
GUI::Application::the()->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/FlappyBug.md"), "/bin/Help");
|
||||||
|
|
|
@ -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&) {
|
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();
|
start_a_new_game();
|
||||||
|
@ -183,7 +183,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Flood.md"), "/bin/Help");
|
||||||
|
|
|
@ -126,7 +126,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
rotate_pattern_action->set_enabled(false);
|
rotate_pattern_action->set_enabled(false);
|
||||||
(void)TRY(main_toolbar.try_add_action(rotate_pattern_action));
|
(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(clear_board_action));
|
||||||
TRY(game_menu->try_add_action(randomize_cells_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();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/GameOfLife.md"), "/bin/Help");
|
||||||
|
|
|
@ -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);
|
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&) {
|
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);
|
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_separator());
|
||||||
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Hearts.md"), "/bin/Help");
|
||||||
|
|
|
@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
window->set_focused_widget(&game);
|
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&) {
|
TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) {
|
||||||
game.reset();
|
game.reset();
|
||||||
|
@ -71,7 +71,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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&) {
|
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);
|
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());
|
toggle_check_guesses->set_checked(game.is_checking_guesses());
|
||||||
TRY(settings_menu->try_add_action(toggle_check_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&) {
|
auto system_theme_action = GUI::Action::create("&System", [&](auto&) {
|
||||||
game.set_use_system_theme(true);
|
game.set_use_system_theme(true);
|
||||||
Config::write_bool("MasterWord"sv, ""sv, "use_system_theme"sv, 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(system_theme_action);
|
||||||
theme_actions.add_action(wordle_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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/MasterWord.md"), "/bin/Help");
|
||||||
|
|
|
@ -58,7 +58,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
auto field = TRY(Field::create(flag_label, time_label, face_button));
|
auto field = TRY(Field::create(flag_label, time_label, face_button));
|
||||||
TRY(widget->try_add_child(field));
|
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&) {
|
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();
|
field->reset();
|
||||||
|
@ -78,7 +78,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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;
|
GUI::ActionGroup difficulty_actions;
|
||||||
difficulty_actions.set_exclusive(true);
|
difficulty_actions.set_exclusive(true);
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(difficulty_menu->try_add_action(action));
|
TRY(difficulty_menu->try_add_action(action));
|
||||||
difficulty_actions.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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Minesweeper.md"), "/bin/Help");
|
||||||
|
|
|
@ -77,7 +77,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
return true;
|
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&) {
|
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();
|
game.reset();
|
||||||
|
@ -144,7 +144,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
GUI::Application::the()->quit();
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
|
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");
|
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Snake.md"), "/bin/Help");
|
||||||
|
|
|
@ -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_checked(game.is_auto_collecting());
|
||||||
toggle_auto_collect_action->set_status_tip("Auto-collect to foundation piles");
|
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&) {
|
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())
|
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_separator());
|
||||||
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
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_command_palette_action(window)));
|
||||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window)));
|
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window)));
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
two_suit_action->set_checked(mode == Spider::Mode::TwoSuit);
|
two_suit_action->set_checked(mode == Spider::Mode::TwoSuit);
|
||||||
suit_actions.add_action(two_suit_action);
|
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&) {
|
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())
|
if (!confirm_end_current_game())
|
||||||
return;
|
return;
|
||||||
|
@ -266,7 +266,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
TRY(game_menu->try_add_separator());
|
TRY(game_menu->try_add_separator());
|
||||||
TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
|
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;
|
GUI::ActionGroup statistic_display_actions;
|
||||||
statistic_display_actions.set_exclusive(true);
|
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(high_score_action));
|
||||||
TRY(view_menu->try_add_action(best_time_actions));
|
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_command_palette_action(window));
|
||||||
help_menu->add_action(GUI::CommonActions::make_about_action("Spider", app_icon, window));
|
help_menu->add_action(GUI::CommonActions::make_about_action("Spider", app_icon, window));
|
||||||
|
|
||||||
|
|
|
@ -1324,9 +1324,9 @@ ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(DeprecatedString name)
|
ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(String name)
|
||||||
{
|
{
|
||||||
auto menu = TRY(m_menubar->try_add_menu({}, TRY(String::from_deprecated_string(name))));
|
auto menu = TRY(m_menubar->try_add_menu({}, move(name)));
|
||||||
if (m_window_id) {
|
if (m_window_id) {
|
||||||
menu->realize_menu_if_needed();
|
menu->realize_menu_if_needed();
|
||||||
ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());
|
ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());
|
||||||
|
@ -1334,7 +1334,7 @@ ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(DeprecatedString name)
|
||||||
return menu;
|
return menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
Menu& Window::add_menu(DeprecatedString name)
|
Menu& Window::add_menu(String name)
|
||||||
{
|
{
|
||||||
auto menu = MUST(try_add_menu(move(name)));
|
auto menu = MUST(try_add_menu(move(name)));
|
||||||
return *menu;
|
return *menu;
|
||||||
|
|
|
@ -218,8 +218,8 @@ public:
|
||||||
|
|
||||||
void did_disable_focused_widget(Badge<Widget>);
|
void did_disable_focused_widget(Badge<Widget>);
|
||||||
|
|
||||||
Menu& add_menu(DeprecatedString name);
|
Menu& add_menu(String name);
|
||||||
ErrorOr<NonnullRefPtr<Menu>> try_add_menu(DeprecatedString name);
|
ErrorOr<NonnullRefPtr<Menu>> try_add_menu(String name);
|
||||||
ErrorOr<void> try_add_menu(NonnullRefPtr<Menu> menu);
|
ErrorOr<void> try_add_menu(NonnullRefPtr<Menu> menu);
|
||||||
void flash_menubar_menu_for(MenuItem const&);
|
void flash_menubar_menu_for(MenuItem const&);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue