mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 10:57:36 +00:00
LibGUI: Remove Window::try_add_menu()
And fall back to the infallible add_menu().
This commit is contained in:
parent
5300896095
commit
bd61e75e0b
51 changed files with 294 additions and 302 deletions
|
@ -149,7 +149,7 @@ static constexpr int s_zoom_level_fit_image = 10;
|
|||
|
||||
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||
{
|
||||
auto file_menu = TRY(window.try_add_menu("&File"_string));
|
||||
auto file_menu = window.add_menu("&File"_string);
|
||||
|
||||
m_new_image_action = GUI::Action::create(
|
||||
"&New Image...", { Mod_Ctrl, Key_N }, g_icon_bag.filetype_pixelpaint, [&](auto&) {
|
||||
|
@ -292,7 +292,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
GUI::Application::the()->quit();
|
||||
}));
|
||||
|
||||
m_edit_menu = TRY(window.try_add_menu("&Edit"_string));
|
||||
m_edit_menu = window.add_menu("&Edit"_string);
|
||||
|
||||
m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) {
|
||||
auto* editor = current_image_editor();
|
||||
|
@ -488,7 +488,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
GUI::MessageBox::show_error(&window, MUST(String::formatted("Writing color palette failed: {}", result.release_error())));
|
||||
}));
|
||||
|
||||
m_view_menu = TRY(window.try_add_menu("&View"_string));
|
||||
m_view_menu = window.add_menu("&View"_string);
|
||||
|
||||
m_zoom_in_action = GUI::CommonActions::make_zoom_in_action(
|
||||
[&](auto&) {
|
||||
|
@ -604,14 +604,14 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
scopes_menu->add_action(histogram_action);
|
||||
scopes_menu->add_action(vectorscope_action);
|
||||
|
||||
m_tool_menu = TRY(window.try_add_menu("&Tool"_string));
|
||||
m_tool_menu = window.add_menu("&Tool"_string);
|
||||
m_toolbox->for_each_tool([&](auto& tool) {
|
||||
if (tool.action())
|
||||
m_tool_menu->add_action(*tool.action());
|
||||
return IterationDecision::Continue;
|
||||
});
|
||||
|
||||
m_image_menu = TRY(window.try_add_menu("&Image"_string));
|
||||
m_image_menu = window.add_menu("&Image"_string);
|
||||
m_image_menu->add_action(GUI::Action::create(
|
||||
"Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
|
||||
auto* editor = current_image_editor();
|
||||
|
@ -713,7 +713,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
editor->did_complete_action("Crop Image to Content"sv);
|
||||
}));
|
||||
|
||||
m_layer_menu = TRY(window.try_add_menu("&Layer"_string));
|
||||
m_layer_menu = window.add_menu("&Layer"_string);
|
||||
|
||||
m_layer_menu->on_visibility_change = [this](bool visible) {
|
||||
if (!visible)
|
||||
|
@ -1140,7 +1140,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
editor->did_complete_action("Crop Layer to Content"sv);
|
||||
}));
|
||||
|
||||
m_filter_menu = TRY(window.try_add_menu("&Filter"_string));
|
||||
m_filter_menu = window.add_menu("&Filter"_string);
|
||||
|
||||
m_filter_menu->add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
|
||||
auto* editor = current_image_editor();
|
||||
|
@ -1164,7 +1164,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
}
|
||||
}));
|
||||
|
||||
auto help_menu = TRY(window.try_add_menu("&Help"_string));
|
||||
auto help_menu = window.add_menu("&Help"_string);
|
||||
help_menu->add_action(GUI::CommonActions::make_command_palette_action(&window));
|
||||
help_menu->add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue