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

LibGUI: Remove Menu::try_add_action()

Browse source 
And fall back to the infallible add_action().
This commit is contained in:
Andreas Kling 2023-08-14 10:14:27 +02:00
parent eec328e2ab
commit f2faf2767f
51 changed files with 758 additions and 769 deletions
Download patch file Download diff file Expand all files Collapse all files

242
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -217,15 +217,15 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
GUI::Application::the()->set_most_recently_open_file(path_string);
});
TRY(file_menu->try_add_action(*m_new_image_action));
TRY(file_menu->try_add_action(*m_new_image_from_clipboard_action));
TRY(file_menu->try_add_action(*m_open_image_action));
TRY(file_menu->try_add_action(*m_save_image_action));
TRY(file_menu->try_add_action(*m_save_image_as_action));
file_menu->add_action(*m_new_image_action);
file_menu->add_action(*m_new_image_from_clipboard_action);
file_menu->add_action(*m_open_image_action);
file_menu->add_action(*m_save_image_action);
file_menu->add_action(*m_save_image_as_action);
m_export_submenu = file_menu->add_submenu("&Export"_string);
TRY(m_export_submenu->try_add_action(
m_export_submenu->add_action(
GUI::Action::create(
"As &BMP...", [&](auto&) {
auto* editor = current_image_editor();
@ -237,9 +237,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = editor->image().export_bmp_to_file(response.value().release_stream(), preserve_alpha_channel == GUI::MessageBox::ExecResult::Yes);
if (result.is_error())
GUI::MessageBox::show_error(&window, MUST(String::formatted("Export to BMP failed: {}", result.release_error())));
})));
}));
TRY(m_export_submenu->try_add_action(
m_export_submenu->add_action(
GUI::Action::create(
"As &PNG...", [&](auto&) {
auto* editor = current_image_editor();
@ -252,9 +252,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = editor->image().export_png_to_file(response.value().release_stream(), preserve_alpha_channel == GUI::MessageBox::ExecResult::Yes);
if (result.is_error())
GUI::MessageBox::show_error(&window, MUST(String::formatted("Export to PNG failed: {}", result.release_error())));
})));
}));
TRY(m_export_submenu->try_add_action(
m_export_submenu->add_action(
GUI::Action::create(
"As &QOI...", [&](auto&) {
auto* editor = current_image_editor();
@ -265,7 +265,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = editor->image().export_qoi_to_file(response.value().release_stream());
if (result.is_error())
GUI::MessageBox::show_error(&window, MUST(String::formatted("Export to QOI failed: {}", result.release_error())));
})));
}));
m_export_submenu->set_icon(g_icon_bag.file_export);
@ -285,12 +285,12 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_tab_widget->on_tab_close_click(*active_widget);
});
TRY(file_menu->try_add_action(*m_close_image_action));
file_menu->add_action(*m_close_image_action);
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([this](auto&) {
file_menu->add_action(GUI::CommonActions::make_quit_action([this](auto&) {
if (request_close())
GUI::Application::the()->quit();
})));
}));
m_edit_menu = TRY(window.try_add_menu("&Edit"_string));
@ -407,16 +407,16 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->redo();
});
TRY(m_edit_menu->try_add_action(*m_undo_action));
TRY(m_edit_menu->try_add_action(*m_redo_action));
m_edit_menu->add_action(*m_undo_action);
m_edit_menu->add_action(*m_redo_action);
m_edit_menu->add_separator();
TRY(m_edit_menu->try_add_action(*m_cut_action));
TRY(m_edit_menu->try_add_action(*m_copy_action));
TRY(m_edit_menu->try_add_action(*m_copy_merged_action));
TRY(m_edit_menu->try_add_action(*m_paste_action));
m_edit_menu->add_action(*m_cut_action);
m_edit_menu->add_action(*m_copy_action);
m_edit_menu->add_action(*m_copy_merged_action);
m_edit_menu->add_action(*m_paste_action);
m_edit_menu->add_separator();
TRY(m_edit_menu->try_add_action(GUI::CommonActions::make_select_all_action([&](auto&) {
m_edit_menu->add_action(GUI::CommonActions::make_select_all_action([&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
if (!editor->active_layer())
@ -424,39 +424,39 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto layer_rect = editor->active_layer()->relative_rect();
editor->image().selection().merge(layer_rect.intersected(editor->image().rect()), PixelPaint::Selection::MergeMode::Set);
editor->did_complete_action("Select All"sv);
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
}));
m_edit_menu->add_action(GUI::Action::create(
"Clear &Selection", g_icon_bag.clear_selection, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->image().selection().clear();
editor->did_complete_action("Clear Selection"sv);
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
}));
m_edit_menu->add_action(GUI::Action::create(
"&Invert Selection", g_icon_bag.invert_selection, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->image().selection().invert();
editor->did_complete_action("Invert Selection"sv);
})));
}));
m_edit_menu->add_separator();
TRY(m_edit_menu->try_add_action(GUI::Action::create(
m_edit_menu->add_action(GUI::Action::create(
"S&wap Colors", { Mod_None, Key_X }, g_icon_bag.swap_colors, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
auto old_primary_color = editor->primary_color();
editor->set_primary_color(editor->secondary_color());
editor->set_secondary_color(old_primary_color);
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
}));
m_edit_menu->add_action(GUI::Action::create(
"&Default Colors", { Mod_None, Key_D }, g_icon_bag.default_colors, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->set_primary_color(Color::Black);
editor->set_secondary_color(Color::White);
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
}));
m_edit_menu->add_action(GUI::Action::create(
"&Load Color Palette...", g_icon_bag.load_color_palette, [&](auto&) {
FileSystemAccessClient::OpenFileOptions options {
.window_title = "Load Color Palette"sv,
@ -476,8 +476,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
m_palette_widget->display_color_list(result.value());
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
}));
m_edit_menu->add_action(GUI::Action::create(
"Sa&ve Color Palette...", g_icon_bag.save_color_palette, [&](auto&) {
auto response = FileSystemAccessClient::Client::the().save_file(&window, "untitled", "palette");
if (response.is_error())
@ -486,7 +486,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = PixelPaint::PaletteWidget::save_palette_file(m_palette_widget->colors(), response.release_value().release_stream());
if (result.is_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"_string));
@ -533,25 +533,25 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
});
m_show_guides_action->set_checked(Config::read_bool("PixelPaint"sv, "Guides"sv, "Show"sv, true));
TRY(m_view_menu->try_add_action(*m_zoom_in_action));
TRY(m_view_menu->try_add_action(*m_zoom_out_action));
TRY(m_view_menu->try_add_action(*m_reset_zoom_action));
TRY(m_view_menu->try_add_action(GUI::Action::create(
m_view_menu->add_action(*m_zoom_in_action);
m_view_menu->add_action(*m_zoom_out_action);
m_view_menu->add_action(*m_reset_zoom_action);
m_view_menu->add_action(GUI::Action::create(
"Fit Image To &View", g_icon_bag.fit_image_to_view, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->fit_image_to_view();
})));
}));
m_view_menu->add_separator();
TRY(m_view_menu->try_add_action(*m_add_guide_action));
TRY(m_view_menu->try_add_action(*m_show_guides_action));
m_view_menu->add_action(*m_add_guide_action);
m_view_menu->add_action(*m_show_guides_action);
TRY(m_view_menu->try_add_action(GUI::Action::create(
m_view_menu->add_action(GUI::Action::create(
"&Clear Guides", g_icon_bag.clear_guides, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->clear_guides();
})));
}));
m_view_menu->add_separator();
auto show_pixel_grid_action = GUI::Action::create_checkable(
@ -562,7 +562,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->set_pixel_grid_visibility(action.is_checked());
});
show_pixel_grid_action->set_checked(Config::read_bool("PixelPaint"sv, "PixelGrid"sv, "Show"sv, true));
TRY(m_view_menu->try_add_action(*show_pixel_grid_action));
m_view_menu->add_action(*show_pixel_grid_action);
m_show_rulers_action = TRY(GUI::Action::try_create_checkable(
"Show R&ulers", { Mod_Ctrl, Key_R }, [&](auto& action) {
@ -572,7 +572,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->set_ruler_visibility(action.is_checked());
}));
m_show_rulers_action->set_checked(Config::read_bool("PixelPaint"sv, "Rulers"sv, "Show"sv, true));
TRY(m_view_menu->try_add_action(*m_show_rulers_action));
m_view_menu->add_action(*m_show_rulers_action);
m_show_active_layer_boundary_action = GUI::Action::create_checkable(
"Show Active Layer &Boundary", [&](auto& action) {
@ -582,7 +582,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->set_show_active_layer_boundary(action.is_checked());
});
m_show_active_layer_boundary_action->set_checked(Config::read_bool("PixelPaint"sv, "ImageEditor"sv, "ShowActiveLayerBoundary"sv, true));
TRY(m_view_menu->try_add_action(*m_show_active_layer_boundary_action));
m_view_menu->add_action(*m_show_active_layer_boundary_action);
m_view_menu->add_separator();
@ -601,8 +601,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_vectorscope_widget->parent_widget()->set_visible(vectorscope_action->is_checked());
auto scopes_menu = m_view_menu->add_submenu("&Scopes"_string);
TRY(scopes_menu->try_add_action(histogram_action));
TRY(scopes_menu->try_add_action(vectorscope_action));
scopes_menu->add_action(histogram_action);
scopes_menu->add_action(vectorscope_action);
m_tool_menu = TRY(window.try_add_menu("&Tool"_string));
m_toolbox->for_each_tool([&](auto& tool) {
@ -612,7 +612,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
});
m_image_menu = TRY(window.try_add_menu("&Image"_string));
TRY(m_image_menu->try_add_action(GUI::Action::create(
m_image_menu->add_action(GUI::Action::create(
"Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -622,8 +622,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Image Vertically"sv);
})));
TRY(m_image_menu->try_add_action(GUI::Action::create(
}));
m_image_menu->add_action(GUI::Action::create(
"Flip Image &Horizontally", g_icon_bag.edit_flip_horizontal, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -633,10 +633,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Image Horizontally"sv);
})));
}));
m_image_menu->add_separator();
TRY(m_image_menu->try_add_action(GUI::Action::create("Rotate Image &Counterclockwise", { Mod_Ctrl | Mod_Shift, Key_LessThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
m_image_menu->add_action(GUI::Action::create("Rotate Image &Counterclockwise", { Mod_Ctrl | Mod_Shift, Key_LessThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -646,9 +646,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Image Counterclockwise"sv);
})));
}));
TRY(m_image_menu->try_add_action(GUI::Action::create("Rotate Image Clock&wise", { Mod_Ctrl | Mod_Shift, Key_GreaterThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
m_image_menu->add_action(GUI::Action::create("Rotate Image Clock&wise", { Mod_Ctrl | Mod_Shift, Key_GreaterThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -658,9 +658,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Image Clockwise"sv);
})));
}));
m_image_menu->add_separator();
TRY(m_image_menu->try_add_action(GUI::Action::create(
m_image_menu->add_action(GUI::Action::create(
"&Resize Image...", { Mod_Ctrl | Mod_Shift, Key_R }, g_icon_bag.resize_image, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -674,8 +674,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
// FIXME: We should ensure the selection is within the bounds of the image here.
editor->did_complete_action("Resize Image"sv);
}
})));
TRY(m_image_menu->try_add_action(GUI::Action::create(
}));
m_image_menu->add_action(GUI::Action::create(
"&Crop Image to Selection", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -694,9 +694,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
editor->image().selection().clear();
editor->did_complete_action("Crop Image to Selection"sv);
})));
}));
TRY(m_image_menu->try_add_action(GUI::Action::create(
m_image_menu->add_action(GUI::Action::create(
"&Crop Image to Content", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -711,7 +711,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Crop Image to Content"sv);
})));
}));
m_layer_menu = TRY(window.try_add_menu("&Layer"_string));
@ -726,7 +726,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_layer_via_cut->set_enabled(image_has_selection);
};
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"New &Layer...", { Mod_Ctrl | Mod_Shift, Key_N }, g_icon_bag.new_layer, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -742,9 +742,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->did_complete_action("New Layer"sv);
m_layer_list_widget->select_top_layer();
}
})));
}));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"Duplicate Layer", { Mod_Ctrl | Mod_Shift, Key_D }, g_icon_bag.new_layer, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -764,7 +764,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->image().select_layer(duplicated_layer);
editor->layers_did_change();
editor->did_complete_action("Duplicate Layer"sv);
})));
}));
m_layer_via_copy = GUI::Action::create(
"Layer via Copy", { Mod_Ctrl | Mod_Shift, Key_C }, g_icon_bag.new_layer, [&](auto&) {
@ -776,7 +776,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
current_image_editor()->did_complete_action("New Layer via Copy"sv);
m_layer_list_widget->select_top_layer();
});
TRY(m_layer_menu->try_add_action(*m_layer_via_copy));
m_layer_menu->add_action(*m_layer_via_copy);
m_layer_via_cut = GUI::Action::create(
"Layer via Cut", { Mod_Ctrl | Mod_Shift, Key_X }, g_icon_bag.new_layer, [&](auto&) {
@ -789,7 +789,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
current_image_editor()->did_complete_action("New Layer via Cut"sv);
m_layer_list_widget->select_top_layer();
});
TRY(m_layer_menu->try_add_action(*m_layer_via_cut));
m_layer_menu->add_action(*m_layer_via_cut);
m_layer_menu->add_separator();
@ -818,7 +818,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (auto maybe_error = active_layer->create_mask(Layer::MaskType::BasicMask); maybe_error.is_error())
GUI::MessageBox::show_error(&window, MUST(String::formatted("Failed to create layer mask: {}", maybe_error.release_error())));
}));
TRY(mask_submenu->try_add_action(*m_add_mask_action));
mask_submenu->add_action(*m_add_mask_action);
m_add_editing_mask_action = GUI::Action::create(
"Add E&diting Mask", { Mod_Ctrl | Mod_Alt, Key_E }, g_icon_bag.add_mask, create_layer_mask_callback("Add Editing Mask", [&](Layer* active_layer) {
@ -826,35 +826,35 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (auto maybe_error = active_layer->create_mask(Layer::MaskType::EditingMask); maybe_error.is_error())
GUI::MessageBox::show_error(&window, MUST(String::formatted("Failed to create layer mask: {}", maybe_error.release_error())));
}));
TRY(mask_submenu->try_add_action(*m_add_editing_mask_action));
mask_submenu->add_action(*m_add_editing_mask_action);
m_delete_mask_action = GUI::Action::create(
"Delete Mask", create_layer_mask_callback("Delete Mask", [&](Layer* active_layer) {
VERIFY(active_layer->is_masked());
active_layer->delete_mask();
}));
TRY(mask_submenu->try_add_action(*m_delete_mask_action));
mask_submenu->add_action(*m_delete_mask_action);
m_apply_mask_action = GUI::Action::create(
"Apply Mask", create_layer_mask_callback("Apply Mask", [&](Layer* active_layer) {
VERIFY(active_layer->is_masked());
active_layer->apply_mask();
}));
TRY(mask_submenu->try_add_action(*m_apply_mask_action));
mask_submenu->add_action(*m_apply_mask_action);
m_invert_mask_action = GUI::Action::create(
"Invert Mask", create_layer_mask_callback("Invert Mask", [&](Layer* active_layer) {
VERIFY(active_layer->is_masked());
active_layer->invert_mask();
}));
TRY(mask_submenu->try_add_action(*m_invert_mask_action));
mask_submenu->add_action(*m_invert_mask_action);
m_clear_mask_action = GUI::Action::create(
"Clear Mask", create_layer_mask_callback("Clear Mask", [&](Layer* active_layer) {
VERIFY(active_layer->is_masked());
active_layer->clear_mask();
}));
TRY(mask_submenu->try_add_action(*m_clear_mask_action));
mask_submenu->add_action(*m_clear_mask_action);
m_toggle_mask_visibility_action = GUI::Action::create_checkable(
"Show Mask", [&](auto&) {
@ -868,7 +868,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->update();
});
TRY(mask_submenu->try_add_action(*m_toggle_mask_visibility_action));
mask_submenu->add_action(*m_toggle_mask_visibility_action);
m_open_luminosity_masking_action = GUI::Action::create(
"Luminosity Masking", [&](auto&) {
@ -882,7 +882,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_layer_list_widget->repaint();
});
TRY(mask_submenu->try_add_action(*m_open_luminosity_masking_action));
mask_submenu->add_action(*m_open_luminosity_masking_action);
m_open_color_masking_action = GUI::Action::create(
"Color Masking", [&](auto&) {
@ -896,28 +896,28 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_layer_list_widget->repaint();
});
TRY(mask_submenu->try_add_action(*m_open_color_masking_action));
mask_submenu->add_action(*m_open_color_masking_action);
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"Select &Previous Layer", { 0, Key_PageUp }, g_icon_bag.previous_layer, [&](auto&) {
m_layer_list_widget->cycle_through_selection(1);
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
}));
m_layer_menu->add_action(GUI::Action::create(
"Select &Next Layer", { 0, Key_PageDown }, g_icon_bag.next_layer, [&](auto&) {
m_layer_list_widget->cycle_through_selection(-1);
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
}));
m_layer_menu->add_action(GUI::Action::create(
"Select &Top Layer", { 0, Key_Home }, g_icon_bag.top_layer, [&](auto&) {
m_layer_list_widget->select_top_layer();
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
}));
m_layer_menu->add_action(GUI::Action::create(
"Select B&ottom Layer", { 0, Key_End }, g_icon_bag.bottom_layer, [&](auto&) {
m_layer_list_widget->select_bottom_layer();
})));
}));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::CommonActions::make_move_to_front_action(
m_layer_menu->add_action(GUI::CommonActions::make_move_to_front_action(
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -926,8 +926,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
editor->image().move_layer_to_front(*active_layer);
editor->layers_did_change();
})));
TRY(m_layer_menu->try_add_action(GUI::CommonActions::make_move_to_back_action(
}));
m_layer_menu->add_action(GUI::CommonActions::make_move_to_back_action(
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -936,9 +936,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
editor->image().move_layer_to_back(*active_layer);
editor->layers_did_change();
})));
}));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"Move Active Layer &Up", { Mod_Ctrl, Key_PageUp }, g_icon_bag.active_layer_up, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -946,8 +946,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (!active_layer)
return;
editor->image().move_layer_up(*active_layer);
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
}));
m_layer_menu->add_action(GUI::Action::create(
"Move Active Layer &Down", { Mod_Ctrl, Key_PageDown }, g_icon_bag.active_layer_down, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -955,9 +955,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (!active_layer)
return;
editor->image().move_layer_down(*active_layer);
})));
}));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"&Remove Active Layer", { Mod_Ctrl, Key_D }, g_icon_bag.delete_layer, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -982,13 +982,13 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->layers_did_change();
m_layer_list_widget->select_top_layer();
}
})));
}));
m_layer_list_widget->on_context_menu_request = [&](auto& event) {
m_layer_menu->popup(event.screen_position());
};
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"Fl&atten Image", { Mod_Ctrl, Key_F }, g_icon_bag.flatten_image, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -997,9 +997,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flatten Image"sv);
})));
}));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"&Merge Visible", { Mod_Ctrl, Key_M }, g_icon_bag.merge_visible, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1008,9 +1008,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Merge Visible"sv);
})));
}));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"Merge &Active Layer Up", g_icon_bag.merge_active_layer_up, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1023,9 +1023,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Merge Active Layer Up"sv);
})));
}));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"M&erge Active Layer Down", { Mod_Ctrl, Key_E }, g_icon_bag.merge_active_layer_down, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1038,10 +1038,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Merge Active Layer Down"sv);
})));
}));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"Flip Layer &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1054,8 +1054,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Layer Vertically"sv);
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
}));
m_layer_menu->add_action(GUI::Action::create(
"Flip Layer &Horizontally", g_icon_bag.edit_flip_horizontal, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1068,10 +1068,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Layer Horizontally"sv);
})));
}));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create("Rotate Layer &Counterclockwise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
m_layer_menu->add_action(GUI::Action::create("Rotate Layer &Counterclockwise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1084,9 +1084,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Layer Counterclockwise"sv);
})));
}));
TRY(m_layer_menu->try_add_action(GUI::Action::create("Rotate Layer Clock&wise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
m_layer_menu->add_action(GUI::Action::create("Rotate Layer Clock&wise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1099,10 +1099,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Layer Clockwise"sv);
})));
}));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_action(GUI::Action::create(
m_layer_menu->add_action(GUI::Action::create(
"&Crop Layer to Selection", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1120,8 +1120,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
active_layer->set_location(intersection.location());
editor->image().selection().clear();
editor->did_complete_action("Crop Layer to Selection"sv);
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
}));
m_layer_menu->add_action(GUI::Action::create(
"&Crop Layer to Content", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1138,20 +1138,20 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
active_layer->set_location(content_bounding_rect->location());
editor->did_complete_action("Crop Layer to Content"sv);
})));
}));
m_filter_menu = TRY(window.try_add_menu("&Filter"_string));
TRY(m_filter_menu->try_add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
m_filter_menu->add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
auto dialog = PixelPaint::FilterGallery::construct(&window, editor);
if (dialog->exec() != GUI::Dialog::ExecResult::OK)
return;
})));
}));
m_filter_menu->add_separator();
TRY(m_filter_menu->try_add_action(GUI::Action::create("Generic 5x5 &Convolution", g_icon_bag.generic_5x5_convolution, [&](auto&) {
m_filter_menu->add_action(GUI::Action::create("Generic 5x5 &Convolution", g_icon_bag.generic_5x5_convolution, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
if (auto* layer = editor->active_layer()) {
@ -1162,11 +1162,11 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->did_complete_action("Generic 5x5 Convolution"sv);
}
}
})));
}));
auto help_menu = TRY(window.try_add_menu("&Help"_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window)));
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));
m_levels_dialog_action = GUI::Action::create(
"Change &Levels...", { Mod_Ctrl, Key_L }, g_icon_bag.levels, [&](auto&) {